diff --git a/__pycache__/echo_client.cpython-36.pyc b/__pycache__/echo_client.cpython-36.pyc new file mode 100644 index 0000000..e368dca Binary files /dev/null and b/__pycache__/echo_client.cpython-36.pyc differ diff --git a/demo_server.py b/demo_server.py index 71cd234..1dccaac 100644 --- a/demo_server.py +++ b/demo_server.py @@ -7,6 +7,8 @@ server_socket.bind(address) server_socket.listen(1) +print ('waiting') + connection, client_address = server_socket.accept() buffer_size = 4096 diff --git a/echo_client.py b/echo_client.py index a2e9b29..9aa8acc 100644 --- a/echo_client.py +++ b/echo_client.py @@ -7,20 +7,21 @@ 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_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 + # when we are finished with + try: print('sending "{0}"'.format(msg), file=log_buffer) # TODO: send your message to the server here. - + sock.send(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 @@ -28,8 +29,12 @@ 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).decode('utf8') + received_message += chunk + print('received "{0}"'.format(chunk), file=log_buffer) + if len(chunk)<16: + break except Exception as e: traceback.print_exc() sys.exit(1) @@ -37,10 +42,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..6750a8e 100644 --- a/echo_server.py +++ b/echo_server.py @@ -8,19 +8,20 @@ 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 # in class. Find the correct option by reading the very end of the # socket library documentation: # http://docs.python.org/3/library/socket.html#example - + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) # log that we are building a server print("making a server on {0}:{1}".format(*address), file=log_buffer) - # 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 @@ -33,7 +34,9 @@ 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,14 +49,16 @@ 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'' - print('received "{0}"'.format(data.decode('utf8'))) + data = conn.recv(16) + print('received "{}"'.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. - print('sent "{0}"'.format(data.decode('utf8'))) + conn.send(data) + print('sent "{}"'.format(data.decode('utf8'))) + if not data: break # TODO: Check here to see whether you have received the end # of the message. If you have, then break from the `while True` # loop. @@ -69,6 +74,7 @@ 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. + conn.close() print( 'echo complete, client connection closed', file=log_buffer ) @@ -78,7 +84,7 @@ def server(log_buffer=sys.stderr): # 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 + sock.close() print('quitting echo server', file=log_buffer)