beau/relab
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

netgenie-srv: Fixed issue with incoming_queue through an exception.

Browse Source
This commit is contained in:
BB 2023-05-08 03:25:14 +00:00
parent ac93959321
commit 5ae7bc1a7d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NetGuard

@ -1 +1 @@
Subproject commit 990786c49eb008aaf82c0179a1944c8e2e0fd43c Subproject commit dec7cce32ff6942c18c3454291204bca42e7cbca

14
server/NetGenieSrv.py
View File

@ -13,8 +13,8 @@ class NGServer:
def __init__(self, bridge_ip='127.0.0.1', bridge_port=8000, def __init__(self, bridge_ip='127.0.0.1', bridge_port=8000,
ioip='127.0.0.1', ioip='127.0.0.1',
incoming_port=8001, outgoing_port=8002): incoming_port=8001, outgoing_port=8002):
self.incoming_queue = asyncio.Queue() self.incoming_queue = None # asyncio.Queue()
self.outgoing_queue = asyncio.Queue() self.outgoing_queue = None # asyncio.Queue()
self.client_reader = None self.client_reader = None
self.client_writer = None self.client_writer = None
self.server_reader = None self.server_reader = None
@ -38,6 +38,7 @@ class NGServer:
await self.incoming_queue.put(data) await self.incoming_queue.put(data)
async def handle_incoming(self, reader, writer): async def handle_incoming(self, reader, writer):
self.incoming_queue = asyncio.Queue()
while True: while True:
data = await self.incoming_queue.get() data = await self.incoming_queue.get()
writer.write(data) writer.write(data)
@ -47,6 +48,7 @@ class NGServer:
self.server_reader = reader self.server_reader = reader
self.server_writer = writer self.server_writer = writer
print_dbg("handle_outgoing - ENTER") print_dbg("handle_outgoing - ENTER")
self.outgoing_queue = asyncio.Queue()
while True: while True:
print_dbg("handle_outgoing - IN LOOP") print_dbg("handle_outgoing - IN LOOP")
data = await reader.read(1024) data = await reader.read(1024)
@ -157,8 +159,16 @@ def main():
""" """
The NGServer class implements our NetGenie debug/bridge server. The NGServer class implements our NetGenie debug/bridge server.
ng = NGServer(bridge_ip=args.bridge_ip,
bridge_port=args.bridge_port,
ioip=args.ioip,
incoming_port=args.incoming_port,
outgoing_port=args.outgoing_port)
# asyncio.run(start_thread(ng))
""" """
args = parseArgs() args = parseArgs()
startServerAndWait(args) startServerAndWait(args)
if __name__ == '__main__': if __name__ == '__main__':