diff --git a/src/gui/iptAdvancedDialog.cpp b/src/gui/iptAdvancedDialog.cpp
index b8e399543..cdec4baa7 100644
--- a/src/gui/iptAdvancedDialog.cpp
+++ b/src/gui/iptAdvancedDialog.cpp
@@ -82,6 +82,9 @@ iptAdvancedDialog::iptAdvancedDialog(QWidget *parent,FWObject *o)
fwoptions->setStr("firewall_dir","");
}
+ //QString s = fwoptions->getStr("ipv4_6_order")
+ data.registerOption(m_dialog->ipv4before, fwoptions, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" );
+ data.registerOption(m_dialog->ipv6, fwoptions, "enable_ipv6" );
data.registerOption(m_dialog->logTCPseq, fwoptions, "log_tcp_seq" );
data.registerOption(m_dialog->logTCPopt, fwoptions, "log_tcp_opt" );
data.registerOption(m_dialog->logIPopt, fwoptions, "log_ip_opt" );
diff --git a/src/gui/iptadvanceddialog_q.ui b/src/gui/iptadvanceddialog_q.ui
index 7333f1c3d..a24776487 100644
--- a/src/gui/iptadvanceddialog_q.ui
+++ b/src/gui/iptadvanceddialog_q.ui
@@ -9,13 +9,11 @@
0
0
677
- 739
+ 719
-
- 5
- 5
+
0
0
@@ -27,18 +25,25 @@
false
-
- 9
-
6
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
-
-
- 7
- 7
+
0
0
@@ -51,18 +56,28 @@
Compiler
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
-
- 7
- 5
+
0
0
@@ -81,9 +96,7 @@
-
-
- 1
- 0
+
0
0
@@ -96,9 +109,7 @@
-
-
- 1
- 0
+
0
0
@@ -127,9 +138,7 @@
-
-
- 1
- 0
+
0
0
@@ -142,9 +151,7 @@
-
-
- 1
- 0
+
0
0
@@ -157,9 +164,7 @@
-
-
- 1
- 0
+
0
0
@@ -172,9 +177,7 @@
-
-
- 1
- 0
+
0
0
@@ -200,9 +203,7 @@
-
-
- 7
- 5
+
0
0
@@ -295,9 +296,7 @@ no known connection
-
-
- 1
- 0
+
0
0
@@ -310,9 +309,7 @@ no known connection
-
-
- 1
- 0
+
0
0
@@ -341,9 +338,7 @@ no known connection
-
-
- 7
- 0
+
0
0
@@ -444,10 +439,22 @@ with this address:
Installer
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -472,18 +479,28 @@ with this address:
External install script
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
-
- 0
- 0
+
0
0
@@ -493,9 +510,7 @@ with this address:
-
-
- 7
- 5
+
0
0
@@ -514,9 +529,7 @@ with this address:
-
-
- 7
- 5
+
0
0
@@ -535,9 +548,7 @@ with this address:
-
-
- 0
- 0
+
0
0
@@ -553,10 +564,22 @@ with this address:
Built-in installer
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -601,9 +624,7 @@ with this address:
-
-
- 0
- 0
+
0
0
@@ -613,9 +634,7 @@ with this address:
-
-
- 0
- 0
+
0
0
@@ -625,9 +644,7 @@ with this address:
-
-
- 0
- 0
+
0
0
@@ -637,9 +654,7 @@ with this address:
-
-
- 0
- 0
+
0
0
@@ -661,12 +676,21 @@ with this address:
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -680,9 +704,7 @@ with this address:
-
-
- 7
- 0
+
0
0
@@ -701,10 +723,22 @@ with this address:
Prolog/Epilog
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -713,10 +747,22 @@ with this address:
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -767,10 +813,22 @@ with this address:
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -809,9 +867,7 @@ with this address:
-
-
- 7
- 0
+
0
0
@@ -843,10 +899,22 @@ with this address:
Logging
-
+
20
-
+
+ 20
+
+
+ 20
+
+
+ 20
+
+
+ 6
+
+
6
-
@@ -855,10 +923,22 @@ with this address:
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -879,10 +959,22 @@ with this address:
-
+
0
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 10
+
+
10
-
@@ -930,10 +1022,22 @@ with this address:
-
+
0
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 10
+
+
10
-
@@ -982,12 +1086,12 @@ with this address:
-
-
- 32
-
1
+
+ 32
+
-
@@ -1016,9 +1120,7 @@ with this address:
-
-
- 0
- 1
+
0
0
@@ -1037,9 +1139,7 @@ with this address:
-
-
- 5
- 5
+
0
0
@@ -1079,9 +1179,7 @@ with this address:
-
-
- 5
- 0
+
0
0
@@ -1135,10 +1233,22 @@ with this address:
Script Options
-
+
6
-
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
+ 6
+
+
6
-
@@ -1249,16 +1359,86 @@ with this address:
+
+
+ IPv6
+
+
+ -
+
+
+ Enable IPv6 support
+
+
+
+ -
+
+
+ The order in which ipv4 and ipv6 rules should be generated:
+
+
+
+ -
+
+
-
+
+ IPv4 before IPv6
+
+
+ -
+
+ IPv6 before IPv4
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
diff --git a/src/gui/pfAdvancedDialog.cpp b/src/gui/pfAdvancedDialog.cpp
index e8aad285f..0c0ab1f6c 100644
--- a/src/gui/pfAdvancedDialog.cpp
+++ b/src/gui/pfAdvancedDialog.cpp
@@ -74,7 +74,8 @@ pfAdvancedDialog::pfAdvancedDialog(QWidget *parent,FWObject *o)
m_dialog->pf_fw_dir->setEnabled(false);
fwopt->setStr("firewall_dir","");
}
-
+ data.registerOption(m_dialog->ipv4before, fwopt, "ipv4_6_order", QStringList() << "IPv4 before IPv6" <<"ipv4_first" << "IPv6 before IPv4" << "ipv6_first" );
+ data.registerOption(m_dialog->ipv6, fwopt, "enable_ipv6" );
data.registerOption( m_dialog->pf_log_prefix ,fwopt, "log_prefix" );
data.registerOption( m_dialog->pf_fallback_log ,fwopt, "fallback_log" );
data.registerOption( m_dialog->pf_do_timeout_interval,fwopt,"pf_do_timeout_interval");
diff --git a/src/gui/pfadvanceddialog_q.ui b/src/gui/pfadvanceddialog_q.ui
index 43ea1854b..fa8e7d574 100644
--- a/src/gui/pfadvanceddialog_q.ui
+++ b/src/gui/pfadvanceddialog_q.ui
@@ -2373,6 +2373,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
+
+
+
+
+
+
@@ -2467,7 +2528,6 @@ with this address:
pf_configure_interfaces
pf_manage_virtual_addr
-