Merge branch '2.2' into master-3.0

# Conflicts:
#	src/app/services/packet-capture.service.ts
This commit is contained in:
grossmj 2023-11-03 14:49:23 +10:00
commit 4b55e3f576

View File

@ -9,7 +9,7 @@ export class PacketCaptureService {
startCapture(controller:Controller , project: Project, link: Link, name: string) {
location.assign(
`gns3+pcap://${controller.host}:${controller.port}?project_id=${project.project_id}&link_id=${link.link_id}&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}`
);
}
}