v1.9.7

qwj · web-flow · commit 4ac207c3631d · 2018-12-23T23:39:12.000+08:00
diff --git a/pproxy/__doc__.py b/pproxy/__doc__.py
@@ -1,5 +1,5 @@
 __title__       = "pproxy"
-__version__     = "1.9.6"
+__version__     = "1.9.7"
 __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/server.py b/pproxy/server.py
@@ -4,6 +4,7 @@
 
 SOCKET_TIMEOUT = 300
 PACKET_SIZE = 65536
+UDP_LIMIT = 150
 DUMMY = lambda s: s
 
 asyncio.StreamReader.read_ = lambda self: self.read(PACKET_SIZE)
@@ -210,28 +211,35 @@ def __init__(prot, data):
                 self.udpmap[addr] = prot
                 prot.databuf = [data]
                 prot.transport = None
+                prot.update = 0
             def connection_made(prot, transport):
                 prot.transport = transport
                 for data in prot.databuf:
                     transport.sendto(data)
                 prot.databuf.clear()
+                prot.update = time.time()
             def new_data_arrived(prot, data):
                 if prot.transport:
                     prot.transport.sendto(data)
                 else:
                     prot.databuf.append(data)
+                prot.update = time.time()
             def datagram_received(prot, data, addr):
                 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)
+                prot.update = time.time()
             def connection_lost(prot, exc):
-                self.udpmap.pop(addr)
+                self.udpmap.pop(addr, None)
         if addr in self.udpmap:
             self.udpmap[addr].new_data_arrived(data)
         else:
             if self.direct and host == 'tunnel':
                 raise Exception('Unknown tunnel endpoint')
             self.connection_change(1)
+            if len(self.udpmap) > UDP_LIMIT:
+                min_addr = min(self.udpmap, key=lambda x: self.udpmap[x].update)
+                self.udpmap.pop(min_addr).close()
             prot = Protocol(data)
             remote_addr = (host, port) if self.direct else (self.host_name, self.port)
             await asyncio.get_event_loop().create_datagram_endpoint(lambda: prot, remote_addr=remote_addr)
diff --git a/pproxy/verbose.py b/pproxy/verbose.py
@@ -41,7 +41,9 @@ def setup(loop, args):
     def verbose(s):
         if args.v >= 2:
             sys.stdout.write('\x1b[32m'+time.strftime('%Y-%m-%d %H:%M:%S')+'\x1b[m ')
-        sys.stdout.write(s+'\x1b[0K\n')
+            sys.stdout.write(s+'\x1b[0K\n')
+        else:
+            sys.stdout.write(s+'\n')
         sys.stdout.flush()
     args.verbose = verbose
     args.stats = {0: [0]*6}
