arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Fix traceback when starting packet capture on builtin nodes. Fixes https://github.com/GNS3/gns3-gui/issues/2743

Browse Source
This commit is contained in:
grossmj 2019-03-25 16:57:36 +08:00
parent 106df1d4ab
commit 2bb1b61526
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gns3server/compute/iou/iou_vm.py
View File

@ -406,6 +406,7 @@ class IOUVM(BaseNode):
config = configparser.ConfigParser() config = configparser.ConfigParser()
try: try:
log.info("Checking IOU license in '{}'".format(self.iourc_path))
with open(self.iourc_path, encoding="utf-8") as f: with open(self.iourc_path, encoding="utf-8") as f:
config.read_file(f) config.read_file(f)
except OSError as e: except OSError as e:

2
gns3server/handlers/api/compute/atm_switch_handler.py
View File

@ -309,4 +309,4 @@ class ATMSwitchHandler:
node = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"]) node = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
port_number = int(request.match_info["port_number"]) port_number = int(request.match_info["port_number"])
nio = node.get_nio(port_number) nio = node.get_nio(port_number)
await node.stream_pcap_file(nio, node.project.id, request, response) await dynamips_manager.stream_pcap_file(nio, node.project.id, request, response)

2
gns3server/handlers/api/compute/ethernet_hub_handler.py
View File

@ -311,4 +311,4 @@ class EthernetHubHandler:
node = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"]) node = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
port_number = int(request.match_info["port_number"]) port_number = int(request.match_info["port_number"])
nio = node.get_nio(port_number) nio = node.get_nio(port_number)
await node.stream_pcap_file(nio, node.project.id, request, response) await dynamips_manager.stream_pcap_file(nio, node.project.id, request, response)

2
gns3server/handlers/api/compute/ethernet_switch_handler.py
View File

@ -338,4 +338,4 @@ class EthernetSwitchHandler:
node = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"]) node = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
port_number = int(request.match_info["port_number"]) port_number = int(request.match_info["port_number"])
nio = node.get_nio(port_number) nio = node.get_nio(port_number)
await node.stream_pcap_file(nio, node.project.id, request, response) await dynamips_manager.stream_pcap_file(nio, node.project.id, request, response)

2
gns3server/handlers/api/compute/frame_relay_switch_handler.py
View File

@ -309,4 +309,4 @@ class FrameRelaySwitchHandler:
node = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"]) node = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
port_number = int(request.match_info["port_number"]) port_number = int(request.match_info["port_number"])
nio = node.get_nio(port_number) nio = node.get_nio(port_number)
await node.stream_pcap_file(nio, node.project.id, request, response) await dynamips_manager.stream_pcap_file(nio, node.project.id, request, response)