fix ss udp bug

qwj · web-flow · commit 1b4dfca82c79 · 2018-11-28T22:59:36.000+08:00
diff --git a/pproxy/__doc__.py b/pproxy/__doc__.py
@@ -1,5 +1,5 @@
 __title__       = "pproxy"
-__version__     = "1.9.1"
+__version__     = "1.9.4"
 __license__     = "MIT"
 __description__ = "Proxy server that can tunnel among remote servers by regex rules."
 __keywords__    = "proxy socks http shadowsocks shadowsocksr ssr redirect pf tunnel cipher ssl udp"
diff --git a/pproxy/proto.py b/pproxy/proto.py
@@ -37,6 +37,10 @@ def udp_parse(self, data, **kw):
         raise Exception(f'{self.name} don\'t support UDP server')
     def udp_connect(self, rauth, host_name, port, data, **kw):
         raise Exception(f'{self.name} don\'t support UDP client')
+    def udp_client(self, data):
+        return data
+    def udp_client2(self, host_name, port, data):
+        return data
     async def connect(self, reader_remote, writer_remote, rauth, host_name, port, **kw):
         raise Exception(f'{self.name} don\'t support client')
     async def channel(self, reader, writer, stat_bytes, stat_conn):
@@ -143,6 +147,17 @@ def udp_parse(self, data, auth, **kw):
             return
         host_name, port = socks_address(reader, n)
         return host_name, port, reader.read()
+    def udp_client(self, data):
+        reader = io.BytesIO(data)
+        n = reader.read(1)[0]
+        host_name, port = socks_address(reader, n)
+        return reader.read()
+    def udp_client2(self, host_name, port, data):
+        try:
+            return b'\x01' + socket.inet_aton(host_name) + port.to_bytes(2, 'big') + data
+        except Exception:
+            pass
+        return b'\x03' + packstr(host_name.encode()) + port.to_bytes(2, 'big') + data
     def udp_connect(self, rauth, host_name, port, data, **kw):
         return rauth + b'\x03' + packstr(host_name.encode()) + port.to_bytes(2, 'big') + data
 
diff --git a/pproxy/server.py b/pproxy/server.py
@@ -156,6 +156,7 @@ async def datagram_handler(writer, data, addr, protos, urserver, block, cipher,
             verbose(f'UDP {lproto.name} {remote_text}{roption.logtext(host_name, port)}')
             data = roption.prepare_udp_connection(host_name, port, data)
             def reply(rdata):
+                rdata = lproto.udp_client2(host_name, port, rdata)
                 writer.sendto(cipher.datagram.encrypt(rdata) if cipher else rdata, addr)
             await roption.open_udp_connection(host_name, port, data, addr, reply)
     except Exception as ex:
@@ -220,7 +221,9 @@ def new_data_arrived(prot, data):
                 else:
                     prot.databuf.append(data)
             def datagram_received(prot, data, addr):
-                reply(self.cipher.datagram.decrypt(data) if self.cipher else data)
+                data = self.cipher.datagram.decrypt(data) if self.cipher else data
+                data = self.rproto.udp_client(data) if not self.direct else data
+                reply(data)
             def connection_lost(prot, exc):
                 self.udpmap.pop(addr)
         if addr in self.udpmap:
