diff --git a/gamespy_natneg_server.py b/gamespy_natneg_server.py index 4af365c..591716a 100644 --- a/gamespy_natneg_server.py +++ b/gamespy_natneg_server.py @@ -56,9 +56,7 @@ class GameSpyNatNegServer(object): self.natneg_preinit_session = {} self.secret_key_list = gs_utils.generate_secret_keys("gslist.cfg") - manager_address = ("127.0.0.1", 27500) - manager_password = "" - self.server_manager = GameSpyServerDatabase(address = manager_address, authkey= manager_password) + self.server_manager = GameSpyServerDatabase(address=("127.0.0.1", 27500), authkey="") self.server_manager.connect() def start(self): @@ -74,7 +72,7 @@ class GameSpyNatNegServer(object): logger.log(logging.INFO, "Server is now listening on %s:%s..." % (address[0], address[1])) threading.Thread(target=self.write_queue_worker).start() - while 1: + while True: recv_data, addr = self.socket.recvfrom(2048) self.handle_packet(recv_data, addr) @@ -86,7 +84,7 @@ class GameSpyNatNegServer(object): self.socket.sendto(data, address) def write_queue_worker(self): - while 1: + while True: data, address = self.write_queue.get() threading.Thread(target=self.write_queue_send, args=(data, address)).start() self.write_queue.task_done() @@ -117,16 +115,19 @@ class GameSpyNatNegServer(object): localip_raw = recv_data[15:19] localip_int_le = utils.get_int(recv_data, 15) - localip_int_be = utils.get_int_be(recv_data, 15) + localip_int_be = utils.get_int(recv_data, 15, True) localip = '.'.join(["%d" % ord(x) for x in localip_raw]) localport_raw = recv_data[19:21] - localport = utils.get_short_be(localport_raw, 0) + localport = utils.get_short(localport_raw, 0, True) localaddr = (localip, localport, localip_int_le, localip_int_be) - if session_id not in self.session_list: - self.session_list[session_id] = {} - if client_id not in self.session_list[session_id]: - self.session_list[session_id][client_id] = { 'connected': False, 'addr': '', 'localaddr': None, 'serveraddr': None, 'gameid': None } + self.session_list.setdefault(session_id, {}).setdefault(client_id, { + 'connected': False, + 'addr': '', + 'localaddr': None, + 'serveraddr': None, + 'gameid': None + }) self.session_list[session_id][client_id]['gameid'] = gameid self.session_list[session_id][client_id]['addr'] = addr @@ -156,7 +157,7 @@ class GameSpyNatNegServer(object): # Send to requesting client output = bytearray(recv_data[0:12]) output += bytearray([int(x) for x in self.session_list[session_id][client]['addr'][0].split('.')]) - output += utils.get_bytes_from_short_be(publicport) + output += utils.get_bytes_from_short(publicport, True) output += bytearray([0x42, 0x00]) # Unknown, always seems to be \x42\x00 output[7] = 0x05 @@ -184,7 +185,7 @@ class GameSpyNatNegServer(object): output = bytearray(recv_data[0:12]) output += bytearray([int(x) for x in self.session_list[session_id][client_id]['addr'][0].split('.')]) - output += utils.get_bytes_from_short_be(publicport) + output += utils.get_bytes_from_short(publicport, True) output += bytearray([0x42, 0x00]) # Unknown, always seems to be \x42\x00 output[7] = 0x05 @@ -198,12 +199,8 @@ class GameSpyNatNegServer(object): client_id = "%02x" % ord(recv_data[13]) logger.log(logging.DEBUG, "Received connected command from %s:%s..." % (addr[0], addr[1])) - if session_id not in self.session_list: - return - if client_id not in self.session_list[session_id]: - return - - self.session_list[session_id][client_id]['connected'] = True + if session_id in self.session_list and client_id in self.session_list[session_id]: + self.session_list[session_id][client_id]['connected'] = True elif recv_data[7] == '\x0a': # Address check. Note: UNTESTED! client_id = "%02x" % ord(recv_data[13]) @@ -211,7 +208,7 @@ class GameSpyNatNegServer(object): output = bytearray(recv_data[0:15]) output += bytearray([int(x) for x in addr[0].split('.')]) - output += utils.get_bytes_from_short_be(addr[1]) + output += utils.get_bytes_from_short(addr[1], True) output += bytearray(recv_data[len(output):]) output[7] = 0x0b @@ -247,7 +244,7 @@ class GameSpyNatNegServer(object): logger.log(logging.DEBUG, "Received pre-init command from %s:%s..." % (addr[0], addr[1])) logger.log(logging.DEBUG, utils.pretty_print_hex(recv_data)) - session = utils.get_int(recv_data[-4:],0) + session = utils.get_int(recv_data[-4:], 0) # Report response output = bytearray(recv_data[:-4]) + bytearray([0, 0, 0, 0]) @@ -281,59 +278,39 @@ class GameSpyNatNegServer(object): if servers == None: return None - console = 0 + console = False ipstr = self.session_list[session_id][client_id]['addr'][0] - if console != 0: - ip = str(ctypes.c_int32(utils.get_int_be(bytearray([int(x) for x in ipstr.split('.')]), 0)).value) # Wii - console = 0 - else: - ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in ipstr.split('.')]), 0)).value) # DS - console = 1 + ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in ipstr.split('.')]), 0, console)).value) + console = not console - for server in servers: - if server['publicip'] == ip: - server_info = server - break + server_info = next((s for s in servers if s['publicip'] == ip), None) if server_info == None: - if console != 0: - ip = str(ctypes.c_int32(utils.get_int_be(bytearray([int(x) for x in ipstr.split('.')]), 0)).value) # Wii - else: - ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in ipstr.split('.')]), 0)).value) # DS + ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in ipstr.split('.')]), 0, console)).value) - for server in servers: - if server['publicip'] == ip: - server_info = server - break + server_info = next((s for s in servers if s['publicip'] == ip), None) return server_info def get_server_info_alt(self, gameid, session_id, client_id): - console = 0 + console = False ipstr = self.session_list[session_id][client_id]['addr'][0] - if console != 0: - ip = str(ctypes.c_int32(utils.get_int_be(bytearray([int(x) for x in ipstr.split('.')]), 0)).value) # Wii - console = 0 - else: - ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in ipstr.split('.')]), 0)).value) # DS - console = 1 + ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in ipstr.split('.')]), 0, console)).value) + console = not console serveraddr = self.server_manager.find_server_by_local_address(ip, self.session_list[session_id][client_id]['localaddr'], self.session_list[session_id][client_id]['gameid'])._getvalue() if serveraddr == None: - if console != 0: - ip = str(ctypes.c_int32(utils.get_int_be(bytearray([int(x) for x in ipstr.split('.')]), 0)).value) # Wii - console = 0 - else: - ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in ipstr.split('.')]), 0)).value) # DS - console = 1 + ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in ipstr.split('.')]), 0, console)).value) + console = 1 - serveraddr = self.server_manager.find_server_by_local_address(ip, self.session_list[session_id][client_id]['localaddr'], self.session_list[session_id][client_id]['gameid'])._getvalue() + serveraddr = self.server_manager.find_server_by_local_address(ip, self.session_list[session_id][client_id]['localaddr'], + self.session_list[session_id][client_id]['gameid'])._getvalue() return serveraddr if __name__ == "__main__": natneg_server = GameSpyNatNegServer() - natneg_server.start() \ No newline at end of file + natneg_server.start() diff --git a/gamespy_qr_server.py b/gamespy_qr_server.py index 8e57721..74d32db 100644 --- a/gamespy_qr_server.py +++ b/gamespy_qr_server.py @@ -319,10 +319,8 @@ class GameSpyQRServer(object): self.sessions[session_id].sent_challenge = True if 'publicip' in k and k['publicip'] == "0": #and k['dwc_hoststate'] == "2": # When dwc_hoststate == 2 then it doesn't send an IP, so calculate it ourselves - if self.sessions[session_id].console != 0: - k['publicip'] = str(ctypes.c_int32(utils.get_int_be(bytearray([int(x) for x in address[0].split('.')]), 0)).value) # Wii - else: - k['publicip'] = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in address[0].split('.')]), 0)).value) # DS + be = self.sessions[session_id].console != 0 + k['publicip'] = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in address[0].split('.')]), 0, be)).value) if "statechanged" in k: if k['statechanged'] == "2": # Close server diff --git a/gamespy_server_browser_server.py b/gamespy_server_browser_server.py index 394faa2..cebcaea 100644 --- a/gamespy_server_browser_server.py +++ b/gamespy_server_browser_server.py @@ -173,7 +173,7 @@ class Session(LineReceiver): fields = utils.get_string(data, idx) idx += len(fields) + 1 - options = utils.get_int_be(data, idx) + options = utils.get_int(data, idx, True) idx += 4 source_ip = 0 @@ -209,7 +209,7 @@ class Session(LineReceiver): # Requesting ip and port of client, not server if filter == "" and fields == "" or send_ip == True: output = bytearray([int(x) for x in self.address.host.split('.')]) - output += utils.get_bytes_from_short_be(6500) # Does this ever change? + output += utils.get_bytes_from_short(6500, True) # Does this ever change? enc = gs_utils.EncTypeX() output_enc = enc.encrypt(self.secret_key_list[game_name], challenge, output) @@ -224,9 +224,9 @@ class Session(LineReceiver): elif data[2] == '\x02': # Send message request - packet_len = utils.get_short_be(data, 0) + packet_len = utils.get_short(data, 0, True) dest_addr = '.'.join(["%d" % ord(x) for x in data[3:7]]) - dest_port = utils.get_short_be(data, 7) # What's the pythonic way to do this? unpack? + dest_port = utils.get_short(data, 7, True) # What's the pythonic way to do this? unpack? dest = (dest_addr, dest_port) self.log(logging.DEBUG, "Received send message request from %s:%s to %s:%d... expecting %d byte packet." % (self.address.host, self.address.port, dest_addr, dest_port, packet_len)) @@ -272,7 +272,7 @@ class Session(LineReceiver): output += bytearray([int(x) for x in address.host.split('.')]) # Write the port - output += utils.get_bytes_from_short_be(address.port) + output += utils.get_bytes_from_short(address.port, True) # Write number of fields that will be returned. key_count = len(fields) @@ -302,20 +302,15 @@ class Session(LineReceiver): if "natneg" in server_info: flags |= ServerListFlags.CONNECT_NEGOTIATE_FLAG - ip = 0 - if self.console != 0: - ip = utils.get_bytes_from_int_be(int(server_info['publicip'])) # Wii - flags_buffer += ip - else: - ip = utils.get_bytes_from_int(int(server_info['publicip'])) # DS - flags_buffer += ip + ip = utils.get_bytes_from_int(int(server_info['publicip']), self.console) + flags_buffer += ip flags |= ServerListFlags.NONSTANDARD_PORT_FLAG if server_info['publicport'] != "0": - flags_buffer += utils.get_bytes_from_short_be(int(server_info['publicport'])) + flags_buffer += utils.get_bytes_from_short(int(server_info['publicport']), True) else: - flags_buffer += utils.get_bytes_from_short_be(int(server_info['localport'])) + flags_buffer += utils.get_bytes_from_short(int(server_info['localport']), True) if "localip0" in server_info: # How to handle multiple localips? @@ -324,7 +319,7 @@ class Session(LineReceiver): if "localport" in server_info: flags |= ServerListFlags.NONSTANDARD_PRIVATE_PORT_FLAG - flags_buffer += utils.get_bytes_from_short_be(int(server_info['localport'])) + flags_buffer += utils.get_bytes_from_short(int(server_info['localport']), True) flags |= ServerListFlags.ICMP_IP_FLAG flags_buffer += bytearray([int(x) for x in "0.0.0.0".split('.')]) @@ -393,11 +388,7 @@ class Session(LineReceiver): send_encrypted_data(self, challenge, data) def find_server_in_cache(self, addr, port, console): - if console != 0: - ip = str(ctypes.c_int32(utils.get_int_be(bytearray([int(x) for x in addr.split('.')]), 0)).value) # Wii - else: - ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in addr.split('.')]), 0)).value) # DS - + ip = str(ctypes.c_int32(utils.get_int(bytearray([int(x) for x in addr.split('.')]), 0)).value, console) self.log(logging.DEBUG, "IP: %s, Port: %d, Console: %d" % (ip, port, console)) # Get server based on ip/port @@ -497,4 +488,4 @@ class Session(LineReceiver): if __name__ == "__main__": server_browser = GameSpyServerBrowserServer() - server_browser.start() \ No newline at end of file + server_browser.start() diff --git a/other/utils.py b/other/utils.py index 87654dd..67302e3 100644 --- a/other/utils.py +++ b/other/utils.py @@ -18,145 +18,116 @@ import logging import random import string +import struct + def generate_random_str_from_set(ln, chs): return ''.join(random.choice(chs) for _ in range(ln)) + def generate_random_str(ln, chs=""): return generate_random_str_from_set(ln, chs or (string.ascii_letters + string.digits)) + def generate_random_number_str(ln): return generate_random_str_from_set(ln, string.digits) + def generate_random_hex_str(ln): return generate_random_str_from_set(ln, string.hexdigits.lower()) # Code: Tetris DS @ 020573F4 -def calculate_crc8(input): - crc_table = [ 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D, - 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65, 0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D, - 0xE0, 0xE7, 0xEE, 0xE9, 0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD, - 0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85, 0xA8, 0xAF, 0xA6, 0xA1, 0xB4, 0xB3, 0xBA, 0xBD, - 0xC7, 0xC0, 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2, 0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA, - 0xB7, 0xB0, 0xB9, 0xBE, 0xAB, 0xAC, 0xA5, 0xA2, 0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A, - 0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32, 0x1F, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0D, 0x0A, - 0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42, 0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A, - 0x89, 0x8E, 0x87, 0x80, 0x95, 0x92, 0x9B, 0x9C, 0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4, - 0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC, 0xC1, 0xC6, 0xCF, 0xC8, 0xDD, 0xDA, 0xD3, 0xD4, - 0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C, 0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44, - 0x19, 0x1E, 0x17, 0x10, 0x05, 0x02, 0x0B, 0x0C, 0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34, - 0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5C, 0x5B, 0x76, 0x71, 0x78, 0x7F, 0x6A, 0x6D, 0x64, 0x63, - 0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B, 0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13, - 0xAE, 0xA9, 0xA0, 0xA7, 0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83, - 0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF, 0xFA, 0xFD, 0xF4, 0xF3 ] + + +def calculate_crc8(inp): + crc_table = [ + 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D, + 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65, 0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D, + 0xE0, 0xE7, 0xEE, 0xE9, 0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD, + 0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85, 0xA8, 0xAF, 0xA6, 0xA1, 0xB4, 0xB3, 0xBA, 0xBD, + 0xC7, 0xC0, 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2, 0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA, + 0xB7, 0xB0, 0xB9, 0xBE, 0xAB, 0xAC, 0xA5, 0xA2, 0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A, + 0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32, 0x1F, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0D, 0x0A, + 0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42, 0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A, + 0x89, 0x8E, 0x87, 0x80, 0x95, 0x92, 0x9B, 0x9C, 0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4, + 0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC, 0xC1, 0xC6, 0xCF, 0xC8, 0xDD, 0xDA, 0xD3, 0xD4, + 0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C, 0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44, + 0x19, 0x1E, 0x17, 0x10, 0x05, 0x02, 0x0B, 0x0C, 0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34, + 0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5C, 0x5B, 0x76, 0x71, 0x78, 0x7F, 0x6A, 0x6D, 0x64, 0x63, + 0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B, 0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13, + 0xAE, 0xA9, 0xA0, 0xA7, 0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83, + 0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF, 0xFA, 0xFD, 0xF4, 0xF3 + ] crc = 0 - for b in input: + for b in inp: crc = crc_table[(b ^ crc) & 0xff] return crc -def base32_encode(num, reverse = True): +def base32_encode(num, reverse=True): alpha = "0123456789abcdefghijklmnopqrstuv" encoded = "" while num > 0: - n = num & 0x1f + encoded += alpha[num & 0x1f] num = num >> 5 - encoded += alpha[n] if reverse == True: - encoded = encoded[::-1] # Reverse string + encoded = encoded[::-1] # Reverse string return encoded -def base32_decode(str, reverse = False): +def base32_decode(s, reverse=False): alpha = "0123456789abcdefghijklmnopqrstuv" if reverse == True: - str = str[::-1] # Reverse string + s = s[::-1] # Reverse string - orig = 0 - for b in str: - orig = orig << 5 - orig = orig | alpha.index(b) - - return orig + return reduce(lambda orig, b: ((orig<<5)|alpha.index(b)), s, 0) # Number routines -# I'm not sure what the pythonic way to do this is, so I'm making the code explicit by giving myself functions to -# convert the bytes to ints. -def get_num_from_bytes(data, idx, bytes, bigEndian = False): - # Get only the bytes we want to work with - data = data[idx:idx+bytes] +def get_num_from_bytes(data, idx, fmt, bigEndian=False): + return struct.unpack_from("<>"[bigEndian] + fmt, data, idx)[0] - if bigEndian == True: - data = data[::-1] +# Instead of passing slices, pass the buffer and index so we can calculate +# the length automatically. - num = 0 - i = 0 - while i < bytes and i < len(data): - if type(data[i]) is int: - num |= (data[i] << (8 * i)) - else: - num |= (ord(data[i]) << (8 * i)) - i += 1 - return num - -# Instead of passing slices, pass the buffer and index so we can calculate the length automatically. def get_short(data, idx): - return get_num_from_bytes(data, idx, 2, False) + return get_num_from_bytes(data, idx, 'h', False) -def get_short_be(data, idx): - return get_num_from_bytes(data, idx, 2, True) def get_int(data, idx): - return get_num_from_bytes(data, idx, 4, False) + return get_num_from_bytes(data, idx, 'i', False) -def get_int_be(data, idx): - return get_num_from_bytes(data, idx, 4, True) def get_string(data, idx): data = data[idx:] end = data.index('\0') return str(data[:end]) -def get_bytes_from_num(num, size, bigEndian = False): - output = bytearray(size) - i = 0 - while i < size: - output[i] = (num >> 8 * i) & 0xff +def get_bytes_from_num(num, fmt, bigEndian=False): + return struct.pack("<>"[bigEndian] + fmt, num) - i += 1 - - if bigEndian: - output = output[::-1] - - return output def get_bytes_from_short(num): - return get_bytes_from_num(num, 2, False) + return get_bytes_from_num(num, 'h', False) -def get_bytes_from_short_be(num): - return get_bytes_from_num(num, 2, True) -def get_bytes_from_int(num): - return get_bytes_from_num(num, 4, False) - -def get_bytes_from_int_be(num): - return get_bytes_from_num(num, 4, True) +def get_bytes_from_int(num, be=False): + return get_bytes_from_num(num, 'i', be) # For server logging def create_logger(loggername, filename, level, log_to_console, log_to_file): logging.addLevelName(-1, "TRACE") - format= "[%(asctime)s | " + loggername + "] %(message)s" + fmt = "[%(asctime)s | " + loggername + "] %(message)s" date_format = "%Y-%m-%d %H:%M:%S" #logging.basicConfig(format=format, datefmt=date_format) @@ -166,20 +137,23 @@ def create_logger(loggername, filename, level, log_to_console, log_to_file): # Only needed when logging.basicConfig isn't set. if log_to_console == True: console_logger = logging.StreamHandler() - console_logger.setFormatter(logging.Formatter(format, datefmt=date_format)) + console_logger.setFormatter( + logging.Formatter(fmt, datefmt=date_format)) logger.addHandler(console_logger) if log_to_file == True and filename != "": file_logger = logging.FileHandler(filename) - file_logger.setFormatter(logging.Formatter(format, datefmt=date_format)) + file_logger.setFormatter(logging.Formatter(fmt, datefmt=date_format)) logger.addHandler(file_logger) return logger -def print_hex(data, cols = 16): + +def print_hex(data, cols=16): print pretty_print_hex(data, cols) -def pretty_print_hex(orig_data, cols = 16): + +def pretty_print_hex(orig_data, cols=16): data = bytearray(orig_data) output = "\n"