From 8531ea97f469c5c6ba9eefbfe0c34a1f00b3eba3 Mon Sep 17 00:00:00 2001 From: MikeS-1 <36141900+MikeS-1@users.noreply.github.com> Date: Fri, 15 Mar 2019 18:48:30 -0400 Subject: [PATCH] Updated server and client --- echo_client.py | 21 ++++++++++++++------- echo_server.py | 15 +++++++++++---- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/echo_client.py b/echo_client.py index a2e9b29..6858770 100644 --- a/echo_client.py +++ b/echo_client.py @@ -7,10 +7,10 @@ def client(msg, log_buffer=sys.stderr): server_address = ('localhost', 10000) # TODO: Replace the following line with your code which will instantiate # a TCP socket with IPv4 Addressing, call the socket you make 'sock' - sock = None + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP) print('connecting to {0} port {1}'.format(*server_address), file=log_buffer) # TODO: connect your socket to the server here. - + sock.connect(server_address) # you can use this variable to accumulate the entire message received back # from the server received_message = '' @@ -20,7 +20,7 @@ def client(msg, log_buffer=sys.stderr): try: print('sending "{0}"'.format(msg), file=log_buffer) # TODO: send your message to the server here. - + sock.sendall(msg.encode('utf8')) # TODO: the server should be sending you back your message as a series # of 16-byte chunks. Accumulate the chunks you get to build the # entire reply from the server. Make sure that you have received @@ -28,8 +28,15 @@ def client(msg, log_buffer=sys.stderr): # # Log each chunk you receive. Use the print statement below to # do it. This will help in debugging problems - chunk = '' - print('received "{0}"'.format(chunk.decode('utf8')), file=log_buffer) + while True: + chunk = sock.recv(16) + received_message += chunk.decode('utf8') + print('received "{0}"'.format(chunk.decode('utf8')), file=log_buffer) + if len(chunk) < 16: + break + + + except Exception as e: traceback.print_exc() sys.exit(1) @@ -37,10 +44,10 @@ def client(msg, log_buffer=sys.stderr): # TODO: after you break out of the loop receiving echoed chunks from # the server you will want to close your client socket. print('closing socket', file=log_buffer) - + sock.close() # TODO: when all is said and done, you should return the entire reply # you received from the server as the return value of this function. - + return received_message if __name__ == '__main__': if len(sys.argv) != 2: diff --git a/echo_server.py b/echo_server.py index 299f009..34bd69e 100644 --- a/echo_server.py +++ b/echo_server.py @@ -8,7 +8,7 @@ def server(log_buffer=sys.stderr): address = ('127.0.0.1', 10000) # TODO: Replace the following line with your code which will instantiate # a TCP socket with IPv4 Addressing, call the socket you make 'sock' - sock = None + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP) # TODO: You may find that if you repeatedly run the server script it fails, # claiming that the port is already used. You can set an option on # your socket that will fix this problem. We DID NOT talk about this @@ -21,6 +21,8 @@ def server(log_buffer=sys.stderr): # TODO: bind your new sock 'sock' to the address above and begin to listen # for incoming connections + sock.bind(address) + sock.listen(5) try: # the outer loop controls the creation of new connection sockets. The @@ -33,7 +35,7 @@ def server(log_buffer=sys.stderr): # the client so we can report it below. Replace the # following line with your code. It is only here to prevent # syntax errors - conn, addr = ('foo', ('bar', 'baz')) + conn, addr = sock.accept() try: print('connection - {0}:{1}'.format(*addr), file=log_buffer) @@ -46,12 +48,13 @@ def server(log_buffer=sys.stderr): # following line with your code. It's only here as # a placeholder to prevent an error in string # formatting - data = b'' + data = conn.recv(16) print('received "{0}"'.format(data.decode('utf8'))) # TODO: Send the data you received back to the client, log # the fact using the print statement here. It will help in # debugging problems. + conn.sendall(data) print('sent "{0}"'.format(data.decode('utf8'))) # TODO: Check here to see whether you have received the end @@ -62,6 +65,9 @@ def server(log_buffer=sys.stderr): # message is a trick we learned in the lesson: if you don't # remember then ask your classmates or instructor for a clue. # :) + if len(data) < 16: + break + except Exception as e: traceback.print_exc() sys.exit(1) @@ -72,15 +78,16 @@ def server(log_buffer=sys.stderr): print( 'echo complete, client connection closed', file=log_buffer ) + conn.close() except KeyboardInterrupt: # TODO: Use the python KeyboardInterrupt exception as a signal to # close the server socket and exit from the server function. # Replace the call to `pass` below, which is only there to # prevent syntax problems - pass print('quitting echo server', file=log_buffer) + sock.close() if __name__ == '__main__': server()