Improved Error Handling

Not only did I improve error handling I also removed unneeded pieces of code.

Author: RhysMJ2

interface.py

@@ -1,17 +1,11 @@
 ## Interface ##
-## v 0.9 ##
+## v 0.92 ##
 
 import tcp
 
-def inter(remote_ip, port, data=""):
+## Will return False if there is an error
+def inter(remote_ip, port, data):
     rep = 0
-    #Can be IP or domain name
-    #remote_ip = input("Host address: ")
-
-    #The port that you want to connect to
-    #port = int(input("Input Port: "))
-        
-    #data = input("Enter data: ")
     if data != "":
         s = tcp.connect(remote_ip, port)
 
@@ -36,7 +30,8 @@ def inter(remote_ip, port, data=""):
     else:
         return False
 
-ip = '192.168.1.11'
-port = 5050
-info = inter(ip, port,data=input("Enter Data: "))
-print(info)
+if __name__ == "__main__":
+    ip = input("Enter ip to connect to: ")
+    port = 5050
+    info = inter(ip, port,data=input("Enter Data: "))
+    print(info)

server.py

@@ -1,30 +1,28 @@
-## Example use of tcp v0.92 ##
+## Example use of tcp v0.93 ##
 ## R. M. Jones ##
 ## 01/07/2017 ##
 
 import tcp  #imoprts the module that is included with this file
 
 def server(BUFFER_SIZE, TCP_IP=tcp.getmyip(), TCP_PORT=5050):
-    
-    data =0
-    #TCP_IP = tcp.getmyip() #Gets your private ip address
-    #TCP_PORT = int(input("Enter port: ")) #The port that will be open
-    BUFFER_SIZE = 20  # Normally 1024, but we want fast response
-
     conn = tcp.bind(TCP_IP, TCP_PORT)
-
-    
+        
     data = tcp.receive(conn, BUFFER_SIZE)
     if not data:
         conn = tcp.bind(TCP_IP, TCP_PORT)
     else:
         return "received data: " + data, conn
-
+    
 
 if __name__ == "__main__":
     info = 0
+    s = 0
     while info != "stop":
-        info, s = server(20)
-        print(info)
-        tcp.send(info, s)    
-        s.close()
+        try:
+            info, s = server(20)
+            print(info)
+            tcp.send(info, s)    
+            s.close()
+        except TypeError:
+            print("Error, Type Error")
+            tcp.send("Repeat", s)

tcp.py

@@ -37,13 +37,22 @@ def getmyip():
 
 #The default ip is your local one and port is 5050
 def bind(TCP_IP=getmyip(), TCP_PORT=5050):
-    s = create()
-    s.bind((TCP_IP, TCP_PORT))
-    print("Ready to connect on: "+TCP_IP+" on port:", TCP_PORT)
+    try:
+        s = create()
+        s.bind((TCP_IP, TCP_PORT))
+        print("Ready to connect on: "+TCP_IP+" on port:", TCP_PORT)
+    except OSError:
+        print("Cannot connect please check your PC")
+        exit()
+
+    except:
+        print("Ready to connect on: "+TCP_IP+" on port:", TCP_PORT)        
+
     s.listen(1)
     conn, addr = s.accept()
     print ('Connection address:', addr)
     return conn
+    
 
 def create():
     try:
@@ -75,6 +84,10 @@ def connect(remote_ip, port):
         except ConnectionRefusedError:
             print("Connection Refused Error (likely because other machine's port isn't open)")
             return False
+
+        except TimeoutError:
+            print("Connection timed out")
+            return False
 
     except ConnectionRefusedError:
         print("Connection Refused Error (likely because other machine's port isn't open)")
@@ -105,4 +118,4 @@ def receive(s, buff=4069):
     except ConnectionAbortedError:
         print("Error ConnectionAbortedError")
         return False
-#connect(socket.gethostbyname(socket.gethostname()), 5005)
+