STRLCPY/geneva

■ ■ ■ ■ ■ ■

plugins/plugin_client.py

		skipped 40 lines
41	41		choices=("debug", "info", "warning", "critical", "error"),
42	42		help="Sets the log level")
43	43		parser.add_argument('--port', action='store', type=int, help='port to run this server on')
	44	+	parser.add_argument('--interface', action='store', help='interface to run the engine on for client-side training')
44	45
45	46		parser.add_argument('--wait-for-censor', action='store_true', help='send control packets to the censor to get startup confirmation')
46	47
		skipped 13 lines
60	61		eid = args.get("environment_id")
61	62		use_engine = not args.get("no_engine")
62	63		port = args.get("port")
	64	+	interface = args.get("interface")
63	65		server_side = args.get("server_side")
64	66		assert port, "Need to specify a port in order to launch a sniffer"
65	67
		skipped 3 lines
69	71		with actions.sniffer.Sniffer(pcap_filename, port, logger) as sniff:
70	72
71	73		# Conditionally initialize the engine
72		-	with engine.Engine(port, args.get("strategy"), server_side=False, environment_id=eid, output_directory=output_path, log_level=args.get("log", "info"), enabled=use_engine) as eng:
	74	+	with engine.Engine(port, args.get("strategy"), server_side=False, environment_id=eid, output_directory=output_path, log_level=args.get("log", "info"), interface=interface, enabled=use_engine) as eng:
73	75		# Wait for the censor to start up, if one is running
74	76		if args.get("wait_for_censor"):
75	77		self.wait_for_censor(args.get("server"), port, eid, output_path)
		skipped 56 lines

■ ■ ■ ■ ■ ■

plugins/plugin_server.py

		skipped 44 lines
45	45		choices=("debug", "info", "warning", "critical", "error"),
46	46		help="Sets the log level")
47	47		parser.add_argument('--port', action='store', type=int, help='port to run this server on')
	48	+	parser.add_argument('--interface', action='store_true', help='interface to run the engine on for server-side training')
48	49
49	50		parser.add_argument('--external-server', action='store_true', help="use an external server for testing.")
50	51
		skipped 19 lines
70	71		eid = args["environment_id"]
71	72		use_engine = not args.get("no_engine", False)
72	73		port = args["port"]
	74	+	interface = args.get("interface")
73	75		server_side = args["server_side"]
74	76		log_level = args["log"]
75	77		strategy = args.get("strategy", "")
		skipped 18 lines
94	96		self.sniffer = actions.sniffer.Sniffer(pcap_filename, int(port), logger).__enter__()
95	97
96	98		# Conditionally initialize the engine
97		-	self.engine = engine.Engine(port, strategy, server_side=True, environment_id=eid, output_directory=output_path, log_level=args.get("log", "info"), enabled=use_engine, forwarder=forwarder).__enter__()
	99	+	self.engine = engine.Engine(port, strategy, server_side=True, environment_id=eid, output_directory=output_path, log_level=args.get("log", "info"), enabled=use_engine, interface=interface, forwarder=forwarder).__enter__()
98	100
99	101		# Run the plugin
100	102		self.server_proc = multiprocessing.Process(target=self.start_thread, args=(args, logger))
		skipped 108 lines