burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed address passing

Browse Source
This commit is contained in:
Adolfo Gómez García 2022-04-04 21:20:22 +02:00
parent 502cebfc3a
commit 4e78c2837c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tunnel-server/src/udstunnel.py
View File

@ -102,7 +102,7 @@ async def tunnel_proc_async(
tasks: typing.List[asyncio.Task] = [] tasks: typing.List[asyncio.Task] = []
def get_socket() -> typing.Optional[socket.socket]: def get_socket() -> typing.Tuple[typing.Optional[socket.socket], typing.Optional[typing.Tuple[str, int]]]:
try: try:
while True: while True:
# Clear back event, for next data # Clear back event, for next data
@ -110,10 +110,10 @@ async def tunnel_proc_async(
typing.Tuple[socket.socket, typing.Tuple[str, int]] typing.Tuple[socket.socket, typing.Tuple[str, int]]
] = pipe.recv() ] = pipe.recv()
if msg: if msg:
return msg[0] return msg
except Exception: except Exception:
logger.exception('Receiving data from parent process') logger.exception('Receiving data from parent process')
return None return None, None
async def run_server() -> None: async def run_server() -> None:
# Instantiate a proxy redirector for this process (we only need one per process!!) # Instantiate a proxy redirector for this process (we only need one per process!!)
@ -130,15 +130,15 @@ async def tunnel_proc_async(
context.load_dh_params(cfg.ssl_dhparam) context.load_dh_params(cfg.ssl_dhparam)
while True: while True:
address: typing.Tuple[str, int] = ('', 0) address: typing.Optional[typing.Tuple[str, int]] = ('', 0)
try: try:
sock = await loop.run_in_executor(None, get_socket) (sock, address) = await loop.run_in_executor(None, get_socket)
if not sock: if not sock:
break # No more sockets, exit break # No more sockets, exit
logger.debug(f'CONNECTION from {address!r} (pid: {os.getpid()})') logger.debug(f'CONNECTION from {address!r} (pid: {os.getpid()})')
tasks.append(asyncio.create_task(tunneler(sock, context))) tasks.append(asyncio.create_task(tunneler(sock, context)))
except Exception: except Exception:
logger.error('NEGOTIATION ERROR from %s', address[0]) logger.error('NEGOTIATION ERROR from %s', address[0] if address else 'unknown')
# create task for server # create task for server
tasks.append(asyncio.create_task(run_server())) tasks.append(asyncio.create_task(run_server()))