data handler improves, written test for nfproxy, new option on parsing fail

tests/utils/tcpserver.py

@@ -1,34 +1,72 @@
 from multiprocessing import Process
 import socket
+import traceback
 
 class TcpServer:
-    def __init__(self,port,ipv6,proxy_port=None):
-        def _startServer(port):
-            sock = socket.socket(socket.AF_INET6 if ipv6 else socket.AF_INET, socket.SOCK_STREAM)
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            sock.bind(('::1' if ipv6 else '127.0.0.1', port))
-            sock.listen(8)
-            while True:  
-                connection,address = sock.accept()  
-                buf = connection.recv(4096)  
-                connection.send(buf)    		
-                connection.close()
+    def __init__(self,port,ipv6,proxy_port=None, verbose=False):
         self.proxy_port = proxy_port
         self.ipv6 = ipv6
         self.port = port
-        self.server = Process(target=_startServer,args=[port])
+        self.verbose = verbose
+        self._regen_process()
+
+    def _regen_process(self):
+        def _startServer(port):
+            sock = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM)
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.bind(('::1' if self.ipv6 else '127.0.0.1', port))
+            sock.listen(8)
+            while True:
+                connection,address = sock.accept()
+                while True:
+                    try:
+                        buf = connection.recv(4096)
+                        if buf == b'':
+                            break
+                        if self.verbose:
+                            print("SERVER: ", buf)
+                        connection.sendall(buf)
+                    except Exception:
+                        if self.verbose:
+                            traceback.print_exc()
+                connection.close()
+        self.server = Process(target=_startServer,args=[self.port])
 
     def start(self):
         self.server.start()
     
     def stop(self):
         self.server.terminate()
+        self.server.join()
+        self._regen_process()
 
-    def sendCheckData(self,data):
-        s = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM)
-        s.settimeout(1)
-        s.connect(('::1' if self.ipv6 else '127.0.0.1', self.proxy_port if self.proxy_port else self.port), )
-        s.sendall(data)
-        received_data = s.recv(4096)
-        s.close()
+    def connect_client(self):
+        self.client_sock = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM)
+        self.client_sock.settimeout(1)
+        self.client_sock.connect(('::1' if self.ipv6 else '127.0.0.1', self.proxy_port if self.proxy_port else self.port))      
+
+    def close_client(self):
+        if self.client_sock:
+            self.client_sock.close()
+
+    def send_packet(self, packet):
+        if self.verbose:
+            print("CLIENT: ", packet)
+        self.client_sock.sendall(packet)
+    
+    def recv_packet(self):
+        try:
+            return self.client_sock.recv(4096)
+        except TimeoutError:
+            if self.verbose:
+                traceback.print_exc()
+            return False
+    
+    def sendCheckData(self, data, get_data=False):
+        self.connect_client()
+        self.send_packet(data)
+        received_data = self.recv_packet()
+        self.close_client()
+        if get_data:
+            return received_data
         return received_data == data