From 2bb1b6152662adc3c0d7988b5782ef3862771c4c Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 25 Mar 2019 16:57:36 +0800 Subject: [PATCH] Fix traceback when starting packet capture on builtin nodes. Fixes https://github.com/GNS3/gns3-gui/issues/2743 --- gns3server/compute/iou/iou_vm.py | 1 + gns3server/handlers/api/compute/atm_switch_handler.py | 2 +- gns3server/handlers/api/compute/ethernet_hub_handler.py | 2 +- gns3server/handlers/api/compute/ethernet_switch_handler.py | 2 +- gns3server/handlers/api/compute/frame_relay_switch_handler.py | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gns3server/compute/iou/iou_vm.py b/gns3server/compute/iou/iou_vm.py index 83c5befa..a572c47a 100644 --- a/gns3server/compute/iou/iou_vm.py +++ b/gns3server/compute/iou/iou_vm.py @@ -406,6 +406,7 @@ class IOUVM(BaseNode): config = configparser.ConfigParser() try: + log.info("Checking IOU license in '{}'".format(self.iourc_path)) with open(self.iourc_path, encoding="utf-8") as f: config.read_file(f) except OSError as e: diff --git a/gns3server/handlers/api/compute/atm_switch_handler.py b/gns3server/handlers/api/compute/atm_switch_handler.py index 6b53faa1..193fe574 100644 --- a/gns3server/handlers/api/compute/atm_switch_handler.py +++ b/gns3server/handlers/api/compute/atm_switch_handler.py @@ -309,4 +309,4 @@ class ATMSwitchHandler: 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"]) 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) diff --git a/gns3server/handlers/api/compute/ethernet_hub_handler.py b/gns3server/handlers/api/compute/ethernet_hub_handler.py index 326f64d7..fedf3418 100644 --- a/gns3server/handlers/api/compute/ethernet_hub_handler.py +++ b/gns3server/handlers/api/compute/ethernet_hub_handler.py @@ -311,4 +311,4 @@ class EthernetHubHandler: 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"]) 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) diff --git a/gns3server/handlers/api/compute/ethernet_switch_handler.py b/gns3server/handlers/api/compute/ethernet_switch_handler.py index e47db0e4..b75511f6 100644 --- a/gns3server/handlers/api/compute/ethernet_switch_handler.py +++ b/gns3server/handlers/api/compute/ethernet_switch_handler.py @@ -338,4 +338,4 @@ class EthernetSwitchHandler: 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"]) 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) diff --git a/gns3server/handlers/api/compute/frame_relay_switch_handler.py b/gns3server/handlers/api/compute/frame_relay_switch_handler.py index 0ec4caee..2ea82c88 100644 --- a/gns3server/handlers/api/compute/frame_relay_switch_handler.py +++ b/gns3server/handlers/api/compute/frame_relay_switch_handler.py @@ -309,4 +309,4 @@ class FrameRelaySwitchHandler: 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"]) 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)