ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-05 00:40:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'GNS3:master-3.0' into master-3.0

Browse Source
This commit is contained in:
Sylvain MATHIEU 2023-11-06 07:44:52 +01:00 committed by GitHub
commit 4378cce5e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "gns3-web-ui", "name": "gns3-web-ui",
"version": "3.0.0.dev9", "version": "3.0.0.dev10",
"author": { "author": {
"name": "GNS3 Technology Inc.", "name": "GNS3 Technology Inc.",
"email": "developers@gns3.com" "email": "developers@gns3.com"

8
src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts
View File

@ -64,13 +64,13 @@ export class ConsoleDeviceActionBrowserComponent {
try { try {
var uri; var uri;
if (this.node.console_type === 'telnet') { 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') { } 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')) { } 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')) { } 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 return window.open(uri); // open an http console directly in a new window/tab
} else { } else {
this.toasterService.error('Supported console types are: telnet, vnc, spice and spice+agent.'); this.toasterService.error('Supported console types are: telnet, vnc, spice and spice+agent.');

8
src/app/components/project-map/log-console/log-console.component.ts
View File

@ -226,18 +226,18 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy {
this.showCommand(`Launching console for node ${splittedCommand[1]}...`); this.showCommand(`Launching console for node ${splittedCommand[1]}...`);
if (node.console_type === 'telnet') { if (node.console_type === 'telnet') {
location.assign( 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') { } else if (node.console_type === 'vnc') {
location.assign( 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')) { } else if (node.console_type.startsWith('spice')) {
location.assign( 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')) { } 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 { } else {
this.showCommand('Supported console types are: telnet, vnc, spice and spice+agent'); this.showCommand('Supported console types are: telnet, vnc, spice and spice+agent');
} }

2
src/app/services/packet-capture.service.ts
View File

@ -9,7 +9,7 @@ export class PacketCaptureService {
startCapture(controller:Controller , project: Project, link: Link, name: string) { startCapture(controller:Controller , project: Project, link: Link, name: string) {
location.assign( 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}`
); );
} }
} }

1
src/app/services/qemu-configuration.service.ts
View File

@ -63,6 +63,7 @@ export class QemuConfigurationService {
{ value: 'i82559er', name: 'Intel i82559ER Ethernet' }, { value: 'i82559er', name: 'Intel i82559ER Ethernet' },
{ value: 'i82562', name: 'Intel i82562 Ethernet' }, { value: 'i82562', name: 'Intel i82562 Ethernet' },
{ value: 'i82801', name: 'Intel i82801 Ethernet' }, { value: 'i82801', name: 'Intel i82801 Ethernet' },
{ value: 'igb', name: 'Intel 82576 Gigabit Ethernet' },
{ value: 'ne2k_pci', name: 'NE2000 Ethernet' }, { value: 'ne2k_pci', name: 'NE2000 Ethernet' },
{ value: 'pcnet', name: 'AMD PCNet Ethernet' }, { value: 'pcnet', name: 'AMD PCNet Ethernet' },
{ value: 'rocker', name: 'Rocker L2 switch device' }, { value: 'rocker', name: 'Rocker L2 switch device' },