From 56f53dccfea9e1cc6ab2123ae918c8035ad54d7e Mon Sep 17 00:00:00 2001 From: Patrick Marsee Date: Fri, 25 Nov 2016 12:26:07 -0500 Subject: [PATCH] fixed various bugs in packets.py and spelling_mp.py --- __pycache__/packets.cpython-34.pyc | Bin 0 -> 11112 bytes __pycache__/spell.cpython-34.pyc | Bin 0 -> 7629 bytes __pycache__/status.cpython-34.pyc | Bin 0 -> 443 bytes packets.py | 20 ++++++++++---------- spelling_mp.py | 7 +++++-- 5 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 __pycache__/packets.cpython-34.pyc create mode 100644 __pycache__/spell.cpython-34.pyc create mode 100644 __pycache__/status.cpython-34.pyc diff --git a/__pycache__/packets.cpython-34.pyc b/__pycache__/packets.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cbd4f7f628ac7d72b46d517fe2da5e3b40714ab1 GIT binary patch literal 11112 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 Ge)hi}sWa#R literal 0 HcmV?d00001 diff --git a/__pycache__/spell.cpython-34.pyc b/__pycache__/spell.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..61e5e2942d6dca163efd04fbbf581b2d331b9a68 GIT binary patch literal 7629 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 WEZP;jQWzf^A0Pj9WxQhLivI(WtBq0s literal 0 HcmV?d00001 diff --git a/__pycache__/status.cpython-34.pyc b/__pycache__/status.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6dbd8d7621479aac62e0bebaf5e84aba508d1dc8 GIT binary patch literal 443 zcmYjNO-lnY5PivhwAvOy5D~n1l0~pr4v| zht$U#k(6-6QSiKD%A{PH^J2B8Ui8M~T`d=#?=5XJAb0^Xpsc(y4>J$?^#4dz0W3B$ zzv2UAp_}9ATK8SIPwjN;G2aMj&N%XVmOZRF*+(_om?uv{$+DE%*uWH0DZ3ZDFkMVU zUnMK4ZP4x9b-Fg(%x%MNrMLBXa5EUjoj78nu&AW(&+C|bU= 7: address = (ipAddress, port) - else + else: address = (socket.gethostname(), port) serverSocket.bind(address) serverSocket.listen(expectedClients) @@ -126,36 +126,36 @@ class QuickStreamServer(PacketUtility): """Get a tuple of byte-size ints from each client.""" ret = [] for i in range(len(self.clients)): - ret.append(QuickStreamServer.get_int(self.clients[i][0], 1) - return tuple(ret) + ret.append(QuickStreamServer.get_int(self.clients[i][0], 1)) + return ret def getShort(self): """Get a tuple of short ints from each client.""" ret = [] for i in range(len(self.clients)): - ret.append(QuickStreamServer.get_int(self.clients[i][0], 2) - return tuple(ret) + ret.append(QuickStreamServer.get_int(self.clients[i][0], 2)) + return ret def getInt(self): """Get a tuple of ints from each client.""" ret = [] for i in range(len(self.clients)): - ret.append(QuickStreamServer.get_int(self.clients[i][0], 4) - return tuple(ret) + ret.append(QuickStreamServer.get_int(self.clients[i][0], 4)) + return ret def getLong(self): """Get a tuple of long ints from each client.""" ret = [] for i in range(len(self.clients)): - ret.append(QuickStreamServer.get_int(self.clients[i][0], 8) - return tuple(ret) + ret.append(QuickStreamServer.get_int(self.clients[i][0], 8)) + return ret def getString(self): """Get a string from each client.""" ret = [] for i in range(len(self.clients)): ret.append(QuickStreamServer.get_str(self.clients[i][0])) - return tuple(ret) + return ret def sendByte(self, message): """Send a tuple of byte-size ints to each client.""" diff --git a/spelling_mp.py b/spelling_mp.py index 6030736..744d714 100644 --- a/spelling_mp.py +++ b/spelling_mp.py @@ -56,10 +56,13 @@ def server(): player1 = Player() player2 = Player() - print("Tell your friend to connect to " + socket.gethostbyname(socket.gethostname())) + #print("Tell your friend to connect to " + socket.gethostbyname(socket.gethostname())) + #Linus only, duct tape quick fix: + ip = input("Your ip addr: ") server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - server_socket.bind((socket.gethostname(), 1028)) + #server_socket.bind((socket.gethostname(), 1028)) + server_socket.bind((ip, 1028)) server_socket.listen(1) (client_socket, address) = server_socket.accept() server_socket.close()