onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-11 15:41:41 +02:00
Code Issues Releases Wiki Activity

bugfix 2598

Browse Source
This commit is contained in:
2008-05-25 15:21:04 +00:00
parent 2317f5d169
commit 025741ba41
8 changed files with 909 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/iosaclAdvancedDialog.cpp
+5
View File
@@ -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,
src/gui/iosacladvanceddialog_q.ui
+338 -90
View File
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>713</width>
<height>775</height>
<height>719</height>
</rect>
</property>
<property name="windowTitle" >
@@ -19,20 +19,41 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>11</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>11</number>
</property>
<property name="rightMargin" >
<number>11</number>
</property>
<property name="bottomMargin" >
<number>11</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
@@ -51,12 +72,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="ok_button" >
<property name="text" >
@@ -95,10 +125,22 @@
<string>Compiler Options</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="3" column="1" >
@@ -120,9 +162,7 @@
<item row="0" column="0" colspan="3" >
<widget class="QLabel" name="textLabel1_5" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -151,9 +191,7 @@
<item row="2" column="2" colspan="2" >
<widget class="QLineEdit" name="mgmt_addr" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -194,9 +232,7 @@ with this address:</string>
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="frame114" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -205,10 +241,22 @@ with this address:</string>
<string>Policy Compiler Options</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="5" column="0" >
@@ -241,18 +289,28 @@ with this address:</string>
<string>Script Options</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<widget class="QGroupBox" name="frame170" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -261,10 +319,22 @@ with this address:</string>
<string>Options</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
@@ -293,9 +363,7 @@ with this address:</string>
<item row="0" column="0" >
<widget class="QGroupBox" name="buttonGroup10" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>7</vsizetype>
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -304,10 +372,22 @@ with this address:</string>
<string>Access lists (requires Firewall Builder for IOS ACL 2.1.12 and later)</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>20</number>
</property>
<property name="verticalSpacing" >
<number>20</number>
</property>
<item row="0" column="1" >
@@ -388,10 +468,22 @@ First, create temporary access list to permit connections from the management su
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>11</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>11</number>
</property>
<property name="rightMargin" >
<number>11</number>
</property>
<property name="bottomMargin" >
<number>11</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" colspan="3" >
@@ -426,9 +518,7 @@ First, create temporary access list to permit connections from the management su
<item row="1" column="1" >
<widget class="QLineEdit" name="iosacl_acl_temp_addr" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -469,9 +559,7 @@ First, create temporary access list to permit connections from the management su
<item row="0" column="0" >
<widget class="QRadioButton" name="iosacl_acl_basic" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -484,9 +572,7 @@ First, create temporary access list to permit connections from the management su
<item row="1" column="0" >
<widget class="QRadioButton" name="iosacl_acl_no_clear" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -499,9 +585,7 @@ First, create temporary access list to permit connections from the management su
<item row="2" column="0" >
<widget class="QRadioButton" name="iosacl_acl_substitution" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -521,10 +605,22 @@ First, create temporary access list to permit connections from the management su
<string>Installer</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="0" >
@@ -549,18 +645,28 @@ First, create temporary access list to permit connections from the management su
<string>External install script</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QLineEdit" name="installScript" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -570,9 +676,7 @@ First, create temporary access list to permit connections from the management su
<item row="0" column="0" >
<widget class="QLabel" name="textLabel5_2" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -591,9 +695,7 @@ First, create temporary access list to permit connections from the management su
<item row="1" column="0" >
<widget class="QLabel" name="textLabel6_2" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -612,9 +714,7 @@ First, create temporary access list to permit connections from the management su
<item row="1" column="1" >
<widget class="QLineEdit" name="installScriptArgs" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -630,10 +730,22 @@ First, create temporary access list to permit connections from the management su
<string>Built-in installer</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="0" >
@@ -665,9 +777,7 @@ First, create temporary access list to permit connections from the management su
<item row="0" column="1" >
<widget class="QLineEdit" name="user" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -677,9 +787,7 @@ First, create temporary access list to permit connections from the management su
<item row="1" column="1" >
<widget class="QLineEdit" name="altAddress" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -688,12 +796,21 @@ First, create temporary access list to permit connections from the management su
</item>
<item row="2" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_7" >
<property name="text" >
@@ -707,9 +824,7 @@ First, create temporary access list to permit connections from the management su
<item>
<widget class="QLineEdit" name="sshArgs" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -728,10 +843,22 @@ First, create temporary access list to permit connections from the management su
<string>Prolog/Epilog</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
@@ -740,10 +867,22 @@ First, create temporary access list to permit connections from the management su
<string/>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="0" >
@@ -794,10 +933,22 @@ First, create temporary access list to permit connections from the management su
<string/>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="1" >
@@ -855,10 +1006,22 @@ First, create temporary access list to permit connections from the management su
<string>Logging</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
@@ -867,10 +1030,22 @@ First, create temporary access list to permit connections from the management su
<string>Syslog</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="1" colspan="2" >
@@ -976,10 +1151,22 @@ First, create temporary access list to permit connections from the management su
<string>Other logging destinations and levels:</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
@@ -1023,6 +1210,67 @@ First, create temporary access list to permit connections from the management su
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2" >
<attribute name="title" >
<string>IPv6</string>
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QCheckBox" name="ipv6_2" >
<property name="text" >
<string>Enable IPv6 support</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>The order in which ipv4 and ipv6 rules should be generated:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QComboBox" name="ipv4before_2" >
<item>
<property name="text" >
<string>IPv4 before IPv6</string>
</property>
</item>
<item>
<property name="text" >
<string>IPv6 before IPv4</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
src/gui/ipfAdvancedDialog.cpp
+3
View File
@@ -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" );
src/gui/ipfadvanceddialog_q.ui
+265 -73
View File
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>708</width>
<height>734</height>
<height>719</height>
</rect>
</property>
<property name="windowTitle" >
@@ -16,20 +16,41 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>11</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>11</number>
</property>
<property name="rightMargin" >
<number>11</number>
</property>
<property name="bottomMargin" >
<number>11</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
@@ -87,10 +108,22 @@
<string>Protocol Helpers</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="1" >
@@ -193,9 +226,7 @@
<item row="1" column="0" colspan="2" >
<widget class="QLabel" name="label572" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -218,10 +249,22 @@
<string>Compiler</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" colspan="2" >
@@ -264,10 +307,19 @@ packet's destination</string>
<string/>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<property name="spacing" >
<number>6</number>
</property>
<property name="spacing" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<item>
@@ -400,9 +452,7 @@ with this address:</string>
<item row="11" column="2" colspan="2" >
<widget class="QComboBox" name="actionOnReject" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -431,9 +481,7 @@ with this address:</string>
<item row="14" column="3" >
<widget class="QLineEdit" name="mgmt_addr" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -491,9 +539,7 @@ with this address:</string>
<item row="1" column="0" colspan="2" >
<widget class="QLabel" name="compilerArgsLabel" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -512,9 +558,7 @@ with this address:</string>
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="textLabel1_5" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -567,10 +611,22 @@ with this address:</string>
<string>Installer</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="0" >
@@ -611,18 +667,28 @@ with this address:</string>
<string>External install script</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QLineEdit" name="installScript" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -632,9 +698,7 @@ with this address:</string>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel5_2" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -653,9 +717,7 @@ with this address:</string>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel6_2" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -674,9 +736,7 @@ with this address:</string>
<item row="1" column="1" >
<widget class="QLineEdit" name="installScriptArgs" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -692,10 +752,22 @@ with this address:</string>
<string>Built-in installer</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
@@ -714,9 +786,7 @@ with this address:</string>
<item row="0" column="1" >
<widget class="QLineEdit" name="ipf_fw_dir" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -725,12 +795,21 @@ with this address:</string>
</item>
<item row="4" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_7" >
<property name="text" >
@@ -744,9 +823,7 @@ with this address:</string>
<item>
<widget class="QLineEdit" name="sshArgs" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -771,9 +848,7 @@ with this address:</string>
<item row="3" column="1" >
<widget class="QLineEdit" name="activationCmd" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -796,9 +871,7 @@ with this address:</string>
<item row="2" column="1" >
<widget class="QLineEdit" name="altAddress" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -808,9 +881,7 @@ with this address:</string>
<item row="1" column="1" >
<widget class="QLineEdit" name="ipf_user" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -840,10 +911,22 @@ with this address:</string>
<string>Prolog/Epilog</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
@@ -852,10 +935,22 @@ with this address:</string>
<string/>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="0" >
@@ -913,10 +1008,22 @@ with this address:</string>
<string/>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="1" >
@@ -975,10 +1082,22 @@ with this address:</string>
<string>Logging</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="2" >
@@ -1108,10 +1227,22 @@ with this address:</string>
<string>Script Options</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item rowspan="3" row="2" column="0" >
@@ -1215,6 +1346,67 @@ with this address:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab" >
<attribute name="title" >
<string>Page</string>
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QCheckBox" name="ipv6_2" >
<property name="text" >
<string>Enable IPv6 support</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>The order in which ipv4 and ipv6 rules should be generated:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QComboBox" name="ipv4before_2" >
<item>
<property name="text" >
<string>IPv4 before IPv6</string>
</property>
</item>
<item>
<property name="text" >
<string>IPv6 before IPv4</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
src/gui/ipfwAdvancedDialog.cpp
+4
View File
@@ -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" );
src/gui/ipfwadvanceddialog_q.ui
+226 -69
View File
@@ -16,20 +16,41 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>11</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>11</number>
</property>
<property name="rightMargin" >
<number>11</number>
</property>
<property name="bottomMargin" >
<number>11</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
@@ -87,10 +108,22 @@
<string>Compiler</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item rowspan="2" row="4" column="0" >
@@ -128,9 +161,7 @@
<item row="1" column="0" colspan="2" >
<widget class="QLabel" name="compilerArgsLabel" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -162,9 +193,7 @@
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="textLabel1_5" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -229,9 +258,7 @@
<item row="7" column="2" >
<widget class="QLineEdit" name="mgmt_addr" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -247,9 +274,7 @@
<item row="6" column="1" colspan="2" >
<widget class="QCheckBox" name="ipfw_ignore_empty_groups" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -265,9 +290,7 @@
<item row="5" column="1" colspan="2" >
<widget class="QCheckBox" name="ipfw_check_shadowing" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -283,9 +306,7 @@
<item row="4" column="1" colspan="2" >
<widget class="QCheckBox" name="ipfw_add_check_state_rule" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -312,10 +333,22 @@ with this address:</string>
<string>Installer</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="0" >
@@ -340,18 +373,28 @@ with this address:</string>
<string>External install script</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QLineEdit" name="installScript" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -361,9 +404,7 @@ with this address:</string>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel5_2" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -382,9 +423,7 @@ with this address:</string>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel6_2_2" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -403,9 +442,7 @@ with this address:</string>
<item row="1" column="1" >
<widget class="QLineEdit" name="installScriptArgs" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -421,10 +458,22 @@ with this address:</string>
<string>Built-in installer</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="0" >
@@ -469,9 +518,7 @@ with this address:</string>
<item row="0" column="1" >
<widget class="QLineEdit" name="ipfw_fw_dir" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -481,9 +528,7 @@ with this address:</string>
<item row="1" column="1" >
<widget class="QLineEdit" name="ipfw_user" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -493,9 +538,7 @@ with this address:</string>
<item row="2" column="1" >
<widget class="QLineEdit" name="altAddress" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -505,9 +548,7 @@ with this address:</string>
<item row="3" column="1" >
<widget class="QLineEdit" name="activationCmd" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -529,12 +570,21 @@ with this address:</string>
</item>
<item row="4" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="textLabel1_7" >
<property name="text" >
@@ -548,9 +598,7 @@ with this address:</string>
<item>
<widget class="QLineEdit" name="sshArgs" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -569,10 +617,22 @@ with this address:</string>
<string>Prolog/Epilog</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="0" >
@@ -581,10 +641,22 @@ with this address:</string>
<string/>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="1" >
@@ -635,10 +707,22 @@ with this address:</string>
<string/>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="0" >
@@ -690,10 +774,22 @@ with this address:</string>
<string>Script Options</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item rowspan="3" row="2" column="0" >
@@ -780,6 +876,67 @@ with this address:</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2" >
<attribute name="title" >
<string>IPv6</string>
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QCheckBox" name="ipv6_2" >
<property name="text" >
<string>Enable IPv6 support</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>The order in which ipv4 and ipv6 rules should be generated:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QComboBox" name="ipv4before_2" >
<item>
<property name="text" >
<string>IPv4 before IPv6</string>
</property>
</item>
<item>
<property name="text" >
<string>IPv6 before IPv4</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
src/gui/pixAdvancedDialog.cpp
+6
View File
@@ -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" );
src/gui/pixadvanceddialog_q.ui
+62 -2
View File
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>1106</width>
<height>775</height>
<height>719</height>
</rect>
</property>
<property name="windowTitle" >
@@ -4503,6 +4503,67 @@ the packet should go to, and which is the next hop
</item>
</layout>
</widget>
<widget class="QWidget" name="tab" >
<attribute name="title" >
<string>Page</string>
</attribute>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QCheckBox" name="ipv6_2" >
<property name="text" >
<string>Enable IPv6 support</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>The order in which ipv4 and ipv6 rules should be generated:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QComboBox" name="ipv4before_2" >
<item>
<property name="text" >
<string>IPv4 before IPv6</string>
</property>
</item>
<item>
<property name="text" >
<string>IPv6 before IPv4</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
@@ -4654,7 +4715,6 @@ the packet should go to, and which is the next hop
<tabstop>sshArgs</tabstop>
<tabstop>displayCommandsButton</tabstop>
</tabstops>
<includes/>
<resources/>
<connections>
<connection>