diff options
| -rwxr-xr-x | main.py | 25 |
1 files changed, 10 insertions, 15 deletions
@@ -95,7 +95,6 @@ async def _parse_pkt(app, pkt): async def home(request): - # i_query = request.app['i_query'] data = request.match_info.get('data', "") ctx = _default_context('main') ctx.update(locals()) @@ -401,10 +400,7 @@ async def make_app(args, manager): q_cont = manager.Queue() q_mle = manager.Queue() - if args.ife: - ife = args.ife - else: - ife = 'WiFi' + ife = args.ife if args.mode == "live": mode = manager.Value('i', MODE_LIVE) @@ -413,12 +409,12 @@ async def make_app(args, manager): else: mode = manager.Value('i', MODE_IDLE) - # filename = mp.Value(ctypes.c_char_p, args.file.encode("utf-8")) ns.filename = args.file df = args.df time = (float(args.ts), float(args.tf)) - + + # Start the PyShark process p1 = Process(target=_run_shark, args=(q_cont, q_mle, ife, df, mode, ns, time)) p1.start() @@ -444,7 +440,7 @@ async def make_app(args, manager): web.get('/mle', mle), web.get('/fabric', fabric), web.get('/help', support), - web.get('/lmmi', lmmi), + web.get('/lmmi', lmmi), # Lattice Memory Mapped Interface web.post('/start', start), web.post('/stop', stop), web.post('/filename', set_filename), @@ -458,19 +454,18 @@ async def make_app(args, manager): if __name__ == '__main__': - parser = argparse.ArgumentParser(description='Private Island Mind Net', epilog='Version: ' + str(VERSION)) - parser.add_argument('--ipaddr_pc', default="192.168.5.40", help="IP Addr of this PC") - parser.add_argument('--ipaddr_betsy', default="192.168.5.100", help="IP Addr of Betsy") - parser.add_argument('--port', type=int, default=8010, help="Web server port number") - parser.add_argument('-d', '--df', default="ip.addr==192.168.5.100", help='display filter', action='store', required=False) + parser = argparse.ArgumentParser(description='Private Island Explorer', epilog='Version: ' + str(VERSION)) + parser.add_argument('--ipaddr_pc', default="192.168.5.40", help="IP address of this PC and desired network interface") + parser.add_argument('--ipaddr_betsy', default="192.168.5.100", help="IP address of Betsy internal controller") + parser.add_argument('--port', type=int, default=8010, help="This Web server port number") + parser.add_argument('-d', '--df', default="ip.addr==192.168.5.100", help='Tshark display filter', action='store', required=False) parser.add_argument('--ife', default='WiFi', help='tshark interface', action='store', required=False) parser.add_argument('--iq', type=int, default=0, help='enable initial query on startup', action='store', required=False) parser.add_argument('-m', '--mode', default="live", help='mode live or file replay', action='store', required=False) parser.add_argument('-f', '--file', default="logs\\test.pcapng", help='Wireshark log file', action='store', required=False) parser.add_argument('--ts', default="0", help='time start for file replay', action='store', required=False) - parser.add_argument('--tf', default="100000.00", help='time last for file replay', action='store', required=False) + parser.add_argument('--tf', default="100000.00", help='time final for file replay', action='store', required=False) args = parser.parse_args() - filename = args.file logging.basicConfig(level=logging.DEBUG) manager = Manager() |
