diff --git a/echo_client.py b/echo_client.py index 6b2f047..6ce1df4 100644 --- a/echo_client.py +++ b/echo_client.py @@ -3,23 +3,24 @@ def client(msg, log_buffer=sys.stderr): + buffer_size = 16 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_IP) 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 = '' + # this try/finally block exists purely to allow us to close the socket # when we are finished with it try: print('sending "{0}"'.format(msg), file=log_buffer) # TODO: send your message to the server here. - + sock.sendall(msg.encode('utf-8')) # 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 @@ -27,12 +28,21 @@ 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) + # chunk = '' + chunk = sock.recv(buffer_size) + # received_message = b'' + received_message = chunk + while len(chunk) == buffer_size: + chunk = sock.recv(buffer_size) + received_message += chunk + print('received "{0}"'.format(received_message.decode('utf8')), + file=log_buffer) finally: # TODO: after you break out of the loop receiving echoed chunks from # the server you will want to close your client socket. + sock.close() print('closing socket', file=log_buffer) + return received_message # 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. @@ -45,4 +55,5 @@ def client(msg, log_buffer=sys.stderr): sys.exit(1) msg = sys.argv[1] + print('client') client(msg) diff --git a/echo_server.py b/echo_server.py index 44f853a..5bdfbca 100644 --- a/echo_server.py +++ b/echo_server.py @@ -3,11 +3,16 @@ def server(log_buffer=sys.stderr): + buffer_size = 16 # set an address for our server 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 = None + sock = socket.socket(socket.AF_INET, + socket.SOCK_STREAM, socket.IPPROTO_TCP) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + # 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 +26,9 @@ 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(1) + try: # the outer loop controls the creation of new connection sockets. The # server will handle each incoming connection one at a time. @@ -32,26 +40,38 @@ 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) - + chunk = conn.recv(buffer_size) # the inner loop will receive messages sent by the client in # buffers. When a complete message has been received, the # loop will exit - while True: + data = chunk + while len(chunk) == buffer_size: + chunk = conn.recv(buffer_size) + print(chunk) + print(len(chunk)) + # print(chunk[-1]) + data += chunk # TODO: receive 16 bytes of data from the client. Store # the data you receive as 'data'. Replace the # following line with your code. It's only here as # a placeholder to prevent an error in string # formatting - data = b'' - print('received "{0}"'.format(data.decode('utf8'))) + # data = b'' + ''' + ''' + print('received "{0}"'.format(data.decode('utf8'))) + print('test') + print(data) + conn.sendall(data) # TODO: Send the data you received back to the client, log # the fact using the print statement here. It will help in # debugging problems. - print('sent "{0}"'.format(data.decode('utf8'))) + #print('sent "{0}"'.format(data.decode('utf8'))) # TODO: Check here to see whether you have received the end # of the message. If you have, then break from the `while True` @@ -66,10 +86,10 @@ def server(log_buffer=sys.stderr): # TODO: When the inner loop exits, this 'finally' clause will # be hit. Use that opportunity to close the socket you # created above when a client connected. + print( 'echo complete, client connection closed', file=log_buffer ) - except KeyboardInterrupt: # TODO: Use the python KeyboardInterrupt exception as a signal to # close the server socket and exit from the server function. @@ -80,5 +100,6 @@ def server(log_buffer=sys.stderr): if __name__ == '__main__': + print('server') server() sys.exit(0)