-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # package.json # src/app/app.module.ts # src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts # src/app/components/project-map/packet-capturing/start-capture/start-capture.component.spec.ts # src/app/components/project-map/project-map.component.ts # src/app/services/packet-capture.service.ts # yarn.lock
- Loading branch information
Showing
9 changed files
with
105 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,18 @@ | ||
| import { Injectable } from '@angular/core'; | ||
| import { Link } from '../models/link'; | ||
| import { Project } from '../models/project'; | ||
| import{ Controller } from '../models/controller'; | ||
| import { Controller } from '../models/controller'; | ||
| import { ProtocolHandlerService } from './protocol-handler.service'; | ||
|
|
||
| @Injectable() | ||
| export class PacketCaptureService { | ||
| constructor() {} | ||
|
|
||
| startCapture(controller:Controller , project: Project, link: Link, name: string) { | ||
| location.assign( | ||
| `gns3+pcap://${controller.host}:${controller.port}?protocol=${controller.protocol.slice(0, -1)}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}` | ||
| ); | ||
| constructor(private protocolHandlerService: ProtocolHandlerService) {} | ||
|
|
||
| startCapture(controller: Controller, project: Project, link: Link, name: string) { | ||
|
|
||
| const uri = `gns3+pcap://${controller.host}:${controller.port}?protocol=${controller.protocol.slice(0, -1)}&project_id=${project.project_id}&link_id=${link.link_id}&project=${project.name}&name=${name}`; | ||
| this.protocolHandlerService.open(uri); | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import { Injectable } from '@angular/core'; | ||
| import { DeviceDetectorService } from 'ngx-device-detector'; | ||
| import { ToasterService } from './toaster.service'; | ||
|
|
||
| @Injectable() | ||
| export class ProtocolHandlerService { | ||
|
|
||
| constructor(private toasterService: ToasterService, private deviceService: DeviceDetectorService) {} | ||
|
|
||
| createHiddenIframe(target: Element, uri: string) { | ||
| const iframe = document.createElement("iframe"); | ||
| iframe.src = uri; | ||
| iframe.id = "hiddenIframe"; | ||
| iframe.style.display = "none"; | ||
| target.appendChild(iframe); | ||
| return iframe; | ||
| } | ||
|
|
||
| openUriUsingFirefox(uri: string) { | ||
| var iframe = (document.querySelector("#hiddenIframe") as HTMLIFrameElement); | ||
|
|
||
| if (!iframe) { | ||
| iframe = this.createHiddenIframe(document.body, "about:blank"); | ||
| } | ||
|
|
||
| try { | ||
| iframe.contentWindow.location.href = uri; | ||
| } catch (e) { | ||
| if (e.name === "NS_ERROR_UNKNOWN_PROTOCOL") { | ||
| this.toasterService.error('Protocol handler does not exist'); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| open(uri: string) { | ||
|
|
||
| const device = this.deviceService.getDeviceInfo(); | ||
|
|
||
| console.log("Launching external protocol handler with " + device.browser + ": " + uri) | ||
| if (device.browser === "Firefox") { | ||
| // Use a hidden iframe otherwise Firefox will disconnect | ||
| // from the GNS3 controller websocket if we use location.assign() | ||
| this.openUriUsingFirefox(uri); | ||
| } else { | ||
| location.assign(uri); | ||
| } | ||
| } | ||
| } |