Ctrl-C termination

Author: Francesco Mecatti

ProtocolImplementation/ClientProtocolImplementation/ClientProtocol.py

@@ -19,6 +19,8 @@ def input(self):
                 raise ConnectionError("Server not confirming")
             if not self.status_handler.is_code("End", self.s.recv(CODEBYTES)):
                 raise ConnectionError("Server not ending")
+        except KeyboardInterrupt:
+            raise KeyboardInterrupt
         except:
             print("Error with transmission. Try again")
 

client.py

@@ -21,13 +21,19 @@ def start(self):
                 file_handler.download()
 
 def main():
-    ip, port = input("Ip address: "), input("Port: ")
+    try:
+        ip, port = input("Ip address: "), input("Port: ")
+    except KeyboardInterrupt:
+        print("\n\nStopping...")
+        exit()
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     try:
         s.connect((ip, int(port)))
         print(f"Connected to {s.getsockname()}")
         user_handler = UserHandler(s)
         user_handler.start()
+    except KeyboardInterrupt:
+        print("\n\nExiting...")
     finally:
         s.close()
 

server.py

@@ -51,6 +51,7 @@ def handle(self):
 h/H: Help
 q: Exit""")
             elif cmd == 'q':
+                protocol_handler.close_connection()
                 break
             else:
                 protocol_handler.send_output("Command not found")
@@ -67,7 +68,11 @@ def main():
                         datefmt="%H:%M:%S")
     logging.info("Server running...")
     server = ThreadedTCPServer((HOST, PORT), ThreadedTCPRequestHandler)
-    server.serve_forever()
+    try:
+        server.serve_forever()
+    except KeyboardInterrupt:
+        print("\nStopping server. Waiting for the termination of all open connections...")
+        server.server_close()
 
 
 if __name__ == "__main__":