From cbb1c9ecfcf23bed32b71414abafb6323f19b649 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 31 Oct 2023 16:45:17 +1000 Subject: [PATCH 1/3] Add project name in gns3+pcap protocol handler URL --- src/app/services/packet-capture.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts index 890543e6..3a18501d 100644 --- a/src/app/services/packet-capture.service.ts +++ b/src/app/services/packet-capture.service.ts @@ -9,7 +9,7 @@ export class PacketCaptureService { startCapture(server: Server, project: Project, link: Link, name: string) { location.assign( - `gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&name=${name}` + `gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}` ); } } From 8253f8da387597e71ec82896d126e9dc564fa86e Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 2 Nov 2023 17:36:41 +1000 Subject: [PATCH 2/3] Add server protocol to gns3+pcap --- src/app/services/packet-capture.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts index 3a18501d..264c57a8 100644 --- a/src/app/services/packet-capture.service.ts +++ b/src/app/services/packet-capture.service.ts @@ -9,7 +9,7 @@ export class PacketCaptureService { startCapture(server: Server, project: Project, link: Link, name: string) { location.assign( - `gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}` + `gns3+pcap://${server.host}:${server.port}?protocol=${server.protocol}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}` ); } } From 896ca927f3386e52345c26e3587fbdeb51fb3276 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 3 Nov 2023 14:44:41 +1000 Subject: [PATCH 3/3] Add correct protocol when capturing with protocol handler --- src/app/services/packet-capture.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts index 264c57a8..642a3d72 100644 --- a/src/app/services/packet-capture.service.ts +++ b/src/app/services/packet-capture.service.ts @@ -9,7 +9,7 @@ export class PacketCaptureService { startCapture(server: Server, project: Project, link: Link, name: string) { location.assign( - `gns3+pcap://${server.host}:${server.port}?protocol=${server.protocol}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}` + `gns3+pcap://${server.host}:${server.port}?protocol=${server.protocol.slice(0, -1)}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}` ); } }