diff --git a/package.json b/package.json index 83c5e36d..5b2a25bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gns3-web-ui", - "version": "3.0.0.dev9", + "version": "3.0.0.dev10", "author": { "name": "GNS3 Technology Inc.", "email": "developers@gns3.com" diff --git a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts index dceba491..7fe0b8ed 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts @@ -64,13 +64,13 @@ export class ConsoleDeviceActionBrowserComponent { try { var uri; if (this.node.console_type === 'telnet') { - uri = `gns3+telnet://${this.node.console_host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`; + uri = `gns3+telnet://[${this.node.console_host}]:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`; } else if (this.node.console_type === 'vnc') { - uri = `gns3+vnc://${this.node.console_host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`; + uri = `gns3+vnc://[${this.node.console_host}]:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`; } else if (this.node.console_type.startsWith('spice')) { - uri = `gns3+spice://${this.node.console_host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}` + uri = `gns3+spice://[${this.node.console_host}]:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}` } else if (this.node.console_type.startsWith('http')) { - uri = `${this.node.console_type}://${this.node.console_host}:${this.node.console}` + uri = `${this.node.console_type}://[${this.node.console_host}]:${this.node.console}` return window.open(uri); // open an http console directly in a new window/tab } else { this.toasterService.error('Supported console types are: telnet, vnc, spice and spice+agent.'); diff --git a/src/app/components/project-map/log-console/log-console.component.ts b/src/app/components/project-map/log-console/log-console.component.ts index 547b3eff..49887414 100644 --- a/src/app/components/project-map/log-console/log-console.component.ts +++ b/src/app/components/project-map/log-console/log-console.component.ts @@ -226,18 +226,18 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { this.showCommand(`Launching console for node ${splittedCommand[1]}...`); if (node.console_type === 'telnet') { location.assign( - `gns3+telnet://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` + `gns3+telnet://[${node.console_host}]:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` ); } else if (node.console_type === 'vnc') { location.assign( - `gns3+vnc://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` + `gns3+vnc://[${node.console_host}]:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` ); } else if (node.console_type.startsWith('spice')) { location.assign( - `gns3+spice://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` + `gns3+spice://[${node.console_host}]:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` ); } else if (node.console_type.startsWith('http')) { - window.open(`${node.console_type}://${node.console_host}:${node.console}`); + window.open(`${node.console_type}://[${node.console_host}]:${node.console}`); } else { this.showCommand('Supported console types are: telnet, vnc, spice and spice+agent'); } diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts index 943d0310..83eae678 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(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://${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}` ); } } diff --git a/src/app/services/qemu-configuration.service.ts b/src/app/services/qemu-configuration.service.ts index d5d367b1..30698282 100644 --- a/src/app/services/qemu-configuration.service.ts +++ b/src/app/services/qemu-configuration.service.ts @@ -63,6 +63,7 @@ export class QemuConfigurationService { { value: 'i82559er', name: 'Intel i82559ER Ethernet' }, { value: 'i82562', name: 'Intel i82562 Ethernet' }, { value: 'i82801', name: 'Intel i82801 Ethernet' }, + { value: 'igb', name: 'Intel 82576 Gigabit Ethernet' }, { value: 'ne2k_pci', name: 'NE2000 Ethernet' }, { value: 'pcnet', name: 'AMD PCNet Ethernet' }, { value: 'rocker', name: 'Rocker L2 switch device' },