Added TCP interface

RNS/Interfaces/TCPInterface.py

@@ -0,0 +1,177 @@
+from .Interface import Interface
+import socketserver
+import threading
+import socket
+import time
+import sys
+import os
+import RNS
+
+class HDLC():
+    FLAG              = 0x7E
+    ESC               = 0x7D
+    ESC_MASK          = 0x20
+
+    @staticmethod
+    def escape(data):
+        data = data.replace(bytes([HDLC.ESC]), bytes([HDLC.ESC, HDLC.ESC^HDLC.ESC_MASK]))
+        data = data.replace(bytes([HDLC.FLAG]), bytes([HDLC.ESC, HDLC.FLAG^HDLC.ESC_MASK]))
+        return data
+
+class ThreadingTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
+    pass
+
+class TCPClientInterface(Interface):
+
+    def __init__(self, owner, name, target_ip=None, target_port=None, connected_socket=None):
+        self.IN  = True
+        self.OUT = False
+        self.transmit_delay = 0.001
+        self.socket = None
+        self.parent_interface = None
+
+        self.name = name
+
+        if connected_socket != None:
+            self.receives = True
+            self.target_ip = None
+            self.target_port = None
+            self.socket = connected_socket
+
+        elif target_ip != None and target_port != None:
+            self.receives = True
+            self.target_ip = target_ip
+            self.target_port = target_port
+
+            RNS.log("Client init: "+str(self))
+            self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            self.socket.connect((self.target_ip, self.target_port))
+
+        self.owner = owner
+        self.online = True
+
+        if connected_socket == None:
+            thread = threading.Thread(target=self.read_loop)
+            thread.setDaemon(True)
+            thread.start()
+
+    def processIncoming(self, data):
+        self.owner.inbound(data, self)
+
+    def processOutgoing(self, data):
+        if self.online:
+            try:
+                data = bytes([HDLC.FLAG])+HDLC.escape(data)+bytes([HDLC.FLAG])
+                self.socket.sendall(data)
+            except Exception as e:
+                RNS.log("Exception occurred while transmitting via "+str(self)+", tearing down interface", RNS.LOG_ERROR)
+                RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+                self.teardown()
+
+
+    def read_loop(self):
+        try:
+            in_frame = False
+            escape = False
+            data_buffer = b""
+
+            while True:
+                data_in = self.socket.recv(1)
+
+                if len(data_in) > 0:
+                    byte = ord(data_in)
+                    if (in_frame and byte == HDLC.FLAG):
+                        in_frame = False
+                        self.processIncoming(data_buffer)
+                    elif (byte == HDLC.FLAG):
+                        in_frame = True
+                        data_buffer = b""
+                    elif (in_frame and len(data_buffer) < RNS.Reticulum.MTU):
+                        if (byte == HDLC.ESC):
+                            escape = True
+                        else:
+                            if (escape):
+                                if (byte == HDLC.FLAG ^ HDLC.ESC_MASK):
+                                    byte = HDLC.FLAG
+                                if (byte == HDLC.ESC  ^ HDLC.ESC_MASK):
+                                    byte = HDLC.ESC
+                                escape = False
+                            data_buffer = data_buffer+bytes([byte])
+                else:
+                    RNS.log("TCP socket for "+str(self)+" was closed, tearing down interface", RNS.LOG_VERBOSE)
+                    self.teardown()
+                    break
+
+                
+        except Exception as e:
+            self.online = False
+            RNS.log("An interface error occurred, the contained exception was: "+str(e), RNS.LOG_ERROR)
+            RNS.log("The interface "+str(self.name)+" is now offline. Restart Reticulum to attempt reconnection.", RNS.LOG_ERROR)
+            raise e
+
+
+    def teardown(self):
+        self.online = False
+        self.OUT = False
+        self.IN = False
+        RNS.Transport.interfaces.remove(self)
+
+
+    def __str__(self):
+        return "TCPInterface["+str(self.name)+"/"+str(self.target_ip)+":"+str(self.target_port)+"]"
+
+
+class TCPServerInterface(Interface):
+
+    def __init__(self, owner, name, bindip=None, bindport=None):
+        self.IN  = True
+        self.OUT = False
+        self.transmit_delay = 0.001
+
+        self.name = name
+
+        if (bindip != None and bindport != None):
+            self.receives = True
+            self.bind_ip = bindip
+            self.bind_port = bindport
+
+            def handlerFactory(callback):
+                def createHandler(*args, **keys):
+                    return TCPInterfaceHandler(callback, *args, **keys)
+                return createHandler
+
+            self.owner = owner
+            address = (self.bind_ip, self.bind_port)
+            self.server = ThreadingTCPServer(address, handlerFactory(self.incoming_connection))
+
+            thread = threading.Thread(target=self.server.serve_forever)
+            thread.setDaemon(True)
+            thread.start()
+
+
+    def incoming_connection(self, handler):
+        RNS.log("Accepting incoming TCP connection", RNS.LOG_VERBOSE)
+        interface_name = "Client on "+self.name
+        spawned_interface = TCPClientInterface(self.owner, interface_name, target_ip=None, target_port=None, connected_socket=handler.request)
+        spawned_interface.OUT = self.OUT
+        spawned_interface.IN  = self.IN
+        spawned_interface.target_ip = handler.client_address[0]
+        spawned_interface.target_port = str(handler.client_address[1])
+        spawned_interface.parent_interface = self
+        RNS.log("Spawned new TCPClient Interface: "+str(spawned_interface), RNS.LOG_VERBOSE)
+        RNS.Transport.interfaces.append(spawned_interface)
+        spawned_interface.read_loop()
+
+    def processOutgoing(self, data):
+        pass
+
+    def __str__(self):
+        return "TCPServerInterface["+self.name+"/"+self.bind_ip+":"+str(self.bind_port)+"]"
+
+class TCPInterfaceHandler(socketserver.BaseRequestHandler):
+    def __init__(self, callback, *args, **keys):
+        self.callback = callback
+        socketserver.BaseRequestHandler.__init__(self, *args, **keys)
+
+    def handle(self):
+        self.callback(handler=self)

RNS/Reticulum.py

@@ -126,6 +126,39 @@ class Reticulum:
 
 						RNS.Transport.interfaces.append(interface)
 
+
+					if c["type"] == "TCPServerInterface":
+						interface = TCPInterface.TCPServerInterface(
+							RNS.Transport,
+							name,
+							c["listen_ip"],
+							int(c["listen_port"])
+						)
+
+						if "outgoing" in c and c.as_bool("outgoing") == True:
+							interface.OUT = True
+						else:
+							interface.OUT = False
+
+						RNS.Transport.interfaces.append(interface)
+
+
+					if c["type"] == "TCPClientInterface":
+						interface = TCPInterface.TCPClientInterface(
+							RNS.Transport,
+							name,
+							c["target_ip"],
+							int(c["target_port"])
+						)
+
+						if "outgoing" in c and c.as_bool("outgoing") == True:
+							interface.OUT = True
+						else:
+							interface.OUT = False
+
+						RNS.Transport.interfaces.append(interface)
+
+
 					if c["type"] == "SerialInterface":
 						port = c["port"] if "port" in c else None
 						speed = int(c["speed"]) if "speed" in c else 9600