quic udp

Author: qwj

README.rst

@@ -116,7 +116,7 @@ Protocols
 +-------------------+------------+------------+------------+------------+--------------+
 | ssh tunnel || ✔ ||| ssh:// |
 +-------------------+------------+------------+------------+------------+--------------+
-| quic | ✔ | ✔ ||| http+quic:// |
+| quic | ✔ | ✔ |✔| ✔| http+quic:// |
 +-------------------+------------+------------+------------+------------+--------------+
 | iptables nat | ✔ |||| redir:// |
 +-------------------+------------+------------+------------+------------+--------------+

pproxy/__init__.py

@@ -1,6 +1,6 @@
 from . importserver
 
 Connection=server.proxies_by_uri
-Server=server.proxy_by_uri
+Server=server.proxies_by_uri
 Rule=server.compile_rule
 DIRECT=server.DIRECT

pproxy/server.py

@@ -326,7 +326,7 @@ def close():
 exceptException:
 pass
 writer.close=close
-asyncdefwait_open_connection(self, *args):
+asyncdefwait_quic_connection(self):
 ifself.handshakeisnotNone:
 ifnotself.handshake.done():
 awaitself.handshake
@@ -340,27 +340,53 @@ def quic_event_received(s, event):
 elifisinstance(event, aioquic.quic.events.ConnectionTerminated):
 self.handshake=None
 self.quic_egress_acm=None
+elifisinstance(event, aioquic.quic.events.StreamDataReceived):
+ifevent.stream_idinself.udpmap:
+self.udpmap[event.stream_id](self.udp_packet_unpack(event.data))
+return
 super().quic_event_received(event)
 self.quic_egress_acm=aioquic.asyncio.connect(self.host_name, self.port, create_protocol=Protocol, configuration=self.quicclient)
 conn=awaitself.quic_egress_acm.__aenter__()
 awaitself.handshake
+asyncdefudp_open_connection(self, host, port, data, addr, reply):
+awaitself.wait_quic_connection()
+conn=self.handshake.result()
+ifaddrinself.udpmap:
+stream_id=self.udpmap[addr]
+else:
+stream_id=conn._quic.get_next_available_stream_id(False)
+self.udpmap[addr] =stream_id
+self.udpmap[stream_id] =reply
+conn._quic._get_or_create_stream_for_send(stream_id)
+conn._quic.send_stream_data(stream_id, data, False)
+conn.transmit()
+asyncdefwait_open_connection(self, *args):
+awaitself.wait_quic_connection()
 conn=self.handshake.result()
 stream_id=conn._quic.get_next_available_stream_id(False)
 conn._quic._get_or_create_stream_for_send(stream_id)
 reader, writer=conn._create_stream(stream_id)
 self.patch_writer(writer)
 returnreader, writer
+asyncdefudp_start_server(self, args):
+importaioquic.asyncio, aioquic.quic.events
+classProtocol(aioquic.asyncio.QuicConnectionProtocol):
+defquic_event_received(s, event):
+ifisinstance(event, aioquic.quic.events.StreamDataReceived):
+stream_id=event.stream_id
+addr= ('quic '+self.bind, stream_id)
+event.sendto=lambdadata, addr: (s._quic.send_stream_data(stream_id, data, False), s.transmit())
+event.get_extra_info={}.get
+asyncio.ensure_future(datagram_handler(event, event.data, addr, **vars(self), **args))
+return
+super().quic_event_received(event)
+returnawaitaioquic.asyncio.serve(self.host_name, self.port, configuration=self.quicserver, create_protocol=Protocol), None
 defstart_server(self, args, stream_handler=stream_handler):
 importaioquic.asyncio
 defhandler(reader, writer):
 self.patch_writer(writer)
 asyncio.ensure_future(stream_handler(reader, writer, **vars(self), **args))
-returnaioquic.asyncio.serve(
-self.host_name,
-self.port,
-configuration=self.quicserver,
-stream_handler=handler
- )
+returnaioquic.asyncio.serve(self.host_name, self.port, configuration=self.quicserver, stream_handler=handler)
 
 classProxySSH(ProxySimple):
 def__init__(self, **kw):
@@ -654,19 +680,19 @@ def main():
 ifoption.sslclient:
 option.sslclient.load_cert_chain(*sslfile)
 option.sslserver.load_cert_chain(*sslfile)
-foroptioninargs.listen+args.rserver:
+foroptioninargs.listen+args.ulisten+args.rserver+args.urserver:
 ifisinstance(option, ProxyQUIC):
 option.quicserver.load_cert_chain(*sslfile)
 ifisinstance(option, ProxyBackward) andisinstance(option.backward, ProxyQUIC):
 option.backward.quicserver.load_cert_chain(*sslfile)
-elifany(map(lambdao: o.sslclientorisinstance(o, ProxyQUIC), args.listen)):
+elifany(map(lambdao: o.sslclientorisinstance(o, ProxyQUIC), args.listen+args.ulisten)):
 print('You must specify --ssl to listen in ssl mode')
 return
 ifargs.test:
 asyncio.get_event_loop().run_until_complete(test_url(args.test, args.rserver))
 return
 ifnotargs.listenandnotargs.ulisten:
-args.listen.append(proxy_by_uri('http+socks4+socks5://:8080/'))
+args.listen.append(proxies_by_uri('http+socks4+socks5://:8080/'))
 args.httpget={}
 ifargs.pac:
 pactext='function FindProxyForURL(u,h){'+ (f'var b=/^(:?{args.block.__self__.pattern})$/i;if(b.test(h))return ""'ifargs.blockelse'')