|
Line
Link Here
|
| 0 |
-- a/src/Network_Widget.cpp |
0 |
++ b/src/Network_Widget.cpp |
|
Lines 254-265
Link Here
|
| 254 |
connect( ui.Edit_macaddr, SIGNAL(textChanged(const QString &)), |
254 |
connect( ui.Edit_macaddr, SIGNAL(textChanged(const QString &)), |
| 255 |
this, SIGNAL(Changed()) ); |
255 |
this, SIGNAL(Changed()) ); |
| 256 |
|
256 |
|
| 257 |
connect( ui.CH_vlan, SIGNAL(clicked()), |
|
|
| 258 |
this, SIGNAL(Changed()) ); |
| 259 |
|
| 260 |
connect( ui.SB_vlan, SIGNAL(valueChanged(int)), |
| 261 |
this, SIGNAL(Changed()) ); |
| 262 |
|
| 263 |
connect( ui.CH_name, SIGNAL(clicked()), |
257 |
connect( ui.CH_name, SIGNAL(clicked()), |
| 264 |
this, SIGNAL(Changed()) ); |
258 |
this, SIGNAL(Changed()) ); |
| 265 |
|
259 |
|
|
Lines 480-491
Link Here
|
| 480 |
disconnect( ui.Edit_macaddr, SIGNAL(textChanged(const QString &)), |
474 |
disconnect( ui.Edit_macaddr, SIGNAL(textChanged(const QString &)), |
| 481 |
this, SIGNAL(Changed()) ); |
475 |
this, SIGNAL(Changed()) ); |
| 482 |
|
476 |
|
| 483 |
disconnect( ui.CH_vlan, SIGNAL(clicked()), |
|
|
| 484 |
this, SIGNAL(Changed()) ); |
| 485 |
|
| 486 |
disconnect( ui.SB_vlan, SIGNAL(valueChanged(int)), |
| 487 |
this, SIGNAL(Changed()) ); |
| 488 |
|
| 489 |
disconnect( ui.CH_name, SIGNAL(clicked()), |
477 |
disconnect( ui.CH_name, SIGNAL(clicked()), |
| 490 |
this, SIGNAL(Changed()) ); |
478 |
this, SIGNAL(Changed()) ); |
| 491 |
|
479 |
|
|
Lines 761-797
Link Here
|
| 761 |
|
749 |
|
| 762 |
void Network_Widget::on_TB_Help_clicked() |
750 |
void Network_Widget::on_TB_Help_clicked() |
| 763 |
{ |
751 |
{ |
| 764 |
// -net nic[,vlan=n][,macaddr=addr][,model=type][,name=name] |
752 |
// -net nic[,macaddr=addr][,model=type][,name=name] |
| 765 |
if( ui.CB_Network_Type->currentText() == "nic" ) |
753 |
if( ui.CB_Network_Type->currentText() == "nic" ) |
| 766 |
QMessageBox::information( this, tr("nic"), tr("-net nic[,vlan=n][,macaddr=addr][,model=type][,name=name] \nCreate a new Network Interface Card and connect it to VLAN n (n = 0 is the default). The NIC is an ne2k_pci by default on the PC target. Optionally, the MAC address can be changed to addr and a name can be assigned for use in monitor commands. If no \'-net\' option is specified, a single NIC is created. Qemu can emulate several different models of network card. Valid values for type are i82551, i82557b, i82559er, ne2k_pci, ne2k_isa, pcnet, rtl8139, e1000, smc91c111, lance and mcf_fec. Not all devices are supported on all targets. Use -net nic,model=? for a list of available devices for your target.") ); |
754 |
QMessageBox::information( this, tr("nic"), tr("-net nic[,macaddr=addr][,model=type][,name=name] \nCreate a new Network Interface Card and connect it to emulated hub with ID 0 (i.e. the default hub). The NIC is an ne2k_pci by default on the PC target. Optionally, the MAC address can be changed to addr and a name can be assigned for use in monitor commands. If no \'-net\' option is specified, a single NIC is created. Qemu can emulate several different models of network card. Valid values for type are i82551, i82557b, i82559er, ne2k_pci, ne2k_isa, pcnet, rtl8139, e1000, smc91c111, lance and mcf_fec. Not all devices are supported on all targets. Use -net nic,model=? for a list of available devices for your target.") ); |
| 767 |
|
755 |
|
| 768 |
// -net user[,vlan=n][,hostname=name][,name=name] |
756 |
// -net user[,hostname=name][,name=name] |
| 769 |
else if( ui.CB_Network_Type->currentText() == "user" ) |
757 |
else if( ui.CB_Network_Type->currentText() == "user" ) |
| 770 |
QMessageBox::information( this, tr("user"), tr("-net user[,vlan=n][,hostname=name][,name=name] \nUse the user mode network stack which requires no administrator privilege to run. \'hostname=name\' can be used to specify the client hostname reported by the builtin DHCP server.") ); |
758 |
QMessageBox::information( this, tr("user"), tr("-net user[,hostname=name][,name=name] \nUse the user mode network stack which requires no administrator privilege to run. \'hostname=name\' can be used to specify the client hostname reported by the builtin DHCP server.") ); |
| 771 |
|
759 |
|
| 772 |
// -net channel,port:dev |
760 |
// -net channel,port:dev |
| 773 |
else if( ui.CB_Network_Type->currentText() == "channel" ) |
761 |
else if( ui.CB_Network_Type->currentText() == "channel" ) |
| 774 |
QMessageBox::information( this, tr("channel"), tr("-net channel,port:dev \nForward \'user\' TCP connection to port port to character device dev") ); |
762 |
QMessageBox::information( this, tr("channel"), tr("-net channel,port:dev \nForward \'user\' TCP connection to port port to character device dev") ); |
| 775 |
|
763 |
|
| 776 |
// -net tap[,vlan=n][,name=name][,fd=h][,ifname=name][,script=file][,downscript=dfile] |
764 |
// -net tap[,name=name][,fd=h][,ifname=name][,script=file][,downscript=dfile] |
| 777 |
else if( ui.CB_Network_Type->currentText() == "tap" ) |
765 |
else if( ui.CB_Network_Type->currentText() == "tap" ) |
| 778 |
QMessageBox::information( this, tr("tap"), tr("-net tap[,vlan=n][,name=name][,fd=h][,ifname=name][,script=file][,downscript=dfile] \nConnect the host TAP network interface name to VLAN n, use the network script file to configure it and the network script dfile to deconfigure it. If name is not provided, the OS automatically provides one. \'fd\'=h can be used to specify the handle of an already opened host TAP interface. The default network configure script is \'/etc/qemu-ifup\' and the default network deconfigure script is \'/etc/qemu-ifdown\'. Use \'script=no\' or \'downscript=no\' to disable script execution.") ); |
766 |
QMessageBox::information( this, tr("tap"), tr("-net tap[,name=name][,fd=h][,ifname=name][,script=file][,downscript=dfile] \nConnect the host TAP network interface name to emulated hub with ID 0 (i.e. the default hub), use the network script file to configure it and the network script dfile to deconfigure it. If name is not provided, the OS automatically provides one. \'fd\'=h can be used to specify the handle of an already opened host TAP interface. The default network configure script is \'/etc/qemu-ifup\' and the default network deconfigure script is \'/etc/qemu-ifdown\'. Use \'script=no\' or \'downscript=no\' to disable script execution.") ); |
| 779 |
|
767 |
|
| 780 |
// -net socket[,vlan=n][,name=name][,fd=h][,listen=[host]:port][,connect=host:port] |
768 |
// -net socket[,name=name][,fd=h][,listen=[host]:port][,connect=host:port] |
| 781 |
else if( ui.CB_Network_Type->currentText() == "socket" ) |
769 |
else if( ui.CB_Network_Type->currentText() == "socket" ) |
| 782 |
QMessageBox::information( this, tr("socket"), tr("-net socket[,vlan=n][,name=name][,fd=h][,listen=[host]:port][,connect=host:port] \nConnect the VLAN n to a remote VLAN in another QEMU virtual machine using a TCP socket connection. If \'listen\' is specified, QEMU waits for incoming connections on port (host is optional). \'connect\' is used to connect to another QEMU instance using the \'listen\' option. \'fd\'=h specifies an already opened TCP socket.") ); |
770 |
QMessageBox::information( this, tr("socket"), tr("-net socket[,name=name][,fd=h][,listen=[host]:port][,connect=host:port] \nConnect the guest's network to another QEMU virtual machine using a TCP socket connection. If \'listen\' is specified, QEMU waits for incoming connections on port (host is optional). \'connect\' is used to connect to another QEMU instance using the \'listen\' option. \'fd\'=h specifies an already opened TCP socket.") ); |
| 783 |
|
771 |
|
| 784 |
// -net socket[,vlan=n][,name=name][,fd=h][,mcast=maddr:port] |
772 |
// -net socket[,name=name][,fd=h][,mcast=maddr:port] |
| 785 |
else if( ui.CB_Network_Type->currentText() == "multicast socket" ) |
773 |
else if( ui.CB_Network_Type->currentText() == "multicast socket" ) |
| 786 |
QMessageBox::information( this, tr("socket"), tr("-net socket[,vlan=n][,name=name][,fd=h][,mcast=maddr:port] \nCreate a VLAN n shared with another QEMU virtual machines using a UDP multicast socket, effectively making a bus for every QEMU with same multicast address maddr and port. \nNOTES: \n1. Several QEMU can be running on different hosts and share same bus (assuming correct multicast setup for these hosts). \n2. mcast support is compatible with User Mode Linux (argument \'ethN=mcast\'), see http://user-mode-linux.sf.net. \n3. Use \'fd=h\' to specify an already opened UDP multicast socket.") ); |
774 |
QMessageBox::information( this, tr("socket"), tr("-net socket[,name=name][,fd=h][,mcast=maddr:port] \nConfigure a socket host network backend to share the guest's network traffic with another QEMU virtual machines using a UDP multicast socket, effectively making a bus for every QEMU with same multicast address maddr and port. \nNOTES: \n1. Several QEMU can be running on different hosts and share same bus (assuming correct multicast setup for these hosts). \n2. mcast support is compatible with User Mode Linux (argument \'ethN=mcast\'), see http://user-mode-linux.sf.net. \n3. Use \'fd=h\' to specify an already opened UDP multicast socket.") ); |
| 787 |
|
775 |
|
| 788 |
// -net vde[,vlan=n][,name=name][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] |
776 |
// -net vde[,name=name][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] |
| 789 |
else if( ui.CB_Network_Type->currentText() == "vde" ) |
777 |
else if( ui.CB_Network_Type->currentText() == "vde" ) |
| 790 |
QMessageBox::information( this, tr("vde"), tr("-net vde[,vlan=n][,name=name][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] \nConnect VLAN n to PORT n of a vde switch running on host and listening for incoming connections on socketpath. Use GROUP groupname and MODE octalmode to change default ownership and permissions for communication port. This option is available only if QEMU has been compiled with vde support enabled.") ); |
778 |
QMessageBox::information( this, tr("vde"), tr("-net vde[,name=name][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] \nConfigure VDE backend to connect to PORT n of a vde switch running on host and listening for incoming connections on socketpath. Use GROUP groupname and MODE octalmode to change default ownership and permissions for communication port. This option is available only if QEMU has been compiled with vde support enabled.") ); |
| 791 |
|
779 |
|
| 792 |
// -net dump[,vlan=n][,file=file][,len=len] |
780 |
// -net dump[,file=file][,len=len] |
| 793 |
else if( ui.CB_Network_Type->currentText() == "dump" ) |
781 |
else if( ui.CB_Network_Type->currentText() == "dump" ) |
| 794 |
QMessageBox::information( this, tr("dump"), tr("-net dump[,vlan=n][,file=f][,len=n] \ndump traffic on vlan \'n\' to file \'f\' (max n bytes per packet)") ); |
782 |
QMessageBox::information( this, tr("dump"), tr("-net dump[,file=f][,len=n] \ndump traffic to file \'f\' (max n bytes per packet)") ); |
| 795 |
|
783 |
|
| 796 |
else |
784 |
else |
| 797 |
{ |
785 |
{ |
|
Lines 823-831
Link Here
|
| 823 |
void Network_Widget::on_CB_Network_Type_currentIndexChanged( int index ) |
811 |
void Network_Widget::on_CB_Network_Type_currentIndexChanged( int index ) |
| 824 |
{ |
812 |
{ |
| 825 |
// Hide All |
813 |
// Hide All |
| 826 |
ui.CH_vlan->setVisible( false ); |
|
|
| 827 |
ui.SB_vlan->setVisible( false ); |
| 828 |
|
| 829 |
ui.CH_macaddr->setVisible( false ); |
814 |
ui.CH_macaddr->setVisible( false ); |
| 830 |
ui.Edit_macaddr->setVisible( false ); |
815 |
ui.Edit_macaddr->setVisible( false ); |
| 831 |
ui.TB_Generate_New_MAC->setVisible( false ); |
816 |
ui.TB_Generate_New_MAC->setVisible( false ); |
|
Lines 935-946
Link Here
|
| 935 |
ui.CH_vhostfd->setVisible( false ); |
920 |
ui.CH_vhostfd->setVisible( false ); |
| 936 |
ui.SB_vhostfd->setVisible( false ); |
921 |
ui.SB_vhostfd->setVisible( false ); |
| 937 |
|
922 |
|
| 938 |
// -net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] |
923 |
// -net nic[,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] |
| 939 |
if( ui.CB_Network_Type->currentText() == "nic" ) |
924 |
if( ui.CB_Network_Type->currentText() == "nic" ) |
| 940 |
{ |
925 |
{ |
| 941 |
ui.CH_vlan->setVisible( true ); |
|
|
| 942 |
ui.SB_vlan->setVisible( true ); |
| 943 |
|
| 944 |
ui.CH_macaddr->setVisible( true ); |
926 |
ui.CH_macaddr->setVisible( true ); |
| 945 |
ui.Edit_macaddr->setVisible( true ); |
927 |
ui.Edit_macaddr->setVisible( true ); |
| 946 |
ui.TB_Generate_New_MAC->setVisible( true ); |
928 |
ui.TB_Generate_New_MAC->setVisible( true ); |
|
Lines 957-970
Link Here
|
| 957 |
ui.CH_vectors->setVisible( true ); |
939 |
ui.CH_vectors->setVisible( true ); |
| 958 |
ui.SB_vectors->setVisible( true ); |
940 |
ui.SB_vectors->setVisible( true ); |
| 959 |
} |
941 |
} |
| 960 |
// -net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] |
942 |
// -net user[,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] |
| 961 |
// [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] |
943 |
// [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] |
| 962 |
// [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] |
944 |
// [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] |
| 963 |
else if( ui.CB_Network_Type->currentText() == "user" ) |
945 |
else if( ui.CB_Network_Type->currentText() == "user" ) |
| 964 |
{ |
946 |
{ |
| 965 |
ui.CH_vlan->setVisible( true ); |
|
|
| 966 |
ui.SB_vlan->setVisible( true ); |
| 967 |
|
| 968 |
ui.CH_hostname->setVisible( true ); |
947 |
ui.CH_hostname->setVisible( true ); |
| 969 |
ui.Edit_hostname->setVisible( true ); |
948 |
ui.Edit_hostname->setVisible( true ); |
| 970 |
|
949 |
|
|
Lines 1012-1024
Link Here
|
| 1012 |
ui.Label_port_dev->setVisible( true ); |
991 |
ui.Label_port_dev->setVisible( true ); |
| 1013 |
ui.Edit_port_dev->setVisible( true ); |
992 |
ui.Edit_port_dev->setVisible( true ); |
| 1014 |
} |
993 |
} |
| 1015 |
// -net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile] |
994 |
// -net tap[,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile] |
| 1016 |
// [,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h] |
995 |
// [,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h] |
| 1017 |
else if( ui.CB_Network_Type->currentText() == "tap" ) |
996 |
else if( ui.CB_Network_Type->currentText() == "tap" ) |
| 1018 |
{ |
997 |
{ |
| 1019 |
ui.CH_vlan->setVisible( true ); |
|
|
| 1020 |
ui.SB_vlan->setVisible( true ); |
| 1021 |
|
| 1022 |
ui.CH_name->setVisible( true ); |
998 |
ui.CH_name->setVisible( true ); |
| 1023 |
ui.Edit_name->setVisible( true ); |
999 |
ui.Edit_name->setVisible( true ); |
| 1024 |
|
1000 |
|
|
Lines 1048-1059
Link Here
|
| 1048 |
ui.CH_vhostfd->setVisible( true ); |
1024 |
ui.CH_vhostfd->setVisible( true ); |
| 1049 |
ui.SB_vhostfd->setVisible( true ); |
1025 |
ui.SB_vhostfd->setVisible( true ); |
| 1050 |
} |
1026 |
} |
| 1051 |
// -net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] |
1027 |
// -net socket[,name=str][,fd=h][,listen=[host]:port][,connect=host:port] |
| 1052 |
else if( ui.CB_Network_Type->currentText() == "socket" ) |
1028 |
else if( ui.CB_Network_Type->currentText() == "socket" ) |
| 1053 |
{ |
1029 |
{ |
| 1054 |
ui.CH_vlan->setVisible( true ); |
|
|
| 1055 |
ui.SB_vlan->setVisible( true ); |
| 1056 |
|
| 1057 |
ui.CH_name->setVisible( true ); |
1030 |
ui.CH_name->setVisible( true ); |
| 1058 |
ui.Edit_name->setVisible( true ); |
1031 |
ui.Edit_name->setVisible( true ); |
| 1059 |
|
1032 |
|
|
Lines 1066-1077
Link Here
|
| 1066 |
ui.CH_connect->setVisible( true ); |
1039 |
ui.CH_connect->setVisible( true ); |
| 1067 |
ui.Edit_connect->setVisible( true ); |
1040 |
ui.Edit_connect->setVisible( true ); |
| 1068 |
} |
1041 |
} |
| 1069 |
// -net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] |
1042 |
// -net socket[,name=str][,fd=h][,mcast=maddr:port] |
| 1070 |
else if( ui.CB_Network_Type->currentText() == "multicast socket" ) |
1043 |
else if( ui.CB_Network_Type->currentText() == "multicast socket" ) |
| 1071 |
{ |
1044 |
{ |
| 1072 |
ui.CH_vlan->setVisible( true ); |
|
|
| 1073 |
ui.SB_vlan->setVisible( true ); |
| 1074 |
|
| 1075 |
ui.CH_name->setVisible( true ); |
1045 |
ui.CH_name->setVisible( true ); |
| 1076 |
ui.Edit_name->setVisible( true ); |
1046 |
ui.Edit_name->setVisible( true ); |
| 1077 |
|
1047 |
|
|
Lines 1081-1092
Link Here
|
| 1081 |
ui.CH_mcast->setVisible( true ); |
1051 |
ui.CH_mcast->setVisible( true ); |
| 1082 |
ui.Edit_mcast->setVisible( true ); |
1052 |
ui.Edit_mcast->setVisible( true ); |
| 1083 |
} |
1053 |
} |
| 1084 |
// -net vde[,vlan=n][,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] |
1054 |
// -net vde[,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] |
| 1085 |
else if( ui.CB_Network_Type->currentText() == "vde" ) |
1055 |
else if( ui.CB_Network_Type->currentText() == "vde" ) |
| 1086 |
{ |
1056 |
{ |
| 1087 |
ui.CH_vlan->setVisible( true ); |
|
|
| 1088 |
ui.SB_vlan->setVisible( true ); |
| 1089 |
|
| 1090 |
ui.CH_name->setVisible( true ); |
1057 |
ui.CH_name->setVisible( true ); |
| 1091 |
ui.Edit_name->setVisible( true ); |
1058 |
ui.Edit_name->setVisible( true ); |
| 1092 |
|
1059 |
|
|
Lines 1102-1113
Link Here
|
| 1102 |
ui.CH_mode->setVisible( true ); |
1069 |
ui.CH_mode->setVisible( true ); |
| 1103 |
ui.Edit_mode->setVisible( true ); |
1070 |
ui.Edit_mode->setVisible( true ); |
| 1104 |
} |
1071 |
} |
| 1105 |
// -net dump[,vlan=n][,file=file][,len=len] |
1072 |
// -net dump[,file=file][,len=len] |
| 1106 |
else if( ui.CB_Network_Type->currentText() == "dump" ) |
1073 |
else if( ui.CB_Network_Type->currentText() == "dump" ) |
| 1107 |
{ |
1074 |
{ |
| 1108 |
ui.CH_vlan->setVisible( true ); |
|
|
| 1109 |
ui.SB_vlan->setVisible( true ); |
| 1110 |
|
| 1111 |
ui.CH_file->setVisible( true ); |
1075 |
ui.CH_file->setVisible( true ); |
| 1112 |
ui.Edit_file->setVisible( true ); |
1076 |
ui.Edit_file->setVisible( true ); |
| 1113 |
|
1077 |
|
|
Lines 1307-1315
Link Here
|
| 1307 |
if( ! PSO_Net_hostfwd ) |
1271 |
if( ! PSO_Net_hostfwd ) |
| 1308 |
if( ! PSO_Net_guestfwd ) |
1272 |
if( ! PSO_Net_guestfwd ) |
| 1309 |
|
1273 |
|
| 1310 |
ui.CH_vlan->setVisible( false ); |
|
|
| 1311 |
ui.SB_vlan->setVisible( false ); |
| 1312 |
|
| 1313 |
ui.CH_macaddr->setVisible( false ); |
1274 |
ui.CH_macaddr->setVisible( false ); |
| 1314 |
ui.Edit_macaddr->setVisible( false ); |
1275 |
ui.Edit_macaddr->setVisible( false ); |
| 1315 |
ui.TB_Generate_New_MAC->setVisible( false ); |
1276 |
ui.TB_Generate_New_MAC->setVisible( false ); |
|
Lines 1421-1430
Link Here
|
| 1421 |
card.Use_MAC_Address( ui.CH_macaddr->isChecked() ); |
1382 |
card.Use_MAC_Address( ui.CH_macaddr->isChecked() ); |
| 1422 |
card.Set_MAC_Address( ui.Edit_macaddr->text() ); |
1383 |
card.Set_MAC_Address( ui.Edit_macaddr->text() ); |
| 1423 |
|
1384 |
|
| 1424 |
// VLAN |
|
|
| 1425 |
card.Use_VLAN( ui.CH_vlan->isChecked() ); |
| 1426 |
card.Set_VLAN( ui.SB_vlan->value() ); |
| 1427 |
|
| 1428 |
// name |
1385 |
// name |
| 1429 |
card.Use_Name( ui.CH_name->isChecked() ); |
1386 |
card.Use_Name( ui.CH_name->isChecked() ); |
| 1430 |
card.Set_Name( ui.Edit_name->text() ); |
1387 |
card.Set_Name( ui.Edit_name->text() ); |
|
Lines 1655-1664
Link Here
|
| 1655 |
ui.CH_macaddr->setChecked( card.Use_MAC_Address() ); |
1612 |
ui.CH_macaddr->setChecked( card.Use_MAC_Address() ); |
| 1656 |
ui.Edit_macaddr->setText( card.Get_MAC_Address() ); |
1613 |
ui.Edit_macaddr->setText( card.Get_MAC_Address() ); |
| 1657 |
|
1614 |
|
| 1658 |
// VLAN |
|
|
| 1659 |
ui.CH_vlan->setChecked( card.Use_VLAN() ); |
| 1660 |
ui.SB_vlan->setValue( card.Get_VLAN() ); |
| 1661 |
|
| 1662 |
// name |
1615 |
// name |
| 1663 |
ui.CH_name->setChecked( card.Use_Name() ); |
1616 |
ui.CH_name->setChecked( card.Use_Name() ); |
| 1664 |
ui.Edit_name->setText( card.Get_Name() ); |
1617 |
ui.Edit_name->setText( card.Get_Name() ); |
|
Lines 1833-1844
Link Here
|
| 1833 |
|
1786 |
|
| 1834 |
switch( ui.CB_Network_Type->currentIndex() ) |
1787 |
switch( ui.CB_Network_Type->currentIndex() ) |
| 1835 |
{ |
1788 |
{ |
| 1836 |
// -net nic[,vlan=n][,macaddr=addr][,model=type][,name=name] |
1789 |
// -net nic[,macaddr=addr][,model=type][,name=name] |
| 1837 |
case 0: |
1790 |
case 0: |
| 1838 |
u_macaddr = u_name = true; |
1791 |
u_macaddr = u_name = true; |
| 1839 |
break; |
1792 |
break; |
| 1840 |
|
1793 |
|
| 1841 |
// -net user[,vlan=n][,hostname=name][,name=name] |
1794 |
// -net user[,hostname=name][,name=name] |
| 1842 |
case 1: |
1795 |
case 1: |
| 1843 |
u_hostname = u_name = true; |
1796 |
u_hostname = u_name = true; |
| 1844 |
break; |
1797 |
break; |
|
Lines 1848-1874
Link Here
|
| 1848 |
u_port_dev = true; |
1801 |
u_port_dev = true; |
| 1849 |
break; |
1802 |
break; |
| 1850 |
|
1803 |
|
| 1851 |
// -net tap[,vlan=n][,name=name][,fd=h][,ifname=name][,script=file][,downscript=dfile] |
1804 |
// -net tap[,name=name][,fd=h][,ifname=name][,script=file][,downscript=dfile] |
| 1852 |
case 3: |
1805 |
case 3: |
| 1853 |
u_name = u_ifname = u_script = u_downscript = true; |
1806 |
u_name = u_ifname = u_script = u_downscript = true; |
| 1854 |
break; |
1807 |
break; |
| 1855 |
|
1808 |
|
| 1856 |
// -net socket[,vlan=n][,name=name][,fd=h][,listen=[host]:port][,connect=host:port] |
1809 |
// -net socket[,name=name][,fd=h][,listen=[host]:port][,connect=host:port] |
| 1857 |
case 4: |
1810 |
case 4: |
| 1858 |
u_name = u_listen = u_connect = true; |
1811 |
u_name = u_listen = u_connect = true; |
| 1859 |
break; |
1812 |
break; |
| 1860 |
|
1813 |
|
| 1861 |
// -net socket[,vlan=n][,name=name][,fd=h][,mcast=maddr:port] |
1814 |
// -net socket[,name=name][,fd=h][,mcast=maddr:port] |
| 1862 |
case 5: |
1815 |
case 5: |
| 1863 |
u_name = u_mcast = true; |
1816 |
u_name = u_mcast = true; |
| 1864 |
break; |
1817 |
break; |
| 1865 |
|
1818 |
|
| 1866 |
// -net vde[,vlan=n][,name=name][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] |
1819 |
// -net vde[,name=name][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] |
| 1867 |
case 6: |
1820 |
case 6: |
| 1868 |
u_name = u_sock = u_group = u_mode = true; |
1821 |
u_name = u_sock = u_group = u_mode = true; |
| 1869 |
break; |
1822 |
break; |
| 1870 |
|
1823 |
|
| 1871 |
// -net dump[,vlan=n][,file=file][,len=len] |
1824 |
// -net dump[,file=file][,len=len] |
| 1872 |
case 7: |
1825 |
case 7: |
| 1873 |
u_file = u_len = true; |
1826 |
u_file = u_len = true; |
| 1874 |
break; |
1827 |
break; |
| 1875 |
-- a/src/Network_Widget.ui |
1828 |
++ b/src/Network_Widget.ui |
|
Lines 151-158
Link Here
|
| 151 |
<rect> |
151 |
<rect> |
| 152 |
<x>0</x> |
152 |
<x>0</x> |
| 153 |
<y>0</y> |
153 |
<y>0</y> |
| 154 |
<width>347</width> |
154 |
<width>361</width> |
| 155 |
<height>1579</height> |
155 |
<height>1073</height> |
| 156 |
</rect> |
156 |
</rect> |
| 157 |
</property> |
157 |
</property> |
| 158 |
<layout class="QVBoxLayout" name="verticalLayout"> |
158 |
<layout class="QVBoxLayout" name="verticalLayout"> |
|
Lines 183-263
Link Here
|
| 183 |
<property name="bottomMargin"> |
183 |
<property name="bottomMargin"> |
| 184 |
<number>0</number> |
184 |
<number>0</number> |
| 185 |
</property> |
185 |
</property> |
| 186 |
<item row="0" column="0"> |
186 |
<item row="16" column="0"> |
| 187 |
<widget class="QLabel" name="Label_Network_Type"> |
187 |
<widget class="QCheckBox" name="CH_mode"> |
| 188 |
<property name="sizePolicy"> |
|
|
| 189 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 190 |
<horstretch>0</horstretch> |
| 191 |
<verstretch>0</verstretch> |
| 192 |
</sizepolicy> |
| 193 |
</property> |
| 194 |
<property name="text"> |
| 195 |
<string>Connection type</string> |
| 196 |
</property> |
| 197 |
</widget> |
| 198 |
</item> |
| 199 |
<item row="0" column="1"> |
| 200 |
<layout class="QHBoxLayout" name="horizontalLayout_3"> |
| 201 |
<property name="spacing"> |
| 202 |
<number>4</number> |
| 203 |
</property> |
| 204 |
<property name="sizeConstraint"> |
| 205 |
<enum>QLayout::SetMinimumSize</enum> |
| 206 |
</property> |
| 207 |
<item> |
| 208 |
<widget class="QComboBox" name="CB_Network_Type"> |
| 209 |
<property name="sizePolicy"> |
| 210 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 211 |
<horstretch>0</horstretch> |
| 212 |
<verstretch>0</verstretch> |
| 213 |
</sizepolicy> |
| 214 |
</property> |
| 215 |
<property name="currentIndex"> |
| 216 |
<number>-1</number> |
| 217 |
</property> |
| 218 |
</widget> |
| 219 |
</item> |
| 220 |
<item> |
| 221 |
<widget class="QToolButton" name="TB_Help"> |
| 222 |
<property name="text"> |
| 223 |
<string>?</string> |
| 224 |
</property> |
| 225 |
<property name="icon"> |
| 226 |
<iconset resource="../resources/icons.qrc"> |
| 227 |
<normaloff>:/help.png</normaloff>:/help.png</iconset> |
| 228 |
</property> |
| 229 |
</widget> |
| 230 |
</item> |
| 231 |
</layout> |
| 232 |
</item> |
| 233 |
<item row="1" column="0"> |
| 234 |
<widget class="QLabel" name="Label_model"> |
| 235 |
<property name="sizePolicy"> |
| 236 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 237 |
<horstretch>0</horstretch> |
| 238 |
<verstretch>0</verstretch> |
| 239 |
</sizepolicy> |
| 240 |
</property> |
| 241 |
<property name="text"> |
| 242 |
<string>Model</string> |
| 243 |
</property> |
| 244 |
</widget> |
| 245 |
</item> |
| 246 |
<item row="1" column="1"> |
| 247 |
<widget class="QComboBox" name="CB_model"> |
| 248 |
<property name="enabled"> |
| 249 |
<bool>false</bool> |
| 250 |
</property> |
| 251 |
<property name="sizePolicy"> |
| 252 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 253 |
<horstretch>0</horstretch> |
| 254 |
<verstretch>0</verstretch> |
| 255 |
</sizepolicy> |
| 256 |
</property> |
| 257 |
</widget> |
| 258 |
</item> |
| 259 |
<item row="2" column="0"> |
| 260 |
<widget class="QCheckBox" name="CH_macaddr"> |
| 261 |
<property name="sizePolicy"> |
188 |
<property name="sizePolicy"> |
| 262 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
189 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 263 |
<horstretch>0</horstretch> |
190 |
<horstretch>0</horstretch> |
|
Lines 265-271
Link Here
|
| 265 |
</sizepolicy> |
192 |
</sizepolicy> |
| 266 |
</property> |
193 |
</property> |
| 267 |
<property name="text"> |
194 |
<property name="text"> |
| 268 |
<string>macaddr</string> |
195 |
<string>mode</string> |
| 269 |
</property> |
196 |
</property> |
| 270 |
</widget> |
197 |
</widget> |
| 271 |
</item> |
198 |
</item> |
|
Lines 312-319
Link Here
|
| 312 |
</item> |
239 |
</item> |
| 313 |
</layout> |
240 |
</layout> |
| 314 |
</item> |
241 |
</item> |
| 315 |
<item row="3" column="0"> |
242 |
<item row="14" column="0"> |
| 316 |
<widget class="QCheckBox" name="CH_vlan"> |
243 |
<widget class="QCheckBox" name="CH_port"> |
| 317 |
<property name="sizePolicy"> |
244 |
<property name="sizePolicy"> |
| 318 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
245 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 319 |
<horstretch>0</horstretch> |
246 |
<horstretch>0</horstretch> |
|
Lines 321-345
Link Here
|
| 321 |
</sizepolicy> |
248 |
</sizepolicy> |
| 322 |
</property> |
249 |
</property> |
| 323 |
<property name="text"> |
250 |
<property name="text"> |
| 324 |
<string>vlan</string> |
251 |
<string>port</string> |
| 325 |
</property> |
|
|
| 326 |
</widget> |
| 327 |
</item> |
| 328 |
<item row="3" column="1"> |
| 329 |
<widget class="QSpinBox" name="SB_vlan"> |
| 330 |
<property name="enabled"> |
| 331 |
<bool>false</bool> |
| 332 |
</property> |
| 333 |
<property name="sizePolicy"> |
| 334 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 335 |
<horstretch>0</horstretch> |
| 336 |
<verstretch>0</verstretch> |
| 337 |
</sizepolicy> |
| 338 |
</property> |
252 |
</property> |
| 339 |
</widget> |
253 |
</widget> |
| 340 |
</item> |
254 |
</item> |
| 341 |
<item row="4" column="0"> |
255 |
<item row="2" column="0"> |
| 342 |
<widget class="QCheckBox" name="CH_name"> |
256 |
<widget class="QCheckBox" name="CH_macaddr"> |
| 343 |
<property name="sizePolicy"> |
257 |
<property name="sizePolicy"> |
| 344 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
258 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 345 |
<horstretch>0</horstretch> |
259 |
<horstretch>0</horstretch> |
|
Lines 347-371
Link Here
|
| 347 |
</sizepolicy> |
261 |
</sizepolicy> |
| 348 |
</property> |
262 |
</property> |
| 349 |
<property name="text"> |
263 |
<property name="text"> |
| 350 |
<string>name</string> |
264 |
<string>macaddr</string> |
| 351 |
</property> |
|
|
| 352 |
</widget> |
| 353 |
</item> |
| 354 |
<item row="4" column="1"> |
| 355 |
<widget class="QLineEdit" name="Edit_name"> |
| 356 |
<property name="enabled"> |
| 357 |
<bool>false</bool> |
| 358 |
</property> |
| 359 |
<property name="sizePolicy"> |
| 360 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 361 |
<horstretch>0</horstretch> |
| 362 |
<verstretch>0</verstretch> |
| 363 |
</sizepolicy> |
| 364 |
</property> |
265 |
</property> |
| 365 |
</widget> |
266 |
</widget> |
| 366 |
</item> |
267 |
</item> |
| 367 |
<item row="5" column="0"> |
268 |
<item row="0" column="0"> |
| 368 |
<widget class="QCheckBox" name="CH_hostname"> |
269 |
<widget class="QLabel" name="Label_Network_Type"> |
| 369 |
<property name="sizePolicy"> |
270 |
<property name="sizePolicy"> |
| 370 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
271 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 371 |
<horstretch>0</horstretch> |
272 |
<horstretch>0</horstretch> |
|
Lines 373-384
Link Here
|
| 373 |
</sizepolicy> |
274 |
</sizepolicy> |
| 374 |
</property> |
275 |
</property> |
| 375 |
<property name="text"> |
276 |
<property name="text"> |
| 376 |
<string>hostname</string> |
277 |
<string>Connection type</string> |
| 377 |
</property> |
278 |
</property> |
| 378 |
</widget> |
279 |
</widget> |
| 379 |
</item> |
280 |
</item> |
| 380 |
<item row="5" column="1"> |
281 |
<item row="3" column="1"> |
| 381 |
<widget class="QLineEdit" name="Edit_hostname"> |
282 |
<widget class="QLineEdit" name="Edit_name"> |
| 382 |
<property name="enabled"> |
283 |
<property name="enabled"> |
| 383 |
<bool>false</bool> |
284 |
<bool>false</bool> |
| 384 |
</property> |
285 |
</property> |
|
Lines 391-419
Link Here
|
| 391 |
</widget> |
292 |
</widget> |
| 392 |
</item> |
293 |
</item> |
| 393 |
<item row="6" column="0"> |
294 |
<item row="6" column="0"> |
| 394 |
<widget class="QLabel" name="Label_port_dev"> |
|
|
| 395 |
<property name="sizePolicy"> |
| 396 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 397 |
<horstretch>0</horstretch> |
| 398 |
<verstretch>0</verstretch> |
| 399 |
</sizepolicy> |
| 400 |
</property> |
| 401 |
<property name="text"> |
| 402 |
<string>port:dev</string> |
| 403 |
</property> |
| 404 |
</widget> |
| 405 |
</item> |
| 406 |
<item row="6" column="1"> |
| 407 |
<widget class="QLineEdit" name="Edit_port_dev"> |
| 408 |
<property name="sizePolicy"> |
| 409 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 410 |
<horstretch>0</horstretch> |
| 411 |
<verstretch>0</verstretch> |
| 412 |
</sizepolicy> |
| 413 |
</property> |
| 414 |
</widget> |
| 415 |
</item> |
| 416 |
<item row="7" column="0"> |
| 417 |
<widget class="QCheckBox" name="CH_fd"> |
295 |
<widget class="QCheckBox" name="CH_fd"> |
| 418 |
<property name="sizePolicy"> |
296 |
<property name="sizePolicy"> |
| 419 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
297 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
|
Lines 426-432
Link Here
|
| 426 |
</property> |
304 |
</property> |
| 427 |
</widget> |
305 |
</widget> |
| 428 |
</item> |
306 |
</item> |
| 429 |
<item row="7" column="1"> |
307 |
<item row="6" column="1"> |
| 430 |
<widget class="QSpinBox" name="SB_fd"> |
308 |
<widget class="QSpinBox" name="SB_fd"> |
| 431 |
<property name="enabled"> |
309 |
<property name="enabled"> |
| 432 |
<bool>false</bool> |
310 |
<bool>false</bool> |
|
Lines 439-446
Link Here
|
| 439 |
</property> |
317 |
</property> |
| 440 |
</widget> |
318 |
</widget> |
| 441 |
</item> |
319 |
</item> |
| 442 |
<item row="8" column="0"> |
320 |
<item row="18" column="0"> |
| 443 |
<widget class="QCheckBox" name="CH_ifname"> |
321 |
<widget class="QCheckBox" name="CH_len"> |
| 444 |
<property name="sizePolicy"> |
322 |
<property name="sizePolicy"> |
| 445 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
323 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 446 |
<horstretch>0</horstretch> |
324 |
<horstretch>0</horstretch> |
|
Lines 448-459
Link Here
|
| 448 |
</sizepolicy> |
326 |
</sizepolicy> |
| 449 |
</property> |
327 |
</property> |
| 450 |
<property name="text"> |
328 |
<property name="text"> |
| 451 |
<string>ifname</string> |
329 |
<string>len</string> |
| 452 |
</property> |
330 |
</property> |
| 453 |
</widget> |
331 |
</widget> |
| 454 |
</item> |
332 |
</item> |
| 455 |
<item row="8" column="1"> |
333 |
<item row="19" column="1"> |
| 456 |
<widget class="QLineEdit" name="Edit_ifname"> |
334 |
<widget class="QLineEdit" name="Edit_addr"> |
|
|
335 |
<property name="enabled"> |
| 336 |
<bool>false</bool> |
| 337 |
</property> |
| 338 |
</widget> |
| 339 |
</item> |
| 340 |
<item row="17" column="1"> |
| 341 |
<widget class="QLineEdit" name="Edit_file"> |
| 457 |
<property name="enabled"> |
342 |
<property name="enabled"> |
| 458 |
<bool>false</bool> |
343 |
<bool>false</bool> |
| 459 |
</property> |
344 |
</property> |
|
Lines 466-472
Link Here
|
| 466 |
</widget> |
351 |
</widget> |
| 467 |
</item> |
352 |
</item> |
| 468 |
<item row="9" column="0"> |
353 |
<item row="9" column="0"> |
| 469 |
<widget class="QCheckBox" name="CH_script"> |
354 |
<widget class="QCheckBox" name="CH_downscript"> |
| 470 |
<property name="sizePolicy"> |
355 |
<property name="sizePolicy"> |
| 471 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
356 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 472 |
<horstretch>0</horstretch> |
357 |
<horstretch>0</horstretch> |
|
Lines 474-485
Link Here
|
| 474 |
</sizepolicy> |
359 |
</sizepolicy> |
| 475 |
</property> |
360 |
</property> |
| 476 |
<property name="text"> |
361 |
<property name="text"> |
| 477 |
<string>script</string> |
362 |
<string>downscript</string> |
| 478 |
</property> |
363 |
</property> |
| 479 |
</widget> |
364 |
</widget> |
| 480 |
</item> |
365 |
</item> |
| 481 |
<item row="9" column="1"> |
366 |
<item row="33" column="0"> |
| 482 |
<layout class="QHBoxLayout" name="horizontalLayout"> |
367 |
<widget class="QCheckBox" name="CH_vhostfd"> |
|
|
368 |
<property name="text"> |
| 369 |
<string>vhostfd</string> |
| 370 |
</property> |
| 371 |
</widget> |
| 372 |
</item> |
| 373 |
<item row="0" column="1"> |
| 374 |
<layout class="QHBoxLayout" name="horizontalLayout_3"> |
| 483 |
<property name="spacing"> |
375 |
<property name="spacing"> |
| 484 |
<number>4</number> |
376 |
<number>4</number> |
| 485 |
</property> |
377 |
</property> |
|
Lines 487-572
Link Here
|
| 487 |
<enum>QLayout::SetMinimumSize</enum> |
379 |
<enum>QLayout::SetMinimumSize</enum> |
| 488 |
</property> |
380 |
</property> |
| 489 |
<item> |
381 |
<item> |
| 490 |
<widget class="QLineEdit" name="Edit_script"> |
382 |
<widget class="QComboBox" name="CB_Network_Type"> |
| 491 |
<property name="enabled"> |
|
|
| 492 |
<bool>false</bool> |
| 493 |
</property> |
| 494 |
<property name="sizePolicy"> |
383 |
<property name="sizePolicy"> |
| 495 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
384 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 496 |
<horstretch>0</horstretch> |
385 |
<horstretch>0</horstretch> |
| 497 |
<verstretch>0</verstretch> |
386 |
<verstretch>0</verstretch> |
| 498 |
</sizepolicy> |
387 |
</sizepolicy> |
| 499 |
</property> |
388 |
</property> |
|
|
389 |
<property name="currentIndex"> |
| 390 |
<number>-1</number> |
| 391 |
</property> |
| 500 |
</widget> |
392 |
</widget> |
| 501 |
</item> |
393 |
</item> |
| 502 |
<item> |
394 |
<item> |
| 503 |
<widget class="QToolButton" name="TB_Browse_script"> |
395 |
<widget class="QToolButton" name="TB_Help"> |
| 504 |
<property name="enabled"> |
|
|
| 505 |
<bool>false</bool> |
| 506 |
</property> |
| 507 |
<property name="text"> |
396 |
<property name="text"> |
| 508 |
<string>...</string> |
397 |
<string>?</string> |
| 509 |
</property> |
398 |
</property> |
| 510 |
<property name="icon"> |
399 |
<property name="icon"> |
| 511 |
<iconset resource="../resources/icons.qrc"> |
400 |
<iconset resource="../resources/icons.qrc"> |
| 512 |
<normaloff>:/open-file.png</normaloff>:/open-file.png</iconset> |
401 |
<normaloff>:/help.png</normaloff>:/help.png</iconset> |
| 513 |
</property> |
402 |
</property> |
| 514 |
</widget> |
403 |
</widget> |
| 515 |
</item> |
404 |
</item> |
| 516 |
</layout> |
405 |
</layout> |
| 517 |
</item> |
406 |
</item> |
| 518 |
<item row="10" column="0"> |
407 |
<item row="16" column="1"> |
| 519 |
<widget class="QCheckBox" name="CH_downscript"> |
408 |
<widget class="QLineEdit" name="Edit_mode"> |
|
|
409 |
<property name="enabled"> |
| 410 |
<bool>false</bool> |
| 411 |
</property> |
| 520 |
<property name="sizePolicy"> |
412 |
<property name="sizePolicy"> |
| 521 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
413 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 522 |
<horstretch>0</horstretch> |
414 |
<horstretch>0</horstretch> |
| 523 |
<verstretch>0</verstretch> |
415 |
<verstretch>0</verstretch> |
| 524 |
</sizepolicy> |
416 |
</sizepolicy> |
| 525 |
</property> |
417 |
</property> |
|
|
418 |
</widget> |
| 419 |
</item> |
| 420 |
<item row="31" column="0"> |
| 421 |
<widget class="QCheckBox" name="CH_vnet_hdr"> |
| 526 |
<property name="text"> |
422 |
<property name="text"> |
| 527 |
<string>downscript</string> |
423 |
<string>vnet_hdr</string> |
| 528 |
</property> |
424 |
</property> |
| 529 |
</widget> |
425 |
</widget> |
| 530 |
</item> |
426 |
</item> |
| 531 |
<item row="10" column="1"> |
427 |
<item row="30" column="0"> |
| 532 |
<layout class="QHBoxLayout" name="horizontalLayout_2"> |
428 |
<widget class="QCheckBox" name="CH_sndbuf"> |
| 533 |
<property name="spacing"> |
429 |
<property name="text"> |
| 534 |
<number>4</number> |
430 |
<string>sndbuf</string> |
| 535 |
</property> |
431 |
</property> |
| 536 |
<property name="sizeConstraint"> |
432 |
</widget> |
| 537 |
<enum>QLayout::SetMinimumSize</enum> |
433 |
</item> |
|
|
434 |
<item row="33" column="1"> |
| 435 |
<widget class="QSpinBox" name="SB_vhostfd"> |
| 436 |
<property name="enabled"> |
| 437 |
<bool>false</bool> |
| 538 |
</property> |
438 |
</property> |
| 539 |
<item> |
439 |
<property name="maximum"> |
| 540 |
<widget class="QLineEdit" name="Edit_downscript"> |
440 |
<number>999999999</number> |
| 541 |
<property name="enabled"> |
441 |
</property> |
| 542 |
<bool>false</bool> |
442 |
</widget> |
| 543 |
</property> |
|
|
| 544 |
<property name="sizePolicy"> |
| 545 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 546 |
<horstretch>0</horstretch> |
| 547 |
<verstretch>0</verstretch> |
| 548 |
</sizepolicy> |
| 549 |
</property> |
| 550 |
</widget> |
| 551 |
</item> |
| 552 |
<item> |
| 553 |
<widget class="QToolButton" name="TB_Browse_downscript"> |
| 554 |
<property name="enabled"> |
| 555 |
<bool>false</bool> |
| 556 |
</property> |
| 557 |
<property name="text"> |
| 558 |
<string>...</string> |
| 559 |
</property> |
| 560 |
<property name="icon"> |
| 561 |
<iconset resource="../resources/icons.qrc"> |
| 562 |
<normaloff>:/open-file.png</normaloff>:/open-file.png</iconset> |
| 563 |
</property> |
| 564 |
</widget> |
| 565 |
</item> |
| 566 |
</layout> |
| 567 |
</item> |
443 |
</item> |
| 568 |
<item row="11" column="0"> |
444 |
<item row="17" column="0"> |
| 569 |
<widget class="QCheckBox" name="CH_listen"> |
445 |
<widget class="QCheckBox" name="CH_file"> |
| 570 |
<property name="sizePolicy"> |
446 |
<property name="sizePolicy"> |
| 571 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
447 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 572 |
<horstretch>0</horstretch> |
448 |
<horstretch>0</horstretch> |
|
Lines 574-611
Link Here
|
| 574 |
</sizepolicy> |
450 |
</sizepolicy> |
| 575 |
</property> |
451 |
</property> |
| 576 |
<property name="text"> |
452 |
<property name="text"> |
| 577 |
<string>listen</string> |
453 |
<string>file</string> |
| 578 |
</property> |
454 |
</property> |
| 579 |
</widget> |
455 |
</widget> |
| 580 |
</item> |
456 |
</item> |
| 581 |
<item row="11" column="1"> |
457 |
<item row="30" column="1"> |
| 582 |
<widget class="QLineEdit" name="Edit_listen"> |
458 |
<widget class="QSpinBox" name="SB_sndbuf"> |
| 583 |
<property name="enabled"> |
459 |
<property name="enabled"> |
| 584 |
<bool>false</bool> |
460 |
<bool>false</bool> |
| 585 |
</property> |
461 |
</property> |
| 586 |
<property name="sizePolicy"> |
462 |
<property name="maximum"> |
| 587 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
463 |
<number>999999999</number> |
| 588 |
<horstretch>0</horstretch> |
|
|
| 589 |
<verstretch>0</verstretch> |
| 590 |
</sizepolicy> |
| 591 |
</property> |
464 |
</property> |
| 592 |
</widget> |
465 |
</widget> |
| 593 |
</item> |
466 |
</item> |
| 594 |
<item row="12" column="0"> |
467 |
<item row="32" column="1"> |
| 595 |
<widget class="QCheckBox" name="CH_connect"> |
468 |
<widget class="QComboBox" name="CB_vhost"> |
| 596 |
<property name="sizePolicy"> |
469 |
<property name="enabled"> |
| 597 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
470 |
<bool>false</bool> |
| 598 |
<horstretch>0</horstretch> |
|
|
| 599 |
<verstretch>0</verstretch> |
| 600 |
</sizepolicy> |
| 601 |
</property> |
471 |
</property> |
| 602 |
<property name="text"> |
472 |
<item> |
| 603 |
<string>connect</string> |
473 |
<property name="text"> |
|
|
474 |
<string>on</string> |
| 475 |
</property> |
| 476 |
</item> |
| 477 |
<item> |
| 478 |
<property name="text"> |
| 479 |
<string>off</string> |
| 480 |
</property> |
| 481 |
</item> |
| 482 |
</widget> |
| 483 |
</item> |
| 484 |
<item row="35" column="1"> |
| 485 |
<widget class="QLineEdit" name="Edit_guestfwd"> |
| 486 |
<property name="enabled"> |
| 487 |
<bool>false</bool> |
| 604 |
</property> |
488 |
</property> |
| 605 |
</widget> |
489 |
</widget> |
| 606 |
</item> |
490 |
</item> |
| 607 |
<item row="12" column="1"> |
491 |
<item row="1" column="1"> |
| 608 |
<widget class="QLineEdit" name="Edit_connect"> |
492 |
<widget class="QComboBox" name="CB_model"> |
| 609 |
<property name="enabled"> |
493 |
<property name="enabled"> |
| 610 |
<bool>false</bool> |
494 |
<bool>false</bool> |
| 611 |
</property> |
495 |
</property> |
|
Lines 617-623
Link Here
|
| 617 |
</property> |
501 |
</property> |
| 618 |
</widget> |
502 |
</widget> |
| 619 |
</item> |
503 |
</item> |
| 620 |
<item row="13" column="0"> |
504 |
<item row="12" column="0"> |
| 621 |
<widget class="QCheckBox" name="CH_mcast"> |
505 |
<widget class="QCheckBox" name="CH_mcast"> |
| 622 |
<property name="sizePolicy"> |
506 |
<property name="sizePolicy"> |
| 623 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
507 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
|
Lines 630-649
Link Here
|
| 630 |
</property> |
514 |
</property> |
| 631 |
</widget> |
515 |
</widget> |
| 632 |
</item> |
516 |
</item> |
| 633 |
<item row="13" column="1"> |
517 |
<item row="13" column="0"> |
| 634 |
<widget class="QLineEdit" name="Edit_mcast"> |
|
|
| 635 |
<property name="enabled"> |
| 636 |
<bool>false</bool> |
| 637 |
</property> |
| 638 |
<property name="sizePolicy"> |
| 639 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 640 |
<horstretch>0</horstretch> |
| 641 |
<verstretch>0</verstretch> |
| 642 |
</sizepolicy> |
| 643 |
</property> |
| 644 |
</widget> |
| 645 |
</item> |
| 646 |
<item row="14" column="0"> |
| 647 |
<widget class="QCheckBox" name="CH_sock"> |
518 |
<widget class="QCheckBox" name="CH_sock"> |
| 648 |
<property name="sizePolicy"> |
519 |
<property name="sizePolicy"> |
| 649 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
520 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
|
Lines 656-663
Link Here
|
| 656 |
</property> |
527 |
</property> |
| 657 |
</widget> |
528 |
</widget> |
| 658 |
</item> |
529 |
</item> |
|
|
530 |
<item row="32" column="0"> |
| 531 |
<widget class="QCheckBox" name="CH_vhost"> |
| 532 |
<property name="text"> |
| 533 |
<string>vhost</string> |
| 534 |
</property> |
| 535 |
</widget> |
| 536 |
</item> |
| 659 |
<item row="14" column="1"> |
537 |
<item row="14" column="1"> |
| 660 |
<widget class="QLineEdit" name="Edit_sock"> |
538 |
<widget class="QSpinBox" name="SB_port"> |
| 661 |
<property name="enabled"> |
539 |
<property name="enabled"> |
| 662 |
<bool>false</bool> |
540 |
<bool>false</bool> |
| 663 |
</property> |
541 |
</property> |
|
Lines 667-676
Link Here
|
| 667 |
<verstretch>0</verstretch> |
545 |
<verstretch>0</verstretch> |
| 668 |
</sizepolicy> |
546 |
</sizepolicy> |
| 669 |
</property> |
547 |
</property> |
|
|
548 |
<property name="maximum"> |
| 549 |
<number>65000</number> |
| 550 |
</property> |
| 670 |
</widget> |
551 |
</widget> |
| 671 |
</item> |
552 |
</item> |
| 672 |
<item row="15" column="0"> |
553 |
<item row="25" column="0"> |
| 673 |
<widget class="QCheckBox" name="CH_port"> |
554 |
<widget class="QCheckBox" name="CH_dns"> |
|
|
555 |
<property name="text"> |
| 556 |
<string>dns</string> |
| 557 |
</property> |
| 558 |
</widget> |
| 559 |
</item> |
| 560 |
<item row="21" column="0"> |
| 561 |
<widget class="QCheckBox" name="CH_net"> |
| 562 |
<property name="text"> |
| 563 |
<string>net</string> |
| 564 |
</property> |
| 565 |
</widget> |
| 566 |
</item> |
| 567 |
<item row="29" column="1"> |
| 568 |
<widget class="QLineEdit" name="Edit_smbserver"> |
| 569 |
<property name="enabled"> |
| 570 |
<bool>false</bool> |
| 571 |
</property> |
| 572 |
</widget> |
| 573 |
</item> |
| 574 |
<item row="24" column="1"> |
| 575 |
<widget class="QLineEdit" name="Edit_dhcpstart"> |
| 576 |
<property name="enabled"> |
| 577 |
<bool>false</bool> |
| 578 |
</property> |
| 579 |
</widget> |
| 580 |
</item> |
| 581 |
<item row="34" column="0"> |
| 582 |
<widget class="QCheckBox" name="CH_hostfwd"> |
| 583 |
<property name="text"> |
| 584 |
<string>hostfwd</string> |
| 585 |
</property> |
| 586 |
</widget> |
| 587 |
</item> |
| 588 |
<item row="8" column="0"> |
| 589 |
<widget class="QCheckBox" name="CH_script"> |
| 674 |
<property name="sizePolicy"> |
590 |
<property name="sizePolicy"> |
| 675 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
591 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 676 |
<horstretch>0</horstretch> |
592 |
<horstretch>0</horstretch> |
|
Lines 678-705
Link Here
|
| 678 |
</sizepolicy> |
594 |
</sizepolicy> |
| 679 |
</property> |
595 |
</property> |
| 680 |
<property name="text"> |
596 |
<property name="text"> |
| 681 |
<string>port</string> |
597 |
<string>script</string> |
| 682 |
</property> |
598 |
</property> |
| 683 |
</widget> |
599 |
</widget> |
| 684 |
</item> |
600 |
</item> |
| 685 |
<item row="15" column="1"> |
601 |
<item row="31" column="1"> |
| 686 |
<widget class="QSpinBox" name="SB_port"> |
602 |
<widget class="QComboBox" name="CB_vnet_hdr"> |
| 687 |
<property name="enabled"> |
603 |
<property name="enabled"> |
| 688 |
<bool>false</bool> |
604 |
<bool>false</bool> |
| 689 |
</property> |
605 |
</property> |
| 690 |
<property name="sizePolicy"> |
606 |
<item> |
| 691 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
607 |
<property name="text"> |
| 692 |
<horstretch>0</horstretch> |
608 |
<string>on</string> |
| 693 |
<verstretch>0</verstretch> |
609 |
</property> |
| 694 |
</sizepolicy> |
610 |
</item> |
|
|
611 |
<item> |
| 612 |
<property name="text"> |
| 613 |
<string>off</string> |
| 614 |
</property> |
| 615 |
</item> |
| 616 |
</widget> |
| 617 |
</item> |
| 618 |
<item row="35" column="0"> |
| 619 |
<widget class="QCheckBox" name="CH_guestfwd"> |
| 620 |
<property name="text"> |
| 621 |
<string>guestfwd</string> |
| 695 |
</property> |
622 |
</property> |
| 696 |
<property name="maximum"> |
623 |
</widget> |
| 697 |
<number>65000</number> |
624 |
</item> |
|
|
625 |
<item row="34" column="1"> |
| 626 |
<widget class="QLineEdit" name="Edit_hostfwd"> |
| 627 |
<property name="enabled"> |
| 628 |
<bool>false</bool> |
| 698 |
</property> |
629 |
</property> |
| 699 |
</widget> |
630 |
</widget> |
| 700 |
</item> |
631 |
</item> |
| 701 |
<item row="16" column="0"> |
632 |
<item row="5" column="0"> |
| 702 |
<widget class="QCheckBox" name="CH_group"> |
633 |
<widget class="QLabel" name="Label_port_dev"> |
| 703 |
<property name="sizePolicy"> |
634 |
<property name="sizePolicy"> |
| 704 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
635 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 705 |
<horstretch>0</horstretch> |
636 |
<horstretch>0</horstretch> |
|
Lines 707-718
Link Here
|
| 707 |
</sizepolicy> |
638 |
</sizepolicy> |
| 708 |
</property> |
639 |
</property> |
| 709 |
<property name="text"> |
640 |
<property name="text"> |
| 710 |
<string>group</string> |
641 |
<string>port:dev</string> |
| 711 |
</property> |
642 |
</property> |
| 712 |
</widget> |
643 |
</widget> |
| 713 |
</item> |
644 |
</item> |
| 714 |
<item row="16" column="1"> |
645 |
<item row="26" column="0"> |
| 715 |
<widget class="QLineEdit" name="Edit_group"> |
646 |
<widget class="QCheckBox" name="CH_tftp"> |
|
|
647 |
<property name="text"> |
| 648 |
<string>tftp</string> |
| 649 |
</property> |
| 650 |
</widget> |
| 651 |
</item> |
| 652 |
<item row="25" column="1"> |
| 653 |
<widget class="QLineEdit" name="Edit_dns"> |
| 654 |
<property name="enabled"> |
| 655 |
<bool>false</bool> |
| 656 |
</property> |
| 657 |
</widget> |
| 658 |
</item> |
| 659 |
<item row="7" column="1"> |
| 660 |
<widget class="QLineEdit" name="Edit_ifname"> |
| 716 |
<property name="enabled"> |
661 |
<property name="enabled"> |
| 717 |
<bool>false</bool> |
662 |
<bool>false</bool> |
| 718 |
</property> |
663 |
</property> |
|
Lines 724-731
Link Here
|
| 724 |
</property> |
669 |
</property> |
| 725 |
</widget> |
670 |
</widget> |
| 726 |
</item> |
671 |
</item> |
| 727 |
<item row="17" column="0"> |
672 |
<item row="26" column="1"> |
| 728 |
<widget class="QCheckBox" name="CH_mode"> |
673 |
<widget class="QLineEdit" name="Edit_tftp"> |
|
|
674 |
<property name="enabled"> |
| 675 |
<bool>false</bool> |
| 676 |
</property> |
| 677 |
</widget> |
| 678 |
</item> |
| 679 |
<item row="1" column="0"> |
| 680 |
<widget class="QLabel" name="Label_model"> |
| 729 |
<property name="sizePolicy"> |
681 |
<property name="sizePolicy"> |
| 730 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
682 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 731 |
<horstretch>0</horstretch> |
683 |
<horstretch>0</horstretch> |
|
Lines 733-770
Link Here
|
| 733 |
</sizepolicy> |
685 |
</sizepolicy> |
| 734 |
</property> |
686 |
</property> |
| 735 |
<property name="text"> |
687 |
<property name="text"> |
| 736 |
<string>mode</string> |
688 |
<string>Model</string> |
| 737 |
</property> |
689 |
</property> |
| 738 |
</widget> |
690 |
</widget> |
| 739 |
</item> |
691 |
</item> |
| 740 |
<item row="17" column="1"> |
692 |
<item row="15" column="0"> |
| 741 |
<widget class="QLineEdit" name="Edit_mode"> |
693 |
<widget class="QCheckBox" name="CH_group"> |
| 742 |
<property name="enabled"> |
|
|
| 743 |
<bool>false</bool> |
| 744 |
</property> |
| 745 |
<property name="sizePolicy"> |
694 |
<property name="sizePolicy"> |
| 746 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
695 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 747 |
<horstretch>0</horstretch> |
696 |
<horstretch>0</horstretch> |
| 748 |
<verstretch>0</verstretch> |
697 |
<verstretch>0</verstretch> |
| 749 |
</sizepolicy> |
698 |
</sizepolicy> |
| 750 |
</property> |
699 |
</property> |
|
|
700 |
<property name="text"> |
| 701 |
<string>group</string> |
| 702 |
</property> |
| 751 |
</widget> |
703 |
</widget> |
| 752 |
</item> |
704 |
</item> |
| 753 |
<item row="18" column="0"> |
705 |
<item row="4" column="1"> |
| 754 |
<widget class="QCheckBox" name="CH_file"> |
706 |
<widget class="QLineEdit" name="Edit_hostname"> |
|
|
707 |
<property name="enabled"> |
| 708 |
<bool>false</bool> |
| 709 |
</property> |
| 755 |
<property name="sizePolicy"> |
710 |
<property name="sizePolicy"> |
| 756 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
711 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 757 |
<horstretch>0</horstretch> |
712 |
<horstretch>0</horstretch> |
| 758 |
<verstretch>0</verstretch> |
713 |
<verstretch>0</verstretch> |
| 759 |
</sizepolicy> |
714 |
</sizepolicy> |
| 760 |
</property> |
715 |
</property> |
| 761 |
<property name="text"> |
|
|
| 762 |
<string>file</string> |
| 763 |
</property> |
| 764 |
</widget> |
716 |
</widget> |
| 765 |
</item> |
717 |
</item> |
| 766 |
<item row="18" column="1"> |
718 |
<item row="12" column="1"> |
| 767 |
<widget class="QLineEdit" name="Edit_file"> |
719 |
<widget class="QLineEdit" name="Edit_mcast"> |
| 768 |
<property name="enabled"> |
720 |
<property name="enabled"> |
| 769 |
<bool>false</bool> |
721 |
<bool>false</bool> |
| 770 |
</property> |
722 |
</property> |
|
Lines 776-783
Link Here
|
| 776 |
</property> |
728 |
</property> |
| 777 |
</widget> |
729 |
</widget> |
| 778 |
</item> |
730 |
</item> |
| 779 |
<item row="19" column="0"> |
731 |
<item row="4" column="0"> |
| 780 |
<widget class="QCheckBox" name="CH_len"> |
732 |
<widget class="QCheckBox" name="CH_hostname"> |
| 781 |
<property name="sizePolicy"> |
733 |
<property name="sizePolicy"> |
| 782 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
734 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 783 |
<horstretch>0</horstretch> |
735 |
<horstretch>0</horstretch> |
|
Lines 785-795
Link Here
|
| 785 |
</sizepolicy> |
737 |
</sizepolicy> |
| 786 |
</property> |
738 |
</property> |
| 787 |
<property name="text"> |
739 |
<property name="text"> |
| 788 |
<string>len</string> |
740 |
<string>hostname</string> |
| 789 |
</property> |
741 |
</property> |
| 790 |
</widget> |
742 |
</widget> |
| 791 |
</item> |
743 |
</item> |
| 792 |
<item row="19" column="1"> |
744 |
<item row="18" column="1"> |
| 793 |
<widget class="QComboBox" name="CB_len"> |
745 |
<widget class="QComboBox" name="CB_len"> |
| 794 |
<property name="enabled"> |
746 |
<property name="enabled"> |
| 795 |
<bool>false</bool> |
747 |
<bool>false</bool> |
|
Lines 832-970
Link Here
|
| 832 |
</item> |
784 |
</item> |
| 833 |
</widget> |
785 |
</widget> |
| 834 |
</item> |
786 |
</item> |
| 835 |
<item row="20" column="0"> |
787 |
<item row="15" column="1"> |
| 836 |
<widget class="QCheckBox" name="CH_addr"> |
788 |
<widget class="QLineEdit" name="Edit_group"> |
| 837 |
<property name="text"> |
|
|
| 838 |
<string>addr</string> |
| 839 |
</property> |
| 840 |
</widget> |
| 841 |
</item> |
| 842 |
<item row="20" column="1"> |
| 843 |
<widget class="QLineEdit" name="Edit_addr"> |
| 844 |
<property name="enabled"> |
789 |
<property name="enabled"> |
| 845 |
<bool>false</bool> |
790 |
<bool>false</bool> |
| 846 |
</property> |
791 |
</property> |
| 847 |
</widget> |
792 |
<property name="sizePolicy"> |
| 848 |
</item> |
793 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 849 |
<item row="21" column="0"> |
794 |
<horstretch>0</horstretch> |
| 850 |
<widget class="QCheckBox" name="CH_vectors"> |
795 |
<verstretch>0</verstretch> |
| 851 |
<property name="text"> |
796 |
</sizepolicy> |
| 852 |
<string>vectors</string> |
|
|
| 853 |
</property> |
797 |
</property> |
| 854 |
</widget> |
798 |
</widget> |
| 855 |
</item> |
799 |
</item> |
| 856 |
<item row="21" column="1"> |
800 |
<item row="13" column="1"> |
| 857 |
<widget class="QSpinBox" name="SB_vectors"> |
801 |
<widget class="QLineEdit" name="Edit_sock"> |
| 858 |
<property name="enabled"> |
802 |
<property name="enabled"> |
| 859 |
<bool>false</bool> |
803 |
<bool>false</bool> |
| 860 |
</property> |
804 |
</property> |
| 861 |
<property name="maximum"> |
805 |
<property name="sizePolicy"> |
| 862 |
<number>999999999</number> |
806 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
|
|
807 |
<horstretch>0</horstretch> |
| 808 |
<verstretch>0</verstretch> |
| 809 |
</sizepolicy> |
| 863 |
</property> |
810 |
</property> |
| 864 |
</widget> |
811 |
</widget> |
| 865 |
</item> |
812 |
</item> |
| 866 |
<item row="22" column="0"> |
813 |
<item row="24" column="0"> |
| 867 |
<widget class="QCheckBox" name="CH_net"> |
814 |
<widget class="QCheckBox" name="CH_dhcpstart"> |
| 868 |
<property name="text"> |
815 |
<property name="text"> |
| 869 |
<string>net</string> |
816 |
<string>dhcpstart</string> |
| 870 |
</property> |
817 |
</property> |
| 871 |
</widget> |
818 |
</widget> |
| 872 |
</item> |
819 |
</item> |
| 873 |
<item row="22" column="1"> |
820 |
<item row="7" column="0"> |
| 874 |
<widget class="QLineEdit" name="Edit_net"> |
821 |
<widget class="QCheckBox" name="CH_ifname"> |
| 875 |
<property name="enabled"> |
822 |
<property name="sizePolicy"> |
| 876 |
<bool>false</bool> |
823 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
|
|
824 |
<horstretch>0</horstretch> |
| 825 |
<verstretch>0</verstretch> |
| 826 |
</sizepolicy> |
| 877 |
</property> |
827 |
</property> |
| 878 |
</widget> |
|
|
| 879 |
</item> |
| 880 |
<item row="23" column="0"> |
| 881 |
<widget class="QCheckBox" name="CH_host"> |
| 882 |
<property name="text"> |
828 |
<property name="text"> |
| 883 |
<string>host</string> |
829 |
<string>ifname</string> |
| 884 |
</property> |
830 |
</property> |
| 885 |
</widget> |
831 |
</widget> |
| 886 |
</item> |
832 |
</item> |
| 887 |
<item row="23" column="1"> |
833 |
<item row="9" column="1"> |
| 888 |
<widget class="QLineEdit" name="Edit_host"> |
834 |
<layout class="QHBoxLayout" name="horizontalLayout_2"> |
| 889 |
<property name="enabled"> |
835 |
<property name="spacing"> |
| 890 |
<bool>false</bool> |
836 |
<number>4</number> |
|
|
837 |
</property> |
| 838 |
<property name="sizeConstraint"> |
| 839 |
<enum>QLayout::SetMinimumSize</enum> |
| 840 |
</property> |
| 841 |
<item> |
| 842 |
<widget class="QLineEdit" name="Edit_downscript"> |
| 843 |
<property name="enabled"> |
| 844 |
<bool>false</bool> |
| 845 |
</property> |
| 846 |
<property name="sizePolicy"> |
| 847 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 848 |
<horstretch>0</horstretch> |
| 849 |
<verstretch>0</verstretch> |
| 850 |
</sizepolicy> |
| 851 |
</property> |
| 852 |
</widget> |
| 853 |
</item> |
| 854 |
<item> |
| 855 |
<widget class="QToolButton" name="TB_Browse_downscript"> |
| 856 |
<property name="enabled"> |
| 857 |
<bool>false</bool> |
| 858 |
</property> |
| 859 |
<property name="text"> |
| 860 |
<string>...</string> |
| 861 |
</property> |
| 862 |
<property name="icon"> |
| 863 |
<iconset resource="../resources/icons.qrc"> |
| 864 |
<normaloff>:/open-file.png</normaloff>:/open-file.png</iconset> |
| 865 |
</property> |
| 866 |
</widget> |
| 867 |
</item> |
| 868 |
</layout> |
| 869 |
</item> |
| 870 |
<item row="11" column="0"> |
| 871 |
<widget class="QCheckBox" name="CH_connect"> |
| 872 |
<property name="sizePolicy"> |
| 873 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 874 |
<horstretch>0</horstretch> |
| 875 |
<verstretch>0</verstretch> |
| 876 |
</sizepolicy> |
| 877 |
</property> |
| 878 |
<property name="text"> |
| 879 |
<string>connect</string> |
| 891 |
</property> |
880 |
</property> |
| 892 |
</widget> |
881 |
</widget> |
| 893 |
</item> |
882 |
</item> |
| 894 |
<item row="24" column="0"> |
883 |
<item row="3" column="0"> |
| 895 |
<widget class="QCheckBox" name="CH_restrict"> |
884 |
<widget class="QCheckBox" name="CH_name"> |
|
|
885 |
<property name="sizePolicy"> |
| 886 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 887 |
<horstretch>0</horstretch> |
| 888 |
<verstretch>0</verstretch> |
| 889 |
</sizepolicy> |
| 890 |
</property> |
| 896 |
<property name="text"> |
891 |
<property name="text"> |
| 897 |
<string>restrict</string> |
892 |
<string>name</string> |
| 898 |
</property> |
893 |
</property> |
| 899 |
</widget> |
894 |
</widget> |
| 900 |
</item> |
895 |
</item> |
| 901 |
<item row="24" column="1"> |
896 |
<item row="8" column="1"> |
| 902 |
<widget class="QComboBox" name="CB_restrict"> |
897 |
<layout class="QHBoxLayout" name="horizontalLayout"> |
| 903 |
<property name="enabled"> |
898 |
<property name="spacing"> |
| 904 |
<bool>false</bool> |
899 |
<number>4</number> |
|
|
900 |
</property> |
| 901 |
<property name="sizeConstraint"> |
| 902 |
<enum>QLayout::SetMinimumSize</enum> |
| 905 |
</property> |
903 |
</property> |
| 906 |
<item> |
904 |
<item> |
| 907 |
<property name="text"> |
905 |
<widget class="QLineEdit" name="Edit_script"> |
| 908 |
<string>y</string> |
906 |
<property name="enabled"> |
| 909 |
</property> |
907 |
<bool>false</bool> |
|
|
908 |
</property> |
| 909 |
<property name="sizePolicy"> |
| 910 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 911 |
<horstretch>0</horstretch> |
| 912 |
<verstretch>0</verstretch> |
| 913 |
</sizepolicy> |
| 914 |
</property> |
| 915 |
</widget> |
| 910 |
</item> |
916 |
</item> |
| 911 |
<item> |
917 |
<item> |
| 912 |
<property name="text"> |
918 |
<widget class="QToolButton" name="TB_Browse_script"> |
| 913 |
<string>n</string> |
919 |
<property name="enabled"> |
| 914 |
</property> |
920 |
<bool>false</bool> |
|
|
921 |
</property> |
| 922 |
<property name="text"> |
| 923 |
<string>...</string> |
| 924 |
</property> |
| 925 |
<property name="icon"> |
| 926 |
<iconset resource="../resources/icons.qrc"> |
| 927 |
<normaloff>:/open-file.png</normaloff>:/open-file.png</iconset> |
| 928 |
</property> |
| 929 |
</widget> |
| 915 |
</item> |
930 |
</item> |
|
|
931 |
</layout> |
| 932 |
</item> |
| 933 |
<item row="5" column="1"> |
| 934 |
<widget class="QLineEdit" name="Edit_port_dev"> |
| 935 |
<property name="sizePolicy"> |
| 936 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 937 |
<horstretch>0</horstretch> |
| 938 |
<verstretch>0</verstretch> |
| 939 |
</sizepolicy> |
| 940 |
</property> |
| 916 |
</widget> |
941 |
</widget> |
| 917 |
</item> |
942 |
</item> |
| 918 |
<item row="25" column="0"> |
943 |
<item row="27" column="0"> |
| 919 |
<widget class="QCheckBox" name="CH_dhcpstart"> |
944 |
<widget class="QCheckBox" name="CH_bootfile"> |
| 920 |
<property name="text"> |
945 |
<property name="text"> |
| 921 |
<string>dhcpstart</string> |
946 |
<string>bootfile</string> |
| 922 |
</property> |
947 |
</property> |
| 923 |
</widget> |
948 |
</widget> |
| 924 |
</item> |
949 |
</item> |
| 925 |
<item row="25" column="1"> |
950 |
<item row="11" column="1"> |
| 926 |
<widget class="QLineEdit" name="Edit_dhcpstart"> |
951 |
<widget class="QLineEdit" name="Edit_connect"> |
| 927 |
<property name="enabled"> |
952 |
<property name="enabled"> |
| 928 |
<bool>false</bool> |
953 |
<bool>false</bool> |
| 929 |
</property> |
954 |
</property> |
|
|
955 |
<property name="sizePolicy"> |
| 956 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 957 |
<horstretch>0</horstretch> |
| 958 |
<verstretch>0</verstretch> |
| 959 |
</sizepolicy> |
| 960 |
</property> |
| 930 |
</widget> |
961 |
</widget> |
| 931 |
</item> |
962 |
</item> |
| 932 |
<item row="26" column="0"> |
963 |
<item row="21" column="1"> |
| 933 |
<widget class="QCheckBox" name="CH_dns"> |
964 |
<widget class="QLineEdit" name="Edit_net"> |
| 934 |
<property name="text"> |
965 |
<property name="enabled"> |
| 935 |
<string>dns</string> |
966 |
<bool>false</bool> |
| 936 |
</property> |
967 |
</property> |
| 937 |
</widget> |
968 |
</widget> |
| 938 |
</item> |
969 |
</item> |
| 939 |
<item row="26" column="1"> |
970 |
<item row="10" column="1"> |
| 940 |
<widget class="QLineEdit" name="Edit_dns"> |
971 |
<widget class="QLineEdit" name="Edit_listen"> |
| 941 |
<property name="enabled"> |
972 |
<property name="enabled"> |
| 942 |
<bool>false</bool> |
973 |
<bool>false</bool> |
| 943 |
</property> |
974 |
</property> |
|
|
975 |
<property name="sizePolicy"> |
| 976 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| 977 |
<horstretch>0</horstretch> |
| 978 |
<verstretch>0</verstretch> |
| 979 |
</sizepolicy> |
| 980 |
</property> |
| 944 |
</widget> |
981 |
</widget> |
| 945 |
</item> |
982 |
</item> |
| 946 |
<item row="27" column="0"> |
983 |
<item row="23" column="0"> |
| 947 |
<widget class="QCheckBox" name="CH_tftp"> |
984 |
<widget class="QCheckBox" name="CH_restrict"> |
| 948 |
<property name="text"> |
985 |
<property name="text"> |
| 949 |
<string>tftp</string> |
986 |
<string>restrict</string> |
| 950 |
</property> |
987 |
</property> |
| 951 |
</widget> |
988 |
</widget> |
| 952 |
</item> |
989 |
</item> |
| 953 |
<item row="27" column="1"> |
990 |
<item row="19" column="0"> |
| 954 |
<widget class="QLineEdit" name="Edit_tftp"> |
991 |
<widget class="QCheckBox" name="CH_addr"> |
|
|
992 |
<property name="text"> |
| 993 |
<string>addr</string> |
| 994 |
</property> |
| 995 |
</widget> |
| 996 |
</item> |
| 997 |
<item row="10" column="0"> |
| 998 |
<widget class="QCheckBox" name="CH_listen"> |
| 999 |
<property name="sizePolicy"> |
| 1000 |
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |
| 1001 |
<horstretch>0</horstretch> |
| 1002 |
<verstretch>0</verstretch> |
| 1003 |
</sizepolicy> |
| 1004 |
</property> |
| 1005 |
<property name="text"> |
| 1006 |
<string>listen</string> |
| 1007 |
</property> |
| 1008 |
</widget> |
| 1009 |
</item> |
| 1010 |
<item row="22" column="1"> |
| 1011 |
<widget class="QLineEdit" name="Edit_host"> |
| 955 |
<property name="enabled"> |
1012 |
<property name="enabled"> |
| 956 |
<bool>false</bool> |
1013 |
<bool>false</bool> |
| 957 |
</property> |
1014 |
</property> |
| 958 |
</widget> |
1015 |
</widget> |
| 959 |
</item> |
1016 |
</item> |
|
|
1017 |
<item row="20" column="1"> |
| 1018 |
<widget class="QSpinBox" name="SB_vectors"> |
| 1019 |
<property name="enabled"> |
| 1020 |
<bool>false</bool> |
| 1021 |
</property> |
| 1022 |
<property name="maximum"> |
| 1023 |
<number>999999999</number> |
| 1024 |
</property> |
| 1025 |
</widget> |
| 1026 |
</item> |
| 960 |
<item row="28" column="0"> |
1027 |
<item row="28" column="0"> |
| 961 |
<widget class="QCheckBox" name="CH_bootfile"> |
1028 |
<widget class="QCheckBox" name="CH_smb"> |
| 962 |
<property name="text"> |
1029 |
<property name="text"> |
| 963 |
<string>bootfile</string> |
1030 |
<string>smb</string> |
| 964 |
</property> |
1031 |
</property> |
| 965 |
</widget> |
1032 |
</widget> |
| 966 |
</item> |
1033 |
</item> |
| 967 |
<item row="28" column="1"> |
1034 |
<item row="29" column="0"> |
|
|
1035 |
<widget class="QCheckBox" name="CH_smbserver"> |
| 1036 |
<property name="text"> |
| 1037 |
<string>smbserver</string> |
| 1038 |
</property> |
| 1039 |
</widget> |
| 1040 |
</item> |
| 1041 |
<item row="27" column="1"> |
| 968 |
<layout class="QHBoxLayout" name="horizontalLayout_5"> |
1042 |
<layout class="QHBoxLayout" name="horizontalLayout_5"> |
| 969 |
<property name="spacing"> |
1043 |
<property name="spacing"> |
| 970 |
<number>4</number> |
1044 |
<number>4</number> |
|
Lines 992-1005
Link Here
|
| 992 |
</item> |
1066 |
</item> |
| 993 |
</layout> |
1067 |
</layout> |
| 994 |
</item> |
1068 |
</item> |
| 995 |
<item row="29" column="0"> |
1069 |
<item row="28" column="1"> |
| 996 |
<widget class="QCheckBox" name="CH_smb"> |
|
|
| 997 |
<property name="text"> |
| 998 |
<string>smb</string> |
| 999 |
</property> |
| 1000 |
</widget> |
| 1001 |
</item> |
| 1002 |
<item row="29" column="1"> |
| 1003 |
<layout class="QHBoxLayout" name="horizontalLayout_6"> |
1070 |
<layout class="QHBoxLayout" name="horizontalLayout_6"> |
| 1004 |
<property name="spacing"> |
1071 |
<property name="spacing"> |
| 1005 |
<number>4</number> |
1072 |
<number>4</number> |
|
Lines 1027-1153
Link Here
|
| 1027 |
</item> |
1094 |
</item> |
| 1028 |
</layout> |
1095 |
</layout> |
| 1029 |
</item> |
1096 |
</item> |
| 1030 |
<item row="30" column="0"> |
1097 |
<item row="23" column="1"> |
| 1031 |
<widget class="QCheckBox" name="CH_smbserver"> |
1098 |
<widget class="QComboBox" name="CB_restrict"> |
| 1032 |
<property name="text"> |
|
|
| 1033 |
<string>smbserver</string> |
| 1034 |
</property> |
| 1035 |
</widget> |
| 1036 |
</item> |
| 1037 |
<item row="30" column="1"> |
| 1038 |
<widget class="QLineEdit" name="Edit_smbserver"> |
| 1039 |
<property name="enabled"> |
| 1040 |
<bool>false</bool> |
| 1041 |
</property> |
| 1042 |
</widget> |
| 1043 |
</item> |
| 1044 |
<item row="31" column="0"> |
| 1045 |
<widget class="QCheckBox" name="CH_sndbuf"> |
| 1046 |
<property name="text"> |
| 1047 |
<string>sndbuf</string> |
| 1048 |
</property> |
| 1049 |
</widget> |
| 1050 |
</item> |
| 1051 |
<item row="31" column="1"> |
| 1052 |
<widget class="QSpinBox" name="SB_sndbuf"> |
| 1053 |
<property name="enabled"> |
| 1054 |
<bool>false</bool> |
| 1055 |
</property> |
| 1056 |
<property name="maximum"> |
| 1057 |
<number>999999999</number> |
| 1058 |
</property> |
| 1059 |
</widget> |
| 1060 |
</item> |
| 1061 |
<item row="32" column="0"> |
| 1062 |
<widget class="QCheckBox" name="CH_vnet_hdr"> |
| 1063 |
<property name="text"> |
| 1064 |
<string>vnet_hdr</string> |
| 1065 |
</property> |
| 1066 |
</widget> |
| 1067 |
</item> |
| 1068 |
<item row="32" column="1"> |
| 1069 |
<widget class="QComboBox" name="CB_vnet_hdr"> |
| 1070 |
<property name="enabled"> |
| 1071 |
<bool>false</bool> |
| 1072 |
</property> |
| 1073 |
<item> |
| 1074 |
<property name="text"> |
| 1075 |
<string>on</string> |
| 1076 |
</property> |
| 1077 |
</item> |
| 1078 |
<item> |
| 1079 |
<property name="text"> |
| 1080 |
<string>off</string> |
| 1081 |
</property> |
| 1082 |
</item> |
| 1083 |
</widget> |
| 1084 |
</item> |
| 1085 |
<item row="33" column="0"> |
| 1086 |
<widget class="QCheckBox" name="CH_vhost"> |
| 1087 |
<property name="text"> |
| 1088 |
<string>vhost</string> |
| 1089 |
</property> |
| 1090 |
</widget> |
| 1091 |
</item> |
| 1092 |
<item row="33" column="1"> |
| 1093 |
<widget class="QComboBox" name="CB_vhost"> |
| 1094 |
<property name="enabled"> |
1099 |
<property name="enabled"> |
| 1095 |
<bool>false</bool> |
1100 |
<bool>false</bool> |
| 1096 |
</property> |
1101 |
</property> |
| 1097 |
<item> |
1102 |
<item> |
| 1098 |
<property name="text"> |
1103 |
<property name="text"> |
| 1099 |
<string>on</string> |
1104 |
<string>y</string> |
| 1100 |
</property> |
1105 |
</property> |
| 1101 |
</item> |
1106 |
</item> |
| 1102 |
<item> |
1107 |
<item> |
| 1103 |
<property name="text"> |
1108 |
<property name="text"> |
| 1104 |
<string>off</string> |
1109 |
<string>n</string> |
| 1105 |
</property> |
1110 |
</property> |
| 1106 |
</item> |
1111 |
</item> |
| 1107 |
</widget> |
1112 |
</widget> |
| 1108 |
</item> |
1113 |
</item> |
| 1109 |
<item row="34" column="0"> |
1114 |
<item row="20" column="0"> |
| 1110 |
<widget class="QCheckBox" name="CH_vhostfd"> |
1115 |
<widget class="QCheckBox" name="CH_vectors"> |
| 1111 |
<property name="text"> |
|
|
| 1112 |
<string>vhostfd</string> |
| 1113 |
</property> |
| 1114 |
</widget> |
| 1115 |
</item> |
| 1116 |
<item row="34" column="1"> |
| 1117 |
<widget class="QSpinBox" name="SB_vhostfd"> |
| 1118 |
<property name="enabled"> |
| 1119 |
<bool>false</bool> |
| 1120 |
</property> |
| 1121 |
<property name="maximum"> |
| 1122 |
<number>999999999</number> |
| 1123 |
</property> |
| 1124 |
</widget> |
| 1125 |
</item> |
| 1126 |
<item row="35" column="0"> |
| 1127 |
<widget class="QCheckBox" name="CH_hostfwd"> |
| 1128 |
<property name="text"> |
1116 |
<property name="text"> |
| 1129 |
<string>hostfwd</string> |
1117 |
<string>vectors</string> |
| 1130 |
</property> |
|
|
| 1131 |
</widget> |
| 1132 |
</item> |
| 1133 |
<item row="35" column="1"> |
| 1134 |
<widget class="QLineEdit" name="Edit_hostfwd"> |
| 1135 |
<property name="enabled"> |
| 1136 |
<bool>false</bool> |
| 1137 |
</property> |
1118 |
</property> |
| 1138 |
</widget> |
1119 |
</widget> |
| 1139 |
</item> |
1120 |
</item> |
| 1140 |
<item row="36" column="0"> |
1121 |
<item row="22" column="0"> |
| 1141 |
<widget class="QCheckBox" name="CH_guestfwd"> |
1122 |
<widget class="QCheckBox" name="CH_host"> |
| 1142 |
<property name="text"> |
1123 |
<property name="text"> |
| 1143 |
<string>guestfwd</string> |
1124 |
<string>host</string> |
| 1144 |
</property> |
|
|
| 1145 |
</widget> |
| 1146 |
</item> |
| 1147 |
<item row="36" column="1"> |
| 1148 |
<widget class="QLineEdit" name="Edit_guestfwd"> |
| 1149 |
<property name="enabled"> |
| 1150 |
<bool>false</bool> |
| 1151 |
</property> |
1125 |
</property> |
| 1152 |
</widget> |
1126 |
</widget> |
| 1153 |
</item> |
1127 |
</item> |
|
Lines 1180-1187
Link Here
|
| 1180 |
<tabstop>TB_Generate_New_MAC</tabstop> |
1154 |
<tabstop>TB_Generate_New_MAC</tabstop> |
| 1181 |
<tabstop>CB_Network_Type</tabstop> |
1155 |
<tabstop>CB_Network_Type</tabstop> |
| 1182 |
<tabstop>TB_Help</tabstop> |
1156 |
<tabstop>TB_Help</tabstop> |
| 1183 |
<tabstop>CH_vlan</tabstop> |
|
|
| 1184 |
<tabstop>SB_vlan</tabstop> |
| 1185 |
<tabstop>CH_name</tabstop> |
1157 |
<tabstop>CH_name</tabstop> |
| 1186 |
<tabstop>Edit_name</tabstop> |
1158 |
<tabstop>Edit_name</tabstop> |
| 1187 |
<tabstop>CH_hostname</tabstop> |
1159 |
<tabstop>CH_hostname</tabstop> |
|
Lines 1224-1245
Link Here
|
| 1224 |
</resources> |
1196 |
</resources> |
| 1225 |
<connections> |
1197 |
<connections> |
| 1226 |
<connection> |
1198 |
<connection> |
| 1227 |
<sender>CH_vlan</sender> |
|
|
| 1228 |
<signal>toggled(bool)</signal> |
| 1229 |
<receiver>SB_vlan</receiver> |
| 1230 |
<slot>setEnabled(bool)</slot> |
| 1231 |
<hints> |
| 1232 |
<hint type="sourcelabel"> |
| 1233 |
<x>57</x> |
| 1234 |
<y>260</y> |
| 1235 |
</hint> |
| 1236 |
<hint type="destinationlabel"> |
| 1237 |
<x>278</x> |
| 1238 |
<y>256</y> |
| 1239 |
</hint> |
| 1240 |
</hints> |
| 1241 |
</connection> |
| 1242 |
<connection> |
| 1243 |
<sender>CH_macaddr</sender> |
1199 |
<sender>CH_macaddr</sender> |
| 1244 |
<signal>toggled(bool)</signal> |
1200 |
<signal>toggled(bool)</signal> |
| 1245 |
<receiver>Edit_macaddr</receiver> |
1201 |
<receiver>Edit_macaddr</receiver> |
| 1246 |
-- a/src/Old_Network_Widget.cpp |
1202 |
++ b/src/Old_Network_Widget.cpp |
|
Lines 140-148
Link Here
|
| 140 |
connect( ui.SB_Port, SIGNAL(valueChanged(int)), |
140 |
connect( ui.SB_Port, SIGNAL(valueChanged(int)), |
| 141 |
this, SIGNAL(Changed()) ); |
141 |
this, SIGNAL(Changed()) ); |
| 142 |
|
142 |
|
| 143 |
connect( ui.SB_VLAN, SIGNAL(valueChanged(int)), |
|
|
| 144 |
this, SIGNAL(Changed()) ); |
| 145 |
|
| 146 |
connect( ui.CH_TUN_TAP_Script, SIGNAL(clicked()), |
143 |
connect( ui.CH_TUN_TAP_Script, SIGNAL(clicked()), |
| 147 |
this, SIGNAL(Changed()) ); |
144 |
this, SIGNAL(Changed()) ); |
| 148 |
|
145 |
|
|
Lines 176-184
Link Here
|
| 176 |
disconnect( ui.SB_Port, SIGNAL(valueChanged(int)), |
173 |
disconnect( ui.SB_Port, SIGNAL(valueChanged(int)), |
| 177 |
this, SIGNAL(Changed()) ); |
174 |
this, SIGNAL(Changed()) ); |
| 178 |
|
175 |
|
| 179 |
disconnect( ui.SB_VLAN, SIGNAL(valueChanged(int)), |
|
|
| 180 |
this, SIGNAL(Changed()) ); |
| 181 |
|
| 182 |
disconnect( ui.CH_TUN_TAP_Script, SIGNAL(clicked()), |
176 |
disconnect( ui.CH_TUN_TAP_Script, SIGNAL(clicked()), |
| 183 |
this, SIGNAL(Changed()) ); |
177 |
this, SIGNAL(Changed()) ); |
| 184 |
|
178 |
|
|
Lines 310-317
Link Here
|
| 310 |
ui.Label_MAC->setEnabled( true ); |
304 |
ui.Label_MAC->setEnabled( true ); |
| 311 |
ui.Edit_MAC_Address->setEnabled( true ); |
305 |
ui.Edit_MAC_Address->setEnabled( true ); |
| 312 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
306 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
| 313 |
ui.Label_VLAN->setEnabled( true ); |
|
|
| 314 |
ui.SB_VLAN->setEnabled( true ); |
| 315 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
307 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
| 316 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
308 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
| 317 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
309 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
|
Lines 334-341
Link Here
|
| 334 |
ui.Label_MAC->setEnabled( true ); |
326 |
ui.Label_MAC->setEnabled( true ); |
| 335 |
ui.Edit_MAC_Address->setEnabled( true ); |
327 |
ui.Edit_MAC_Address->setEnabled( true ); |
| 336 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
328 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
| 337 |
ui.Label_VLAN->setEnabled( true ); |
|
|
| 338 |
ui.SB_VLAN->setEnabled( true ); |
| 339 |
ui.CH_TUN_TAP_Script->setEnabled( true ); |
329 |
ui.CH_TUN_TAP_Script->setEnabled( true ); |
| 340 |
ui.Edit_TUN_TAP_Script->setEnabled( true ); |
330 |
ui.Edit_TUN_TAP_Script->setEnabled( true ); |
| 341 |
ui.TB_Browse_TUN_Script->setEnabled( true ); |
331 |
ui.TB_Browse_TUN_Script->setEnabled( true ); |
|
Lines 358-365
Link Here
|
| 358 |
ui.Label_MAC->setEnabled( true ); |
348 |
ui.Label_MAC->setEnabled( true ); |
| 359 |
ui.Edit_MAC_Address->setEnabled( true ); |
349 |
ui.Edit_MAC_Address->setEnabled( true ); |
| 360 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
350 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
| 361 |
ui.Label_VLAN->setEnabled( true ); |
|
|
| 362 |
ui.SB_VLAN->setEnabled( true ); |
| 363 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
351 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
| 364 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
352 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
| 365 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
353 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
|
Lines 382-389
Link Here
|
| 382 |
ui.Label_MAC->setEnabled( true ); |
370 |
ui.Label_MAC->setEnabled( true ); |
| 383 |
ui.Edit_MAC_Address->setEnabled( true ); |
371 |
ui.Edit_MAC_Address->setEnabled( true ); |
| 384 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
372 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
| 385 |
ui.Label_VLAN->setEnabled( true ); |
|
|
| 386 |
ui.SB_VLAN->setEnabled( true ); |
| 387 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
373 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
| 388 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
374 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
| 389 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
375 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
|
Lines 406-413
Link Here
|
| 406 |
ui.Label_MAC->setEnabled( true ); |
392 |
ui.Label_MAC->setEnabled( true ); |
| 407 |
ui.Edit_MAC_Address->setEnabled( true ); |
393 |
ui.Edit_MAC_Address->setEnabled( true ); |
| 408 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
394 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
| 409 |
ui.Label_VLAN->setEnabled( true ); |
|
|
| 410 |
ui.SB_VLAN->setEnabled( true ); |
| 411 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
395 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
| 412 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
396 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
| 413 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
397 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
|
Lines 430-437
Link Here
|
| 430 |
ui.Label_MAC->setEnabled( true ); |
414 |
ui.Label_MAC->setEnabled( true ); |
| 431 |
ui.Edit_MAC_Address->setEnabled( true ); |
415 |
ui.Edit_MAC_Address->setEnabled( true ); |
| 432 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
416 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
| 433 |
ui.Label_VLAN->setEnabled( true ); |
|
|
| 434 |
ui.SB_VLAN->setEnabled( true ); |
| 435 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
417 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
| 436 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
418 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
| 437 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
419 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
|
Lines 441-447
Link Here
|
| 441 |
ui.SB_File_Descriptor->setEnabled( false ); |
423 |
ui.SB_File_Descriptor->setEnabled( false ); |
| 442 |
break; |
424 |
break; |
| 443 |
|
425 |
|
| 444 |
case 6: // create shared VLAN via UDP multicast socket |
426 |
case 6: // use an UDP multicast socket |
| 445 |
if(set_net_mode) |
427 |
if(set_net_mode) |
| 446 |
Network_Cards[ ui.Network_Cards_List->currentRow() ].Set_Net_Mode( VM::Net_Mode_Multicast ); |
428 |
Network_Cards[ ui.Network_Cards_List->currentRow() ].Set_Net_Mode( VM::Net_Mode_Multicast ); |
| 447 |
|
429 |
|
|
Lines 454-461
Link Here
|
| 454 |
ui.Label_MAC->setEnabled( true ); |
436 |
ui.Label_MAC->setEnabled( true ); |
| 455 |
ui.Edit_MAC_Address->setEnabled( true ); |
437 |
ui.Edit_MAC_Address->setEnabled( true ); |
| 456 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
438 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
| 457 |
ui.Label_VLAN->setEnabled( true ); |
|
|
| 458 |
ui.SB_VLAN->setEnabled( true ); |
| 459 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
439 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
| 460 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
440 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
| 461 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
441 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
|
Lines 478-485
Link Here
|
| 478 |
ui.Label_MAC->setEnabled( true ); |
458 |
ui.Label_MAC->setEnabled( true ); |
| 479 |
ui.Edit_MAC_Address->setEnabled( true ); |
459 |
ui.Edit_MAC_Address->setEnabled( true ); |
| 480 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
460 |
ui.TB_Generate_New_MAC->setEnabled( true ); |
| 481 |
ui.Label_VLAN->setEnabled( true ); |
|
|
| 482 |
ui.SB_VLAN->setEnabled( true ); |
| 483 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
461 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
| 484 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
462 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
| 485 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
463 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
|
Lines 502-509
Link Here
|
| 502 |
ui.Label_MAC->setEnabled( false ); |
480 |
ui.Label_MAC->setEnabled( false ); |
| 503 |
ui.Edit_MAC_Address->setEnabled( false ); |
481 |
ui.Edit_MAC_Address->setEnabled( false ); |
| 504 |
ui.TB_Generate_New_MAC->setEnabled( false ); |
482 |
ui.TB_Generate_New_MAC->setEnabled( false ); |
| 505 |
ui.Label_VLAN->setEnabled( false ); |
|
|
| 506 |
ui.SB_VLAN->setEnabled( false ); |
| 507 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
483 |
ui.CH_TUN_TAP_Script->setEnabled( false ); |
| 508 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
484 |
ui.Edit_TUN_TAP_Script->setEnabled( false ); |
| 509 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
485 |
ui.TB_Browse_TUN_Script->setEnabled( false ); |
|
Lines 555-565
Link Here
|
| 555 |
Network_Cards[ ui.Network_Cards_List->currentRow() ].Set_Port( i ); |
531 |
Network_Cards[ ui.Network_Cards_List->currentRow() ].Set_Port( i ); |
| 556 |
} |
532 |
} |
| 557 |
|
533 |
|
| 558 |
void Old_Network_Widget::on_SB_VLAN_valueChanged( int i ) |
|
|
| 559 |
{ |
| 560 |
Network_Cards[ ui.Network_Cards_List->currentRow() ].Set_VLAN( i ); |
| 561 |
} |
| 562 |
|
| 563 |
void Old_Network_Widget::on_CH_TUN_TAP_Script_stateChanged( int state ) |
534 |
void Old_Network_Widget::on_CH_TUN_TAP_Script_stateChanged( int state ) |
| 564 |
{ |
535 |
{ |
| 565 |
if( state == Qt::Checked ) Network_Cards[ ui.Network_Cards_List->currentRow() ].Set_Use_TUN_TAP_Script( true ); |
536 |
if( state == Qt::Checked ) Network_Cards[ ui.Network_Cards_List->currentRow() ].Set_Use_TUN_TAP_Script( true ); |
|
Lines 657-663
Link Here
|
| 657 |
ui.Edit_IP_Address->setText( card.Get_IP_Address() ); |
628 |
ui.Edit_IP_Address->setText( card.Get_IP_Address() ); |
| 658 |
ui.Edit_MAC_Address->setText( card.Get_MAC_Address() ); |
629 |
ui.Edit_MAC_Address->setText( card.Get_MAC_Address() ); |
| 659 |
ui.SB_Port->setValue( card.Get_Port() ); |
630 |
ui.SB_Port->setValue( card.Get_Port() ); |
| 660 |
ui.SB_VLAN->setValue( card.Get_VLAN() ); |
|
|
| 661 |
ui.CH_TUN_TAP_Script->setChecked( card.Get_Use_TUN_TAP_Script() ); |
631 |
ui.CH_TUN_TAP_Script->setChecked( card.Get_Use_TUN_TAP_Script() ); |
| 662 |
ui.Edit_TUN_TAP_Script->setText( card.Get_TUN_TAP_Script() ); |
632 |
ui.Edit_TUN_TAP_Script->setText( card.Get_TUN_TAP_Script() ); |
| 663 |
ui.Edit_Interface_Name->setText( card.Get_Interface_Name() ); |
633 |
ui.Edit_Interface_Name->setText( card.Get_Interface_Name() ); |
| 664 |
-- a/src/Old_Network_Widget.h |
634 |
++ b/src/Old_Network_Widget.h |
|
Lines 54-60
Link Here
|
| 54 |
void on_Edit_IP_Address_textChanged(); |
54 |
void on_Edit_IP_Address_textChanged(); |
| 55 |
void on_Edit_MAC_Address_textChanged(); |
55 |
void on_Edit_MAC_Address_textChanged(); |
| 56 |
void on_SB_Port_valueChanged( int i ); |
56 |
void on_SB_Port_valueChanged( int i ); |
| 57 |
void on_SB_VLAN_valueChanged( int i ); |
|
|
| 58 |
void on_CH_TUN_TAP_Script_stateChanged( int state ); |
57 |
void on_CH_TUN_TAP_Script_stateChanged( int state ); |
| 59 |
void on_Edit_TUN_TAP_Script_textChanged(); |
58 |
void on_Edit_TUN_TAP_Script_textChanged(); |
| 60 |
void on_Edit_Interface_Name_textChanged(); |
59 |
void on_Edit_Interface_Name_textChanged(); |
| 61 |
-- a/src/Old_Network_Widget.ui |
60 |
++ b/src/Old_Network_Widget.ui |
|
Lines 163-169
Link Here
|
| 163 |
</property> |
163 |
</property> |
| 164 |
</widget> |
164 |
</widget> |
| 165 |
</item> |
165 |
</item> |
| 166 |
<item row="6" column="1"> |
166 |
<item row="5" column="1"> |
| 167 |
<widget class="QLineEdit" name="Edit_MAC_Address"> |
167 |
<widget class="QLineEdit" name="Edit_MAC_Address"> |
| 168 |
<property name="text"> |
168 |
<property name="text"> |
| 169 |
<string/> |
169 |
<string/> |
|
Lines 176-182
Link Here
|
| 176 |
</property> |
176 |
</property> |
| 177 |
</widget> |
177 |
</widget> |
| 178 |
</item> |
178 |
</item> |
| 179 |
<item row="8" column="2"> |
179 |
<item row="7" column="2"> |
| 180 |
<widget class="QToolButton" name="TB_Browse_TUN_Script"> |
180 |
<widget class="QToolButton" name="TB_Browse_TUN_Script"> |
| 181 |
<property name="text"> |
181 |
<property name="text"> |
| 182 |
<string>...</string> |
182 |
<string>...</string> |
|
Lines 215-221
Link Here
|
| 215 |
</property> |
215 |
</property> |
| 216 |
</widget> |
216 |
</widget> |
| 217 |
</item> |
217 |
</item> |
| 218 |
<item row="6" column="5"> |
218 |
<item row="5" column="5"> |
| 219 |
<widget class="QSpinBox" name="SB_File_Descriptor"> |
219 |
<widget class="QSpinBox" name="SB_File_Descriptor"> |
| 220 |
<property name="minimumSize"> |
220 |
<property name="minimumSize"> |
| 221 |
<size> |
221 |
<size> |
|
Lines 243-265
Link Here
|
| 243 |
</property> |
243 |
</property> |
| 244 |
</widget> |
244 |
</widget> |
| 245 |
</item> |
245 |
</item> |
| 246 |
<item row="3" column="5"> |
246 |
<item row="5" column="2"> |
| 247 |
<widget class="QSpinBox" name="SB_VLAN"> |
|
|
| 248 |
<property name="minimumSize"> |
| 249 |
<size> |
| 250 |
<width>80</width> |
| 251 |
<height>0</height> |
| 252 |
</size> |
| 253 |
</property> |
| 254 |
<property name="maximumSize"> |
| 255 |
<size> |
| 256 |
<width>80</width> |
| 257 |
<height>16777215</height> |
| 258 |
</size> |
| 259 |
</property> |
| 260 |
</widget> |
| 261 |
</item> |
| 262 |
<item row="6" column="2"> |
| 263 |
<widget class="QToolButton" name="TB_Generate_New_MAC"> |
247 |
<widget class="QToolButton" name="TB_Generate_New_MAC"> |
| 264 |
<property name="toolTip"> |
248 |
<property name="toolTip"> |
| 265 |
<string>Generate New MAC</string> |
249 |
<string>Generate New MAC</string> |
|
Lines 273-297
Link Here
|
| 273 |
</property> |
257 |
</property> |
| 274 |
</widget> |
258 |
</widget> |
| 275 |
</item> |
259 |
</item> |
| 276 |
<item row="3" column="4"> |
|
|
| 277 |
<widget class="QLabel" name="Label_VLAN"> |
| 278 |
<property name="sizePolicy"> |
| 279 |
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
| 280 |
<horstretch>0</horstretch> |
| 281 |
<verstretch>0</verstretch> |
| 282 |
</sizepolicy> |
| 283 |
</property> |
| 284 |
<property name="text"> |
| 285 |
<string>V&LAN:</string> |
| 286 |
</property> |
| 287 |
<property name="alignment"> |
| 288 |
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
| 289 |
</property> |
| 290 |
<property name="buddy"> |
| 291 |
<cstring>SB_VLAN</cstring> |
| 292 |
</property> |
| 293 |
</widget> |
| 294 |
</item> |
| 295 |
<item row="0" column="1" colspan="5"> |
260 |
<item row="0" column="1" colspan="5"> |
| 296 |
<widget class="QComboBox" name="CB_Network_Card_Model"> |
261 |
<widget class="QComboBox" name="CB_Network_Card_Model"> |
| 297 |
<property name="maxCount"> |
262 |
<property name="maxCount"> |
|
Lines 302-308
Link Here
|
| 302 |
<item row="3" column="1"> |
267 |
<item row="3" column="1"> |
| 303 |
<widget class="QLineEdit" name="Edit_Hostname"/> |
268 |
<widget class="QLineEdit" name="Edit_Hostname"/> |
| 304 |
</item> |
269 |
</item> |
| 305 |
<item row="9" column="0"> |
270 |
<item row="8" column="0"> |
| 306 |
<widget class="QLabel" name="Label_If_Name"> |
271 |
<widget class="QLabel" name="Label_If_Name"> |
| 307 |
<property name="sizePolicy"> |
272 |
<property name="sizePolicy"> |
| 308 |
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
273 |
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
|
Lines 373-379
Link Here
|
| 373 |
</item> |
338 |
</item> |
| 374 |
<item> |
339 |
<item> |
| 375 |
<property name="text"> |
340 |
<property name="text"> |
| 376 |
<string>Create shared VLAN via UDP multicast socket</string> |
341 |
<string>Use an UDP multicast socket</string> |
| 377 |
</property> |
342 |
</property> |
| 378 |
</item> |
343 |
</item> |
| 379 |
<item> |
344 |
<item> |
|
Lines 388-394
Link Here
|
| 388 |
</item> |
353 |
</item> |
| 389 |
</widget> |
354 |
</widget> |
| 390 |
</item> |
355 |
</item> |
| 391 |
<item row="6" column="4"> |
356 |
<item row="5" column="4"> |
| 392 |
<widget class="QLabel" name="Label_File_Descriptor"> |
357 |
<widget class="QLabel" name="Label_File_Descriptor"> |
| 393 |
<property name="sizePolicy"> |
358 |
<property name="sizePolicy"> |
| 394 |
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
359 |
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
|
Lines 407-413
Link Here
|
| 407 |
</property> |
372 |
</property> |
| 408 |
</widget> |
373 |
</widget> |
| 409 |
</item> |
374 |
</item> |
| 410 |
<item row="8" column="0" alignment="Qt::AlignRight"> |
375 |
<item row="7" column="0" alignment="Qt::AlignRight"> |
| 411 |
<widget class="QCheckBox" name="CH_TUN_TAP_Script"> |
376 |
<widget class="QCheckBox" name="CH_TUN_TAP_Script"> |
| 412 |
<property name="sizePolicy"> |
377 |
<property name="sizePolicy"> |
| 413 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
378 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
|
Lines 442-448
Link Here
|
| 442 |
</property> |
407 |
</property> |
| 443 |
</spacer> |
408 |
</spacer> |
| 444 |
</item> |
409 |
</item> |
| 445 |
<item row="8" column="1"> |
410 |
<item row="7" column="1"> |
| 446 |
<widget class="QLineEdit" name="Edit_TUN_TAP_Script"/> |
411 |
<widget class="QLineEdit" name="Edit_TUN_TAP_Script"/> |
| 447 |
</item> |
412 |
</item> |
| 448 |
<item row="3" column="3"> |
413 |
<item row="3" column="3"> |
|
Lines 461-470
Link Here
|
| 461 |
</property> |
426 |
</property> |
| 462 |
</spacer> |
427 |
</spacer> |
| 463 |
</item> |
428 |
</item> |
| 464 |
<item row="9" column="1"> |
429 |
<item row="8" column="1"> |
| 465 |
<widget class="QLineEdit" name="Edit_Interface_Name"/> |
430 |
<widget class="QLineEdit" name="Edit_Interface_Name"/> |
| 466 |
</item> |
431 |
</item> |
| 467 |
<item row="6" column="0"> |
432 |
<item row="5" column="0"> |
| 468 |
<widget class="QLabel" name="Label_MAC"> |
433 |
<widget class="QLabel" name="Label_MAC"> |
| 469 |
<property name="sizePolicy"> |
434 |
<property name="sizePolicy"> |
| 470 |
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
435 |
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> |
|
Lines 483-489
Link Here
|
| 483 |
</property> |
448 |
</property> |
| 484 |
</widget> |
449 |
</widget> |
| 485 |
</item> |
450 |
</item> |
| 486 |
<item row="7" column="0"> |
451 |
<item row="6" column="0"> |
| 487 |
<spacer name="verticalSpacer_2"> |
452 |
<spacer name="verticalSpacer_2"> |
| 488 |
<property name="orientation"> |
453 |
<property name="orientation"> |
| 489 |
<enum>Qt::Vertical</enum> |
454 |
<enum>Qt::Vertical</enum> |
| 490 |
-- a/src/VM.cpp |
455 |
++ b/src/VM.cpp |
|
Lines 1930-1941
Link Here
|
| 1930 |
Dom_Text = New_Dom_Document.createTextNode( QString::number(Network_Cards[nx].Get_Port()) ); |
1930 |
Dom_Text = New_Dom_Document.createTextNode( QString::number(Network_Cards[nx].Get_Port()) ); |
| 1931 |
Sec_Element.appendChild( Dom_Text ); |
1931 |
Sec_Element.appendChild( Dom_Text ); |
| 1932 |
|
1932 |
|
| 1933 |
// VLAN |
|
|
| 1934 |
Sec_Element = New_Dom_Document.createElement( "VLAN" ); |
| 1935 |
Dom_Element.appendChild( Sec_Element ); |
| 1936 |
Dom_Text = New_Dom_Document.createTextNode( QString::number(Network_Cards[nx].Get_VLAN()) ); |
| 1937 |
Sec_Element.appendChild( Dom_Text ); |
| 1938 |
|
| 1939 |
// Use TUN TAP Script |
1933 |
// Use TUN TAP Script |
| 1940 |
Sec_Element = New_Dom_Document.createElement( "Use_TUN_TAP_Script" ); |
1934 |
Sec_Element = New_Dom_Document.createElement( "Use_TUN_TAP_Script" ); |
| 1941 |
Dom_Element.appendChild( Sec_Element ); |
1935 |
Dom_Element.appendChild( Sec_Element ); |
|
Lines 2053-2069
Link Here
|
| 2053 |
Dom_Text = New_Dom_Document.createTextNode( Network_Cards_Nativ[nx].Get_MAC_Address() ); |
2047 |
Dom_Text = New_Dom_Document.createTextNode( Network_Cards_Nativ[nx].Get_MAC_Address() ); |
| 2054 |
Sec_Element.appendChild( Dom_Text ); |
2048 |
Sec_Element.appendChild( Dom_Text ); |
| 2055 |
|
2049 |
|
| 2056 |
// VLAN |
|
|
| 2057 |
Sec_Element = New_Dom_Document.createElement( "Use_VLAN" ); |
| 2058 |
Dom_Element.appendChild( Sec_Element ); |
| 2059 |
Dom_Text = New_Dom_Document.createTextNode( Network_Cards_Nativ[nx].Use_VLAN() ? "yes" : "no" ); |
| 2060 |
Sec_Element.appendChild( Dom_Text ); |
| 2061 |
|
| 2062 |
Sec_Element = New_Dom_Document.createElement( "VLAN" ); |
| 2063 |
Dom_Element.appendChild( Sec_Element ); |
| 2064 |
Dom_Text = New_Dom_Document.createTextNode( QString::number(Network_Cards_Nativ[nx].Get_VLAN()) ); |
| 2065 |
Sec_Element.appendChild( Dom_Text ); |
| 2066 |
|
| 2067 |
// Name |
2050 |
// Name |
| 2068 |
Sec_Element = New_Dom_Document.createElement( "Use_Name" ); |
2051 |
Sec_Element = New_Dom_Document.createElement( "Use_Name" ); |
| 2069 |
Dom_Element.appendChild( Sec_Element ); |
2052 |
Dom_Element.appendChild( Sec_Element ); |
|
Lines 4182-4190
Link Here
|
| 4182 |
// Port |
4165 |
// Port |
| 4183 |
tmp_card.Set_Port( Second_Element.firstChildElement("Port").text().toInt() ); |
4166 |
tmp_card.Set_Port( Second_Element.firstChildElement("Port").text().toInt() ); |
| 4184 |
|
4167 |
|
| 4185 |
// VLAN |
|
|
| 4186 |
tmp_card.Set_VLAN( Second_Element.firstChildElement("VLAN").text().toInt() ); |
| 4187 |
|
| 4188 |
// Use TUN TAP Script |
4168 |
// Use TUN TAP Script |
| 4189 |
tmp_card.Set_Use_TUN_TAP_Script( ! (Second_Element.firstChildElement("Use_TUN_TAP_Script").text() == "false") ); |
4169 |
tmp_card.Set_Use_TUN_TAP_Script( ! (Second_Element.firstChildElement("Use_TUN_TAP_Script").text() == "false") ); |
| 4190 |
|
4170 |
|
|
Lines 4244-4255
Link Here
|
| 4244 |
tmp_card.Set_Card_Model( Second_Element.firstChildElement("Card_Model").text() ); |
4224 |
tmp_card.Set_Card_Model( Second_Element.firstChildElement("Card_Model").text() ); |
| 4245 |
tmp_card.Use_MAC_Address( Second_Element.firstChildElement("Use_MAC_Address").text() == "yes" ); |
4225 |
tmp_card.Use_MAC_Address( Second_Element.firstChildElement("Use_MAC_Address").text() == "yes" ); |
| 4246 |
|
4226 |
|
| 4247 |
tmp_card.Set_MAC_Address( Second_Element.firstChildElement("MAC_Address").text() ); |
|
|
| 4248 |
tmp_card.Use_VLAN( Second_Element.firstChildElement("Use_VLAN").text() == "yes" ); |
| 4249 |
|
| 4250 |
tmp_card.Set_VLAN( Second_Element.firstChildElement("VLAN").text().toInt() ); |
| 4251 |
tmp_card.Use_Name( Second_Element.firstChildElement("Use_Name").text() == "yes" ); |
| 4252 |
|
| 4253 |
tmp_card.Set_Name( Second_Element.firstChildElement("Name").text() ); |
4227 |
tmp_card.Set_Name( Second_Element.firstChildElement("Name").text() ); |
| 4254 |
tmp_card.Use_Hostname( Second_Element.firstChildElement("Use_Hostname").text() == "yes" ); |
4228 |
tmp_card.Use_Hostname( Second_Element.firstChildElement("Use_Hostname").text() == "yes" ); |
| 4255 |
|
4229 |
|
|
Lines 5702-5731
Link Here
|
| 5702 |
for( int nc = 0; nc < Network_Cards_Nativ.count(); nc++ ) |
5676 |
for( int nc = 0; nc < Network_Cards_Nativ.count(); nc++ ) |
| 5703 |
{ |
5677 |
{ |
| 5704 |
QString nic_str = ""; |
5678 |
QString nic_str = ""; |
| 5705 |
bool u_vlan, u_macaddr, u_model, u_name, u_hostname, u_port_dev, u_fd, u_ifname, u_script, |
5679 |
bool u_macaddr, u_model, u_name, u_hostname, u_port_dev, u_fd, u_ifname, u_script, |
| 5706 |
u_downscript, u_listen, u_connect, u_mcast, u_sock, u_port, u_group, u_mode, u_file, |
5680 |
u_downscript, u_listen, u_connect, u_mcast, u_sock, u_port, u_group, u_mode, u_file, |
| 5707 |
u_len, u_addr, u_vectors, u_net, u_host, u_restrict, u_dhcpstart, u_dns, u_tftp, u_bootfile, |
5681 |
u_len, u_addr, u_vectors, u_net, u_host, u_restrict, u_dhcpstart, u_dns, u_tftp, u_bootfile, |
| 5708 |
u_hostfwd, u_guestfwd, u_smb, u_smbserver, u_sndbuf, u_vnet_hdr, u_vhost, u_vhostfd; |
5682 |
u_hostfwd, u_guestfwd, u_smb, u_smbserver, u_sndbuf, u_vnet_hdr, u_vhost, u_vhostfd; |
| 5709 |
|
5683 |
|
| 5710 |
u_vlan = u_macaddr = u_model = u_name = u_hostname = u_port_dev = u_fd = u_ifname = u_script = |
5684 |
u_macaddr = u_model = u_name = u_hostname = u_port_dev = u_fd = u_ifname = u_script = |
| 5711 |
u_downscript = u_listen = u_connect = u_mcast = u_sock = u_port = u_group = u_mode = u_file = |
5685 |
u_downscript = u_listen = u_connect = u_mcast = u_sock = u_port = u_group = u_mode = u_file = |
| 5712 |
u_len = u_addr = u_vectors = u_net = u_host = u_restrict = u_dhcpstart = u_dns = u_tftp = u_bootfile = |
5686 |
u_len = u_addr = u_vectors = u_net = u_host = u_restrict = u_dhcpstart = u_dns = u_tftp = u_bootfile = |
| 5713 |
u_hostfwd = u_guestfwd = u_smb = u_smbserver = u_sndbuf = u_vnet_hdr = u_vhost = u_vhostfd = false; |
5687 |
u_hostfwd = u_guestfwd = u_smb = u_smbserver = u_sndbuf = u_vnet_hdr = u_vhost = u_vhostfd = false; |
| 5714 |
|
5688 |
|
| 5715 |
switch( Network_Cards_Nativ[nc].Get_Network_Type() ) |
5689 |
switch( Network_Cards_Nativ[nc].Get_Network_Type() ) |
| 5716 |
{ |
5690 |
{ |
| 5717 |
// -net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] |
5691 |
// -net nic[,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] |
| 5718 |
case VM::Net_Mode_Nativ_NIC: |
5692 |
case VM::Net_Mode_Nativ_NIC: |
| 5719 |
nic_str += "nic"; |
5693 |
nic_str += "nic"; |
| 5720 |
u_vlan = u_macaddr = u_model = u_name = u_addr = u_vectors = true; |
5694 |
u_macaddr = u_model = u_name = u_addr = u_vectors = true; |
| 5721 |
break; |
5695 |
break; |
| 5722 |
|
5696 |
|
| 5723 |
// -net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] |
5697 |
// -net user[,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] |
| 5724 |
// [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] |
5698 |
// [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] |
| 5725 |
// [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] |
5699 |
// [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] |
| 5726 |
case VM::Net_Mode_Nativ_User: |
5700 |
case VM::Net_Mode_Nativ_User: |
| 5727 |
nic_str += "user"; |
5701 |
nic_str += "user"; |
| 5728 |
u_vlan = u_name = u_net = u_host = u_restrict = u_hostname = u_dhcpstart = u_dns = |
5702 |
u_name = u_net = u_host = u_restrict = u_hostname = u_dhcpstart = u_dns = |
| 5729 |
u_tftp = u_bootfile = u_hostfwd = u_guestfwd = u_smb = u_smbserver = true; |
5703 |
u_tftp = u_bootfile = u_hostfwd = u_guestfwd = u_smb = u_smbserver = true; |
| 5730 |
break; |
5704 |
break; |
| 5731 |
|
5705 |
|
|
Lines 5735-5771
Link Here
|
| 5735 |
u_port_dev = true; |
5709 |
u_port_dev = true; |
| 5736 |
break; |
5710 |
break; |
| 5737 |
|
5711 |
|
| 5738 |
// -net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile] |
5712 |
// -net tap[,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile] |
| 5739 |
// [,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h] |
5713 |
// [,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h] |
| 5740 |
case VM::Net_Mode_Nativ_TAP: |
5714 |
case VM::Net_Mode_Nativ_TAP: |
| 5741 |
nic_str += "tap"; |
5715 |
nic_str += "tap"; |
| 5742 |
u_vlan = u_name = u_fd = u_ifname = u_script = u_downscript = u_sndbuf = u_vnet_hdr = u_vhost = u_vhostfd = true; |
5716 |
u_name = u_fd = u_ifname = u_script = u_downscript = u_sndbuf = u_vnet_hdr = u_vhost = u_vhostfd = true; |
| 5743 |
break; |
5717 |
break; |
| 5744 |
|
5718 |
|
| 5745 |
// -net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] |
5719 |
// -net socket[,name=str][,fd=h][,listen=[host]:port][,connect=host:port] |
| 5746 |
case VM::Net_Mode_Nativ_Socket: |
5720 |
case VM::Net_Mode_Nativ_Socket: |
| 5747 |
nic_str += "socket"; |
5721 |
nic_str += "socket"; |
| 5748 |
u_vlan = u_name = u_fd = u_listen = u_connect = true; |
5722 |
u_name = u_fd = u_listen = u_connect = true; |
| 5749 |
break; |
5723 |
break; |
| 5750 |
|
5724 |
|
| 5751 |
// -net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] |
5725 |
// -net socket[,name=str][,fd=h][,mcast=maddr:port] |
| 5752 |
case VM::Net_Mode_Nativ_MulticastSocket: |
5726 |
case VM::Net_Mode_Nativ_MulticastSocket: |
| 5753 |
nic_str += "socket"; |
5727 |
nic_str += "socket"; |
| 5754 |
u_vlan = u_name = u_fd = u_mcast = true; |
5728 |
u_name = u_fd = u_mcast = true; |
| 5755 |
break; |
5729 |
break; |
| 5756 |
|
5730 |
|
| 5757 |
// -net vde[,vlan=n][,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] |
5731 |
// -net vde[,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode] |
| 5758 |
case VM::Net_Mode_Nativ_VDE: |
5732 |
case VM::Net_Mode_Nativ_VDE: |
| 5759 |
if( ! Current_Emulator_Devices.PSO_Net_type_vde ) continue; |
5733 |
if( ! Current_Emulator_Devices.PSO_Net_type_vde ) continue; |
| 5760 |
nic_str += "vde"; |
5734 |
nic_str += "vde"; |
| 5761 |
u_vlan = u_name = u_sock = u_port = u_group = u_mode = true; |
5735 |
u_name = u_sock = u_port = u_group = u_mode = true; |
| 5762 |
break; |
5736 |
break; |
| 5763 |
|
5737 |
|
| 5764 |
// -net dump[,vlan=n][,file=file][,len=len] |
5738 |
// -net dump[,file=file][,len=len] |
| 5765 |
case VM::Net_Mode_Nativ_Dump: |
5739 |
case VM::Net_Mode_Nativ_Dump: |
| 5766 |
if( ! Current_Emulator_Devices.PSO_Net_type_dump ) continue; |
5740 |
if( ! Current_Emulator_Devices.PSO_Net_type_dump ) continue; |
| 5767 |
nic_str += "dump"; |
5741 |
nic_str += "dump"; |
| 5768 |
u_vlan = u_file = u_len = true; |
5742 |
u_file = u_len = true; |
| 5769 |
break; |
5743 |
break; |
| 5770 |
|
5744 |
|
| 5771 |
default: |
5745 |
default: |
|
Lines 5773-5781
Link Here
|
| 5773 |
} |
5747 |
} |
| 5774 |
|
5748 |
|
| 5775 |
// Create String |
5749 |
// Create String |
| 5776 |
if( Network_Cards_Nativ[nc].Use_VLAN() && u_vlan ) |
|
|
| 5777 |
nic_str += ",vlan=" + QString::number( Network_Cards_Nativ[nc].Get_VLAN() ); |
| 5778 |
|
| 5779 |
if( Network_Cards_Nativ[nc].Use_MAC_Address() && u_macaddr ) |
5750 |
if( Network_Cards_Nativ[nc].Use_MAC_Address() && u_macaddr ) |
| 5780 |
nic_str += ",macaddr=" + Network_Cards_Nativ[ nc ].Get_MAC_Address(); |
5751 |
nic_str += ",macaddr=" + Network_Cards_Nativ[ nc ].Get_MAC_Address(); |
| 5781 |
|
5752 |
|
|
Lines 5935-5941
Link Here
|
| 5935 |
for( int nc = 0; nc < Network_Cards.count(); nc++ ) |
5906 |
for( int nc = 0; nc < Network_Cards.count(); nc++ ) |
| 5936 |
{ |
5907 |
{ |
| 5937 |
Args << "-net"; |
5908 |
Args << "-net"; |
| 5938 |
QString nic_str = "nic,vlan=" + QString::number( Network_Cards[nc].Get_VLAN() ); |
5909 |
QString nic_str = "nic"; |
| 5939 |
|
5910 |
|
| 5940 |
if( ! Network_Cards[nc].Get_MAC_Address().isEmpty() ) // Use MAC? |
5911 |
if( ! Network_Cards[nc].Get_MAC_Address().isEmpty() ) // Use MAC? |
| 5941 |
nic_str += ",macaddr=" + Network_Cards[nc].Get_MAC_Address(); |
5912 |
nic_str += ",macaddr=" + Network_Cards[nc].Get_MAC_Address(); |
|
Lines 5955-5970
Link Here
|
| 5955 |
|
5926 |
|
| 5956 |
case VM::Net_Mode_Usermode: |
5927 |
case VM::Net_Mode_Usermode: |
| 5957 |
if( Network_Cards[nc].Get_Hostname().isEmpty() ) |
5928 |
if( Network_Cards[nc].Get_Hostname().isEmpty() ) |
| 5958 |
Args << "-net" << QString( "user,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) ); |
5929 |
Args << "-net" << QString( "user" ); |
| 5959 |
else |
|
|
| 5960 |
Args << "-net" << QString( "user,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
| 5961 |
",hostname=" + Network_Cards[nc].Get_Hostname() ); |
| 5962 |
break; |
5930 |
break; |
| 5963 |
|
5931 |
|
| 5964 |
case VM::Net_Mode_Tuntap: |
5932 |
case VM::Net_Mode_Tuntap: |
| 5965 |
Args << "-net" ; |
5933 |
Args << "-net" ; |
| 5966 |
|
5934 |
|
| 5967 |
tap_tmp = QString( "tap,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) ); |
5935 |
tap_tmp = QString( "tap" ); |
| 5968 |
|
5936 |
|
| 5969 |
if( ! Network_Cards[nc].Get_Interface_Name().isEmpty() ) |
5937 |
if( ! Network_Cards[nc].Get_Interface_Name().isEmpty() ) |
| 5970 |
tap_tmp += QString( ",ifname=" + Network_Cards[nc].Get_Interface_Name() ); |
5938 |
tap_tmp += QString( ",ifname=" + Network_Cards[nc].Get_Interface_Name() ); |
|
Lines 5988-5994
Link Here
|
| 5988 |
break; |
5956 |
break; |
| 5989 |
|
5957 |
|
| 5990 |
case VM::Net_Mode_Tuntapfd: |
5958 |
case VM::Net_Mode_Tuntapfd: |
| 5991 |
Args << "-net" << QString( "tap,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
5959 |
Args << "-net" << QString( "tap" + |
| 5992 |
((Network_Cards[nc].Get_File_Descriptor() > 0) ? ",fd=" + QString::number(Network_Cards[nc].Get_File_Descriptor()) : "") + |
5960 |
((Network_Cards[nc].Get_File_Descriptor() > 0) ? ",fd=" + QString::number(Network_Cards[nc].Get_File_Descriptor()) : "") + |
| 5993 |
((Network_Cards[nc].Get_Interface_Name().isEmpty() == false) ? ",ifname=" + Network_Cards[nc].Get_Interface_Name() : "") ); |
5961 |
((Network_Cards[nc].Get_Interface_Name().isEmpty() == false) ? ",ifname=" + Network_Cards[nc].Get_Interface_Name() : "") ); |
| 5994 |
break; |
5962 |
break; |
|
Lines 5996-6048
Link Here
|
| 5996 |
case VM::Net_Mode_Tcplisten: |
5964 |
case VM::Net_Mode_Tcplisten: |
| 5997 |
if( Network_Cards[nc].Get_IP_Address().isEmpty() ) |
5965 |
if( Network_Cards[nc].Get_IP_Address().isEmpty() ) |
| 5998 |
{ |
5966 |
{ |
| 5999 |
Args << "-net" << QString( "socket,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
5967 |
Args << "-net" << QString( "socket" ); |
| 6000 |
",listen=:" + QString::number(Network_Cards[nc].Get_Port()) ); |
|
|
| 6001 |
} |
5968 |
} |
| 6002 |
else |
5969 |
else |
| 6003 |
{ |
5970 |
{ |
| 6004 |
Args << "-net" << QString( "socket,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
5971 |
Args << "-net" << QString( "socket" ); |
| 6005 |
",listen=" + Network_Cards[nc].Get_IP_Address() + ":" + |
|
|
| 6006 |
QString::number(Network_Cards[nc].Get_Port()) ); |
| 6007 |
} |
5972 |
} |
| 6008 |
break; |
5973 |
break; |
| 6009 |
|
5974 |
|
| 6010 |
case VM::Net_Mode_Tcpfd: |
5975 |
case VM::Net_Mode_Tcpfd: |
| 6011 |
Args << "-net" << QString( "socket,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
5976 |
Args << "-net" << QString( "socket" ); |
| 6012 |
",fd=" + QString::number(Network_Cards[nc].Get_File_Descriptor()) ); |
|
|
| 6013 |
break; |
5977 |
break; |
| 6014 |
|
5978 |
|
| 6015 |
case VM::Net_Mode_Tcpconnect: |
5979 |
case VM::Net_Mode_Tcpconnect: |
| 6016 |
if( Network_Cards[nc].Get_IP_Address().isEmpty() ) |
5980 |
if( Network_Cards[nc].Get_IP_Address().isEmpty() ) |
| 6017 |
{ |
5981 |
{ |
| 6018 |
Args << "-net" << QString( "socket,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
5982 |
Args << "-net" << QString( "socket" ); |
| 6019 |
",connect=:" + QString::number(Network_Cards[nc].Get_Port()) ); |
|
|
| 6020 |
} |
5983 |
} |
| 6021 |
else |
5984 |
else |
| 6022 |
{ |
5985 |
{ |
| 6023 |
Args << "-net" << QString( "socket,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
5986 |
Args << "-net" << QString( "socket" ); |
| 6024 |
",connect=" + Network_Cards[nc].Get_IP_Address() + |
|
|
| 6025 |
":" + QString::number(Network_Cards[nc].Get_Port()) ); |
| 6026 |
} |
5987 |
} |
| 6027 |
break; |
5988 |
break; |
| 6028 |
|
5989 |
|
| 6029 |
case VM::Net_Mode_Multicast: |
5990 |
case VM::Net_Mode_Multicast: |
| 6030 |
if( Network_Cards[nc].Get_IP_Address().isEmpty() ) |
5991 |
if( Network_Cards[nc].Get_IP_Address().isEmpty() ) |
| 6031 |
{ |
5992 |
{ |
| 6032 |
Args << "-net" << QString( "socket,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
5993 |
Args << "-net" << QString( "socket" ); |
| 6033 |
",mcast=:" + QString::number(Network_Cards[nc].Get_Port()) ); |
|
|
| 6034 |
} |
5994 |
} |
| 6035 |
else |
5995 |
else |
| 6036 |
{ |
5996 |
{ |
| 6037 |
Args << "-net" << QString( "socket,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
5997 |
Args << "-net" << QString( "socket" ); |
| 6038 |
",mcast=" + Network_Cards[nc].Get_IP_Address() + |
|
|
| 6039 |
":" + QString::number(Network_Cards[nc].Get_Port()) ); |
| 6040 |
} |
5998 |
} |
| 6041 |
break; |
5999 |
break; |
| 6042 |
|
6000 |
|
| 6043 |
case VM::Net_Mode_Multicastfd: |
6001 |
case VM::Net_Mode_Multicastfd: |
| 6044 |
Args << "-net" << QString( "socket,vlan=" + QString::number(Network_Cards[nc].Get_VLAN()) + |
6002 |
Args << "-net" << QString( "socket" ); |
| 6045 |
",fd=" + QString::number(Network_Cards[nc].Get_File_Descriptor()) ); |
|
|
| 6046 |
break; |
6003 |
break; |
| 6047 |
|
6004 |
|
| 6048 |
default: |
6005 |
default: |
| 6049 |
-- a/src/VM_Devices.cpp |
6006 |
++ b/src/VM_Devices.cpp |
|
Lines 2380-2386
Link Here
|
| 2380 |
Network_Mode = VM::Net_Mode_Nativ_NIC; |
2380 |
Network_Mode = VM::Net_Mode_Nativ_NIC; |
| 2381 |
Card_Model = ""; |
2381 |
Card_Model = ""; |
| 2382 |
MAC = ""; |
2382 |
MAC = ""; |
| 2383 |
VLAN = 0; |
|
|
| 2384 |
Name = ""; |
2383 |
Name = ""; |
| 2385 |
Hostname = ""; |
2384 |
Hostname = ""; |
| 2386 |
PortDev = ""; |
2385 |
PortDev = ""; |
|
Lines 2416-2422
Link Here
|
| 2416 |
VHostFd = false; |
2415 |
VHostFd = false; |
| 2417 |
|
2416 |
|
| 2418 |
_Use_MAC = false; |
2417 |
_Use_MAC = false; |
| 2419 |
_Use_VLAN = false; |
|
|
| 2420 |
_Use_Name = false; |
2418 |
_Use_Name = false; |
| 2421 |
_Use_Hostname = false; |
2419 |
_Use_Hostname = false; |
| 2422 |
_Use_File_Descriptor = false; |
2420 |
_Use_File_Descriptor = false; |
|
Lines 2456-2462
Link Here
|
| 2456 |
Network_Mode = nc.Get_Network_Type(); |
2454 |
Network_Mode = nc.Get_Network_Type(); |
| 2457 |
Card_Model = nc.Get_Card_Model(); |
2455 |
Card_Model = nc.Get_Card_Model(); |
| 2458 |
MAC = nc.Get_MAC_Address(); |
2456 |
MAC = nc.Get_MAC_Address(); |
| 2459 |
VLAN = nc.Get_VLAN(); |
|
|
| 2460 |
Name = nc.Get_Name(); |
2457 |
Name = nc.Get_Name(); |
| 2461 |
Hostname = nc.Get_Hostname(); |
2458 |
Hostname = nc.Get_Hostname(); |
| 2462 |
PortDev = nc.Get_PortDev(); |
2459 |
PortDev = nc.Get_PortDev(); |
|
Lines 2492-2498
Link Here
|
| 2492 |
VHostFd = nc.Get_VHostFd(); |
2489 |
VHostFd = nc.Get_VHostFd(); |
| 2493 |
|
2490 |
|
| 2494 |
_Use_MAC = nc.Use_MAC_Address(); |
2491 |
_Use_MAC = nc.Use_MAC_Address(); |
| 2495 |
_Use_VLAN = nc.Use_VLAN(); |
|
|
| 2496 |
_Use_Name = nc.Use_Name(); |
2492 |
_Use_Name = nc.Use_Name(); |
| 2497 |
_Use_Hostname = nc.Use_Hostname(); |
2493 |
_Use_Hostname = nc.Use_Hostname(); |
| 2498 |
_Use_File_Descriptor = nc.Use_File_Descriptor(); |
2494 |
_Use_File_Descriptor = nc.Use_File_Descriptor(); |
|
Lines 2532-2538
Link Here
|
| 2532 |
if( Network_Mode == nc.Get_Network_Type() && |
2528 |
if( Network_Mode == nc.Get_Network_Type() && |
| 2533 |
Card_Model == nc.Get_Card_Model() && |
2529 |
Card_Model == nc.Get_Card_Model() && |
| 2534 |
MAC == nc.Get_MAC_Address() && |
2530 |
MAC == nc.Get_MAC_Address() && |
| 2535 |
VLAN == nc.Get_VLAN() && |
|
|
| 2536 |
Name == nc.Get_Name() && |
2531 |
Name == nc.Get_Name() && |
| 2537 |
Hostname == nc.Get_Hostname() && |
2532 |
Hostname == nc.Get_Hostname() && |
| 2538 |
PortDev == nc.Get_PortDev() && |
2533 |
PortDev == nc.Get_PortDev() && |
|
Lines 2567-2573
Link Here
|
| 2567 |
VHost == nc.Get_VHost() && |
2562 |
VHost == nc.Get_VHost() && |
| 2568 |
VHostFd == nc.Get_VHostFd() && |
2563 |
VHostFd == nc.Get_VHostFd() && |
| 2569 |
_Use_MAC == nc.Use_MAC_Address() && |
2564 |
_Use_MAC == nc.Use_MAC_Address() && |
| 2570 |
_Use_VLAN == nc.Use_VLAN() && |
|
|
| 2571 |
_Use_Name == nc.Use_Name() && |
2565 |
_Use_Name == nc.Use_Name() && |
| 2572 |
_Use_Hostname == nc.Use_Hostname() && |
2566 |
_Use_Hostname == nc.Use_Hostname() && |
| 2573 |
_Use_File_Descriptor == nc.Use_File_Descriptor() && |
2567 |
_Use_File_Descriptor == nc.Use_File_Descriptor() && |
|
Lines 2661-2686
Link Here
|
| 2661 |
MAC = ma; |
2655 |
MAC = ma; |
| 2662 |
} |
2656 |
} |
| 2663 |
|
2657 |
|
| 2664 |
bool VM_Net_Card_Nativ::Use_VLAN() const |
|
|
| 2665 |
{ |
| 2666 |
return _Use_VLAN; |
| 2667 |
} |
| 2668 |
|
| 2669 |
void VM_Net_Card_Nativ::Use_VLAN( bool use ) |
| 2670 |
{ |
| 2671 |
_Use_VLAN = use; |
| 2672 |
} |
| 2673 |
|
| 2674 |
int VM_Net_Card_Nativ::Get_VLAN() const |
| 2675 |
{ |
| 2676 |
return VLAN; |
| 2677 |
} |
| 2678 |
|
| 2679 |
void VM_Net_Card_Nativ::Set_VLAN( int vl ) |
| 2680 |
{ |
| 2681 |
VLAN = vl; |
| 2682 |
} |
| 2683 |
|
| 2684 |
bool VM_Net_Card_Nativ::Use_Name() const |
2658 |
bool VM_Net_Card_Nativ::Use_Name() const |
| 2685 |
{ |
2659 |
{ |
| 2686 |
return _Use_Name; |
2660 |
return _Use_Name; |
|
Lines 3345-3351
Link Here
|
| 3345 |
MAC = ""; |
3319 |
MAC = ""; |
| 3346 |
Hostname = ""; |
3320 |
Hostname = ""; |
| 3347 |
Port = 0; |
3321 |
Port = 0; |
| 3348 |
VLAN = 0; |
|
|
| 3349 |
Use_TUN_TAP_Script = true; |
3322 |
Use_TUN_TAP_Script = true; |
| 3350 |
TUN_TAP_Script = ""; |
3323 |
TUN_TAP_Script = ""; |
| 3351 |
Interface_Name = ""; |
3324 |
Interface_Name = ""; |
|
Lines 3360-3366
Link Here
|
| 3360 |
IP = nc.Get_IP_Address(); |
3333 |
IP = nc.Get_IP_Address(); |
| 3361 |
MAC = nc.Get_MAC_Address(); |
3334 |
MAC = nc.Get_MAC_Address(); |
| 3362 |
Port = nc.Get_Port(); |
3335 |
Port = nc.Get_Port(); |
| 3363 |
VLAN = nc.Get_VLAN(); |
|
|
| 3364 |
Use_TUN_TAP_Script = nc.Get_Use_TUN_TAP_Script(); |
3336 |
Use_TUN_TAP_Script = nc.Get_Use_TUN_TAP_Script(); |
| 3365 |
TUN_TAP_Script = nc.Get_TUN_TAP_Script(); |
3337 |
TUN_TAP_Script = nc.Get_TUN_TAP_Script(); |
| 3366 |
Interface_Name = nc.Get_Interface_Name(); |
3338 |
Interface_Name = nc.Get_Interface_Name(); |
|
Lines 3375-3381
Link Here
|
| 3375 |
IP == nc.Get_IP_Address() && |
3347 |
IP == nc.Get_IP_Address() && |
| 3376 |
MAC == nc.Get_MAC_Address() && |
3348 |
MAC == nc.Get_MAC_Address() && |
| 3377 |
Port == nc.Get_Port() && |
3349 |
Port == nc.Get_Port() && |
| 3378 |
VLAN == nc.Get_VLAN() && |
|
|
| 3379 |
Use_TUN_TAP_Script == nc.Get_Use_TUN_TAP_Script() && |
3350 |
Use_TUN_TAP_Script == nc.Get_Use_TUN_TAP_Script() && |
| 3380 |
TUN_TAP_Script == nc.Get_TUN_TAP_Script() && |
3351 |
TUN_TAP_Script == nc.Get_TUN_TAP_Script() && |
| 3381 |
Interface_Name == nc.Get_Interface_Name() && |
3352 |
Interface_Name == nc.Get_Interface_Name() && |
|
Lines 3596-3611
Link Here
|
| 3596 |
Port = p; |
3567 |
Port = p; |
| 3597 |
} |
3568 |
} |
| 3598 |
|
3569 |
|
| 3599 |
int VM_Net_Card::Get_VLAN() const |
|
|
| 3600 |
{ |
| 3601 |
return VLAN; |
| 3602 |
} |
| 3603 |
|
| 3604 |
void VM_Net_Card::Set_VLAN( int vl ) |
| 3605 |
{ |
| 3606 |
VLAN = vl; |
| 3607 |
} |
| 3608 |
|
| 3609 |
bool VM_Net_Card::Get_Use_TUN_TAP_Script() const |
3570 |
bool VM_Net_Card::Get_Use_TUN_TAP_Script() const |
| 3610 |
{ |
3571 |
{ |
| 3611 |
return Use_TUN_TAP_Script; |
3572 |
return Use_TUN_TAP_Script; |
| 3612 |
-- a/src/VM_Devices.h |
3573 |
++ b/src/VM_Devices.h |
|
Lines 698-706
Link Here
|
| 698 |
int Get_Port() const; |
698 |
int Get_Port() const; |
| 699 |
void Set_Port( int p ); |
699 |
void Set_Port( int p ); |
| 700 |
|
700 |
|
| 701 |
int Get_VLAN() const; |
|
|
| 702 |
void Set_VLAN( int vl ); |
| 703 |
|
| 704 |
bool Get_Use_TUN_TAP_Script() const; |
701 |
bool Get_Use_TUN_TAP_Script() const; |
| 705 |
void Set_Use_TUN_TAP_Script( bool use ); |
702 |
void Set_Use_TUN_TAP_Script( bool use ); |
| 706 |
|
703 |
|
|
Lines 720-726
Link Here
|
| 720 |
QString IP; |
717 |
QString IP; |
| 721 |
QString MAC; |
718 |
QString MAC; |
| 722 |
int Port; |
719 |
int Port; |
| 723 |
int VLAN; |
|
|
| 724 |
bool Use_TUN_TAP_Script; |
720 |
bool Use_TUN_TAP_Script; |
| 725 |
QString TUN_TAP_Script; |
721 |
QString TUN_TAP_Script; |
| 726 |
QString Interface_Name; |
722 |
QString Interface_Name; |
|
Lines 750-760
Link Here
|
| 750 |
const QString &Get_MAC_Address() const; |
746 |
const QString &Get_MAC_Address() const; |
| 751 |
void Set_MAC_Address( const QString &ma ); |
747 |
void Set_MAC_Address( const QString &ma ); |
| 752 |
|
748 |
|
| 753 |
bool Use_VLAN() const; |
|
|
| 754 |
void Use_VLAN( bool use ); |
| 755 |
int Get_VLAN() const; |
| 756 |
void Set_VLAN( int vl ); |
| 757 |
|
| 758 |
bool Use_Name() const; |
749 |
bool Use_Name() const; |
| 759 |
void Use_Name( bool use ); |
750 |
void Use_Name( bool use ); |
| 760 |
const QString &Get_Name() const; |
751 |
const QString &Get_Name() const; |
|
Lines 922-928
Link Here
|
| 922 |
VM::Network_Mode_Nativ Network_Mode; |
913 |
VM::Network_Mode_Nativ Network_Mode; |
| 923 |
QString Card_Model; |
914 |
QString Card_Model; |
| 924 |
QString MAC; |
915 |
QString MAC; |
| 925 |
int VLAN; |
|
|
| 926 |
QString Name; |
916 |
QString Name; |
| 927 |
QString Hostname; |
917 |
QString Hostname; |
| 928 |
QString PortDev; |
918 |
QString PortDev; |
|
Lines 957-963
Link Here
|
| 957 |
bool VHost; |
947 |
bool VHost; |
| 958 |
int VHostFd; |
948 |
int VHostFd; |
| 959 |
|
949 |
|
| 960 |
bool _Use_MAC, _Use_VLAN, _Use_Name, _Use_Hostname, _Use_File_Descriptor, |
950 |
bool _Use_MAC, _Use_Name, _Use_Hostname, _Use_File_Descriptor, |
| 961 |
_Use_Interface_Name, _Use_TUN_TAP_Script, _Use_TUN_TAP_Down_Script, |
951 |
_Use_Interface_Name, _Use_TUN_TAP_Script, _Use_TUN_TAP_Down_Script, |
| 962 |
_Use_Listen, _Use_Connect, _Use_MCast, _Use_Sock, _Use_Port, _Use_Group, |
952 |
_Use_Listen, _Use_Connect, _Use_MCast, _Use_Sock, _Use_Port, _Use_Group, |
| 963 |
_Use_Mode, _Use_File, _Use_Len, _Use_Addr, _Use_Vectors, _Use_Net, |
953 |
_Use_Mode, _Use_File, _Use_Len, _Use_Addr, _Use_Vectors, _Use_Net, |
