diff --git a/src/gui/iosaclAdvancedDialog.cpp b/src/gui/iosaclAdvancedDialog.cpp index 9927dc519..0cfdf0b8f 100644 --- a/src/gui/iosaclAdvancedDialog.cpp +++ b/src/gui/iosaclAdvancedDialog.cpp @@ -227,6 +227,11 @@ iosaclAdvancedDialog::iosaclAdvancedDialog(QWidget *parent,FWObject *o) Management *mgmt=(Firewall::cast(obj))->getManagementObject(); assert(mgmt!=NULL); + m_dialog->notebook304->setTabEnabled(5,false); //Disable tab + data.registerOption(m_dialog->ipv4before_2, fwoptions, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" ); + data.registerOption(m_dialog->ipv6_2, fwoptions, "enable_ipv6" ); + + /* Page "Compiler Options" */ data.registerOption( m_dialog->outputFileName , fwoptions, diff --git a/src/gui/iosacladvanceddialog_q.ui b/src/gui/iosacladvanceddialog_q.ui index e37dd9bd5..91c543763 100644 --- a/src/gui/iosacladvanceddialog_q.ui +++ b/src/gui/iosacladvanceddialog_q.ui @@ -9,7 +9,7 @@ 0 0 713 - 775 + 719 @@ -19,20 +19,41 @@ false - + 11 - + + 11 + + + 11 + + + 11 + + + 6 + + 6 - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -51,12 +72,21 @@ - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -95,10 +125,22 @@ Compiler Options - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -120,9 +162,7 @@ - - 7 - 5 + 0 0 @@ -151,9 +191,7 @@ - - 7 - 0 + 0 0 @@ -194,9 +232,7 @@ with this address: - - 7 - 5 + 0 0 @@ -205,10 +241,22 @@ with this address: Policy Compiler Options - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -241,18 +289,28 @@ with this address: Script Options - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 - - 7 - 7 + 0 0 @@ -261,10 +319,22 @@ with this address: Options - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -293,9 +363,7 @@ with this address: - - 5 - 7 + 0 0 @@ -304,10 +372,22 @@ with this address: Access lists (requires Firewall Builder for IOS ACL 2.1.12 and later) - + 6 - + + 6 + + + 6 + + + 6 + + + 20 + + 20 @@ -388,10 +468,22 @@ First, create temporary access list to permit connections from the management su QFrame::Sunken - + 11 - + + 11 + + + 11 + + + 11 + + + 6 + + 6 @@ -426,9 +518,7 @@ First, create temporary access list to permit connections from the management su - - 0 - 0 + 0 0 @@ -469,9 +559,7 @@ First, create temporary access list to permit connections from the management su - - 0 - 0 + 0 0 @@ -484,9 +572,7 @@ First, create temporary access list to permit connections from the management su - - 0 - 0 + 0 0 @@ -499,9 +585,7 @@ First, create temporary access list to permit connections from the management su - - 0 - 0 + 0 0 @@ -521,10 +605,22 @@ First, create temporary access list to permit connections from the management su Installer - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -549,18 +645,28 @@ First, create temporary access list to permit connections from the management su External install script - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 - - 0 - 0 + 0 0 @@ -570,9 +676,7 @@ First, create temporary access list to permit connections from the management su - - 7 - 5 + 0 0 @@ -591,9 +695,7 @@ First, create temporary access list to permit connections from the management su - - 7 - 5 + 0 0 @@ -612,9 +714,7 @@ First, create temporary access list to permit connections from the management su - - 0 - 0 + 0 0 @@ -630,10 +730,22 @@ First, create temporary access list to permit connections from the management su Built-in installer - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -665,9 +777,7 @@ First, create temporary access list to permit connections from the management su - - 0 - 0 + 0 0 @@ -677,9 +787,7 @@ First, create temporary access list to permit connections from the management su - - 0 - 0 + 0 0 @@ -688,12 +796,21 @@ First, create temporary access list to permit connections from the management su - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -707,9 +824,7 @@ First, create temporary access list to permit connections from the management su - - 7 - 0 + 0 0 @@ -728,10 +843,22 @@ First, create temporary access list to permit connections from the management su Prolog/Epilog - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -740,10 +867,22 @@ First, create temporary access list to permit connections from the management su - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -794,10 +933,22 @@ First, create temporary access list to permit connections from the management su - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -855,10 +1006,22 @@ First, create temporary access list to permit connections from the management su Logging - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -867,10 +1030,22 @@ First, create temporary access list to permit connections from the management su Syslog - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -976,10 +1151,22 @@ First, create temporary access list to permit connections from the management su Other logging destinations and levels: - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -1023,6 +1210,67 @@ First, create temporary access list to permit connections from the management su + + + IPv6 + + + + + + Enable IPv6 support + + + + + + + The order in which ipv4 and ipv6 rules should be generated: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + IPv4 before IPv6 + + + + + IPv6 before IPv4 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/src/gui/ipfAdvancedDialog.cpp b/src/gui/ipfAdvancedDialog.cpp index 1b1934526..2d22cd583 100644 --- a/src/gui/ipfAdvancedDialog.cpp +++ b/src/gui/ipfAdvancedDialog.cpp @@ -81,6 +81,9 @@ ipfAdvancedDialog::ipfAdvancedDialog(QWidget *parent,FWObject *o) fwopt->setStr("firewall_dir",""); } + m_dialog->tabWidget3->setTabEnabled(6,false); //Disable tab + data.registerOption(m_dialog->ipv4before_2, fwopt, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" ); + data.registerOption(m_dialog->ipv6_2, fwopt, "enable_ipv6" ); data.registerOption( m_dialog->ipf_log_or_block ,fwopt, "ipf_log_or_block" ); data.registerOption( m_dialog->ipf_log_body ,fwopt, "ipf_log_body" ); data.registerOption( m_dialog->ipf_check_shadowing ,fwopt, "check_shading" ); diff --git a/src/gui/ipfadvanceddialog_q.ui b/src/gui/ipfadvanceddialog_q.ui index b0db303a5..b029860ab 100644 --- a/src/gui/ipfadvanceddialog_q.ui +++ b/src/gui/ipfadvanceddialog_q.ui @@ -6,7 +6,7 @@ 0 0 708 - 734 + 719 @@ -16,20 +16,41 @@ false - + 11 - + + 11 + + + 11 + + + 11 + + + 6 + + 6 - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -87,10 +108,22 @@ Protocol Helpers - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -193,9 +226,7 @@ - - 5 - 0 + 0 0 @@ -218,10 +249,22 @@ Compiler - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -264,10 +307,19 @@ packet's destination - + 6 - + + 6 + + + 6 + + + 6 + + 6 @@ -400,9 +452,7 @@ with this address: - - 7 - 0 + 0 0 @@ -431,9 +481,7 @@ with this address: - - 7 - 0 + 0 0 @@ -491,9 +539,7 @@ with this address: - - 7 - 5 + 0 0 @@ -512,9 +558,7 @@ with this address: - - 7 - 5 + 0 0 @@ -567,10 +611,22 @@ with this address: Installer - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -611,18 +667,28 @@ with this address: External install script - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 - - 0 - 0 + 0 0 @@ -632,9 +698,7 @@ with this address: - - 7 - 5 + 0 0 @@ -653,9 +717,7 @@ with this address: - - 7 - 5 + 0 0 @@ -674,9 +736,7 @@ with this address: - - 0 - 0 + 0 0 @@ -692,10 +752,22 @@ with this address: Built-in installer - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -714,9 +786,7 @@ with this address: - - 0 - 0 + 0 0 @@ -725,12 +795,21 @@ with this address: - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -744,9 +823,7 @@ with this address: - - 7 - 0 + 0 0 @@ -771,9 +848,7 @@ with this address: - - 0 - 0 + 0 0 @@ -796,9 +871,7 @@ with this address: - - 0 - 0 + 0 0 @@ -808,9 +881,7 @@ with this address: - - 0 - 0 + 0 0 @@ -840,10 +911,22 @@ with this address: Prolog/Epilog - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -852,10 +935,22 @@ with this address: - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -913,10 +1008,22 @@ with this address: - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -975,10 +1082,22 @@ with this address: Logging - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -1108,10 +1227,22 @@ with this address: Script Options - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -1215,6 +1346,67 @@ with this address: + + + Page + + + + + + Enable IPv6 support + + + + + + + The order in which ipv4 and ipv6 rules should be generated: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + IPv4 before IPv6 + + + + + IPv6 before IPv4 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/src/gui/ipfwAdvancedDialog.cpp b/src/gui/ipfwAdvancedDialog.cpp index 2643fc6ba..92f593394 100644 --- a/src/gui/ipfwAdvancedDialog.cpp +++ b/src/gui/ipfwAdvancedDialog.cpp @@ -82,6 +82,10 @@ ipfwAdvancedDialog::ipfwAdvancedDialog(QWidget *parent,FWObject *o) if (fwopt->getStr("add_check_state_rule").empty()) fwopt->setBool("add_check_state_rule",true); + m_dialog->tabWidget3->setTabEnabled(4,false); //Disable tab + data.registerOption(m_dialog->ipv4before_2, fwopt, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" ); + data.registerOption(m_dialog->ipv6_2, fwopt, "enable_ipv6" ); + data.registerOption( m_dialog->ipfw_add_check_state_rule ,fwopt, "add_check_state_rule"); data.registerOption( m_dialog->ipfw_check_shadowing ,fwopt, "check_shading" ); data.registerOption( m_dialog->ipfw_ignore_empty_groups ,fwopt, "ignore_empty_groups" ); diff --git a/src/gui/ipfwadvanceddialog_q.ui b/src/gui/ipfwadvanceddialog_q.ui index 198ad016f..76a9e35b5 100644 --- a/src/gui/ipfwadvanceddialog_q.ui +++ b/src/gui/ipfwadvanceddialog_q.ui @@ -16,20 +16,41 @@ false - + 11 - + + 11 + + + 11 + + + 11 + + + 6 + + 6 - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -87,10 +108,22 @@ Compiler - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -128,9 +161,7 @@ - - 7 - 5 + 0 0 @@ -162,9 +193,7 @@ - - 7 - 5 + 0 0 @@ -229,9 +258,7 @@ - - 7 - 0 + 0 0 @@ -247,9 +274,7 @@ - - 7 - 0 + 0 0 @@ -265,9 +290,7 @@ - - 7 - 0 + 0 0 @@ -283,9 +306,7 @@ - - 1 - 0 + 0 0 @@ -312,10 +333,22 @@ with this address: Installer - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -340,18 +373,28 @@ with this address: External install script - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 - - 0 - 0 + 0 0 @@ -361,9 +404,7 @@ with this address: - - 7 - 5 + 0 0 @@ -382,9 +423,7 @@ with this address: - - 7 - 5 + 0 0 @@ -403,9 +442,7 @@ with this address: - - 0 - 0 + 0 0 @@ -421,10 +458,22 @@ with this address: Built-in installer - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -469,9 +518,7 @@ with this address: - - 0 - 0 + 0 0 @@ -481,9 +528,7 @@ with this address: - - 0 - 0 + 0 0 @@ -493,9 +538,7 @@ with this address: - - 0 - 0 + 0 0 @@ -505,9 +548,7 @@ with this address: - - 0 - 0 + 0 0 @@ -529,12 +570,21 @@ with this address: - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -548,9 +598,7 @@ with this address: - - 7 - 0 + 0 0 @@ -569,10 +617,22 @@ with this address: Prolog/Epilog - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -581,10 +641,22 @@ with this address: - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -635,10 +707,22 @@ with this address: - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -690,10 +774,22 @@ with this address: Script Options - + 6 - + + 6 + + + 6 + + + 6 + + + 6 + + 6 @@ -780,6 +876,67 @@ with this address: + + + IPv6 + + + + + + Enable IPv6 support + + + + + + + The order in which ipv4 and ipv6 rules should be generated: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + IPv4 before IPv6 + + + + + IPv6 before IPv4 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/src/gui/pixAdvancedDialog.cpp b/src/gui/pixAdvancedDialog.cpp index 7fd648b84..199dbe3a4 100644 --- a/src/gui/pixAdvancedDialog.cpp +++ b/src/gui/pixAdvancedDialog.cpp @@ -243,6 +243,12 @@ pixAdvancedDialog::pixAdvancedDialog(QWidget*, FWObject *o)//(parent) else m_dialog->pix_generate_out_acl->hide(); + m_dialog->notebook304->setTabEnabled(8,false); //Disable tab + data.registerOption(m_dialog->ipv4before_2, fwoptions, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" ); + data.registerOption(m_dialog->ipv6_2, fwoptions, "enable_ipv6" ); + + + data.registerOption( m_dialog->outputFileName , fwoptions, "output_file" ); diff --git a/src/gui/pixadvanceddialog_q.ui b/src/gui/pixadvanceddialog_q.ui index ecba92d92..0444319a1 100644 --- a/src/gui/pixadvanceddialog_q.ui +++ b/src/gui/pixadvanceddialog_q.ui @@ -9,7 +9,7 @@ 0 0 1106 - 775 + 719 @@ -4503,6 +4503,67 @@ the packet should go to, and which is the next hop + + + Page + + + + + + Enable IPv6 support + + + + + + + The order in which ipv4 and ipv6 rules should be generated: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + IPv4 before IPv6 + + + + + IPv6 before IPv4 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + @@ -4654,7 +4715,6 @@ the packet should go to, and which is the next hop sshArgs displayCommandsButton -