From 242f0724c8b13750ec0b9bfd20c57c7a412b8cf6 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sun, 6 Feb 2011 14:55:56 -0800 Subject: [PATCH] output ifconfig or update_addresses_of_interface lines in a stable order, sorted by interface name --- src/pflib/OSConfigurator_bsd.h | 2 + src/pflib/OSConfigurator_bsd_interfaces.cpp | 33 +- src/pflib/OSConfigurator_freebsd.cpp | 32 +- test/pf/firewall-base-rulesets.fw.orig | 4 +- test/pf/firewall-ipv6-1.fw.orig | 4 +- test/pf/firewall-ipv6-2.fw.orig | 4 +- test/pf/firewall-ipv6-3.fw.orig | 22 +- test/pf/firewall.fw.orig | 4 +- test/pf/firewall1.fw.orig | 4 +- test/pf/firewall10-1.fw.orig | 4 +- test/pf/firewall10-2.fw.orig | 4 +- test/pf/firewall10-3.fw.orig | 4 +- test/pf/firewall10-4.fw.orig | 4 +- test/pf/firewall10-5.fw.orig | 4 +- test/pf/firewall10-6.fw.orig | 4 +- test/pf/firewall100.fw.orig | 4 +- test/pf/firewall101.fw.orig | 4 +- test/pf/firewall102.fw.orig | 20 +- test/pf/firewall11.fw.orig | 4 +- test/pf/firewall12.fw.orig | 4 +- test/pf/firewall13.fw.orig | 4 +- test/pf/firewall14-1.fw.orig | 8 +- test/pf/firewall14.fw.orig | 8 +- test/pf/firewall2-1.fw.orig | 4 +- test/pf/firewall2.fw.orig | 4 +- test/pf/firewall20.fw.orig | 4 +- test/pf/firewall21.fw.orig | 4 +- test/pf/firewall22.fw.orig | 4 +- test/pf/firewall3.fw.orig | 6 +- test/pf/firewall33.fw.orig | 6 +- test/pf/firewall34.fw.orig | 6 +- test/pf/firewall38.fw.orig | 4 +- test/pf/firewall39.fw.orig | 4 +- test/pf/firewall4.fw.orig | 4 +- test/pf/firewall40-1.fw.orig | 8 +- test/pf/firewall40.fw.orig | 8 +- test/pf/firewall41.fw.orig | 6 +- test/pf/firewall5.fw.orig | 4 +- test/pf/firewall51.fw.orig | 4 +- test/pf/firewall6.fw.orig | 4 +- test/pf/firewall62.fw.orig | 4 +- test/pf/firewall63.fw.orig | 4 +- test/pf/firewall7.fw.orig | 4 +- test/pf/firewall70.fw.orig | 4 +- test/pf/firewall8.fw.orig | 4 +- test/pf/firewall80-4.5.fw.orig | 4 +- test/pf/firewall80.fw.orig | 4 +- test/pf/firewall9.fw.orig | 4 +- test/pf/firewall91.fw.orig | 6 +- test/pf/firewall92.fw.orig | 4 +- test/pf/objects-for-regression-tests.fwb | 714 +++++++++++++++++++- test/pf/pf_cluster_1_openbsd-1.fw.orig | 12 +- test/pf/pf_cluster_1_openbsd-2.fw.orig | 8 +- test/pf/pf_cluster_2_freebsd-1.fw.orig | 12 +- test/pf/pf_cluster_2_freebsd-2.fw.orig | 8 +- test/pf/pf_cluster_3_openbsd-3.fw.orig | 16 +- test/pf/pf_cluster_3_openbsd-4.fw.orig | 12 +- test/pf/pf_cluster_4_rc.conf.local | 10 +- 58 files changed, 914 insertions(+), 193 deletions(-) diff --git a/src/pflib/OSConfigurator_bsd.h b/src/pflib/OSConfigurator_bsd.h index 111f76120..4dc2fa394 100644 --- a/src/pflib/OSConfigurator_bsd.h +++ b/src/pflib/OSConfigurator_bsd.h @@ -32,6 +32,7 @@ #include +#include #include @@ -51,6 +52,7 @@ namespace fwcompiler { protected: + QMap update_address_lines; QStringList cloned_interfaces; QStringList interface_configuration_lines; diff --git a/src/pflib/OSConfigurator_bsd_interfaces.cpp b/src/pflib/OSConfigurator_bsd_interfaces.cpp index 60ab28b4f..9ca19e5f5 100644 --- a/src/pflib/OSConfigurator_bsd_interfaces.cpp +++ b/src/pflib/OSConfigurator_bsd_interfaces.cpp @@ -39,6 +39,7 @@ #include #include +#include #include #include @@ -293,9 +294,10 @@ string OSConfigurator_bsd::configureInterfaces() QMap > >::iterator it; for (it=all_addresses.begin(); it!=all_addresses.end(); ++it) { - Interface *iface = it.key(); - list > all_addresses = it.value(); - updateAddressesOfInterface(iface, all_addresses); + // qDebug() << "updateAddressesOfInterface:" + // << it.key() + // << it.value().size(); + updateAddressesOfInterface(it.key(), it.value()); } } @@ -338,11 +340,6 @@ string OSConfigurator_bsd::configureInterfaces() return printAllInterfaceConfigurationLines().toStdString(); } -QString OSConfigurator_bsd::printAllInterfaceConfigurationLines() -{ - return interface_configuration_lines.join("\n"); -} - void OSConfigurator_bsd::listAllInterfacesConfigLine(QStringList , bool ) { } @@ -390,8 +387,12 @@ void OSConfigurator_bsd::updateAddressesOfInterface( } } - interface_configuration_lines - << QString("update_addresses_of_interface \"%1\" \"\"").arg(arg1.join(" ")); + QString cmd = QString("update_addresses_of_interface \"%1\" \"\"") + .arg(arg1.join(" ")); + + //qDebug() << cmd; + + update_address_lines[iface->getName().c_str()] = cmd; } @@ -533,4 +534,16 @@ void OSConfigurator_bsd::updatePfsyncInterface( } +QString OSConfigurator_bsd::printAllInterfaceConfigurationLines() +{ + QStringList keys = update_address_lines.keys(); + keys.sort(); + foreach (QString iface_name, keys) + { + interface_configuration_lines << update_address_lines[iface_name]; + } + + return interface_configuration_lines.join("\n"); +} + diff --git a/src/pflib/OSConfigurator_freebsd.cpp b/src/pflib/OSConfigurator_freebsd.cpp index 174a1759c..1d209492d 100644 --- a/src/pflib/OSConfigurator_freebsd.cpp +++ b/src/pflib/OSConfigurator_freebsd.cpp @@ -439,28 +439,34 @@ void OSConfigurator_freebsd::updatePfsyncInterface( QString OSConfigurator_freebsd::printAllInterfaceConfigurationLines() { - printIfconfigLines(ifconfig_lines); - printIfconfigLines(ipv6_ifconfig_lines); + FWOptions* options = fw->getOptionsObject(); + if (options->getBool("generate_rc_conf_file")) + { + printIfconfigLines(ifconfig_lines); + printIfconfigLines(ipv6_ifconfig_lines); - if (!cloned_interfaces.isEmpty()) - interface_configuration_lines.push_front( - QString("cloned_interfaces=\"%1\"").arg(cloned_interfaces.join(" "))); - - return interface_configuration_lines.join("\n"); + if (!cloned_interfaces.isEmpty()) + interface_configuration_lines.push_front( + QString("cloned_interfaces=\"%1\"") + .arg(cloned_interfaces.join(" "))); + + return interface_configuration_lines.join("\n"); + } else + return OSConfigurator_bsd::printAllInterfaceConfigurationLines(); } void OSConfigurator_freebsd::printIfconfigLines(const QMap &lines) { if (!lines.isEmpty()) { - QMap::const_iterator it; - for (it=lines.begin(); it!=lines.end(); ++it) + QStringList keys = lines.keys(); + keys.sort(); + foreach (QString iface_name, keys) { - const QString iface_name = it.key(); - const QStringList commands = it.value(); - interface_configuration_lines.push_front( + const QStringList commands = lines[iface_name]; + interface_configuration_lines << QString("ifconfig_%1=\"%2\"").arg(iface_name) - .arg(commands.join(" "))); + .arg(commands.join(" ")); } } } diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index cc1ef8cb7..5357f8479 100755 --- a/test/pf/firewall-base-rulesets.fw.orig +++ b/test/pf/firewall-base-rulesets.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:49 2011 PST by vadim +# Generated Sun Feb 6 14:52:12 2011 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # files: firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "en2 192.168.100.1/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:49 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:12 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-1.fw.orig b/test/pf/firewall-ipv6-1.fw.orig index fa679d406..84abe117c 100755 --- a/test/pf/firewall-ipv6-1.fw.orig +++ b/test/pf/firewall-ipv6-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:49 2011 PST by vadim +# Generated Sun Feb 6 14:52:12 2011 PST by vadim # # files: * firewall-ipv6-1.fw pf-ipv6.fw # files: firewall-ipv6-1-Policy_ipv4.conf /etc/fw/pf-ipv6.conf @@ -175,7 +175,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 6 12:35:49 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:12 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-2.fw.orig b/test/pf/firewall-ipv6-2.fw.orig index 7fdce4d16..927ed8b98 100755 --- a/test/pf/firewall-ipv6-2.fw.orig +++ b/test/pf/firewall-ipv6-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:50 2011 PST by vadim +# Generated Sun Feb 6 14:52:14 2011 PST by vadim # # files: * firewall-ipv6-2.fw pf.fw # files: firewall-ipv6-2.conf pf.conf @@ -179,7 +179,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 6 12:35:50 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:14 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-3.fw.orig b/test/pf/firewall-ipv6-3.fw.orig index 5765d529f..5febc870d 100755 --- a/test/pf/firewall-ipv6-3.fw.orig +++ b/test/pf/firewall-ipv6-3.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:50 2011 PST by vadim +# Generated Sun Feb 6 14:52:14 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # files: firewall-ipv6-3-Policy_ipv4.conf /etc/firewall-ipv6-3-Policy_ipv4.conf @@ -24,17 +24,17 @@ create_args_vlan100="vlan 100" create_args_vlan101="vlan 101" ipv6_network_interfaces="ed0 lo0 vlan100 vlan101" network_interfaces="ed0 lo0 vlan100 vlan101" -ifconfig_vlan100="inet 172.16.1.1 netmask 0xfffffff0" -ifconfig_vlan101="inet 172.16.2.1 netmask 0xfffffff0" -ipv6_ifconfig_ed0="fe80::21d:9ff:fe8b:8e94/64" -ipv6_ifconfig_ed0_alias0="2001:db8::1/64" -ipv6_ifconfig_ed0_alias1="2001:db8::2/64" -ifconfig_ed0="inet 1.1.1.1 netmask 0xffffff00" -ifconfig_ed0_alias0="inet 10.10.10.1 netmask 0xffffff00" -ifconfig_ed0_alias1="inet 10.10.10.2 netmask 0xffffff00" -ipv6_ifconfig_lo0="::1/128" -ifconfig_lo0="inet 127.0.0.1 netmask 0xff000000" pfsync_enable="YES" +ifconfig_ed0="1.1.1.1 netmask 0xffffff00" +ifconfig_ed0_alias0="10.10.10.1 netmask 0xffffff00" +ifconfig_ed0_alias1="10.10.10.2 netmask 0xffffff00" +ifconfig_lo0="127.0.0.1 netmask 0xff000000" +ifconfig_vlan100="172.16.1.1 netmask 0xfffffff0" +ifconfig_vlan101="172.16.2.1 netmask 0xfffffff0" +ifconfig_ed0="fe80::21d:9ff:fe8b:8e94/64" +ifconfig_ed0_alias0="2001:db8::1/64" +ifconfig_ed0_alias1="2001:db8::2/64" +ifconfig_lo0="::1/128" pf_enable="YES" pf_rules="/etc/firewall-ipv6-3-Policy_ipv4.conf" diff --git a/test/pf/firewall.fw.orig b/test/pf/firewall.fw.orig index 6e1c39036..fc97149b5 100755 --- a/test/pf/firewall.fw.orig +++ b/test/pf/firewall.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:24 2011 PST by vadim +# Generated Sun Feb 6 14:51:44 2011 PST by vadim # # files: * firewall.fw /etc/pf.fw # files: firewall.conf /etc/pf.conf @@ -167,7 +167,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 6 12:35:24 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index 075e48f34..73556da8c 100755 --- a/test/pf/firewall1.fw.orig +++ b/test/pf/firewall1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:25 2011 PST by vadim +# Generated Sun Feb 6 14:51:45 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # files: firewall1.conf /etc/fw/firewall1.conf @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:25 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:45 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-1.fw.orig b/test/pf/firewall10-1.fw.orig index bdd69b4e8..d9f543b98 100755 --- a/test/pf/firewall10-1.fw.orig +++ b/test/pf/firewall10-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:26 2011 PST by vadim +# Generated Sun Feb 6 14:51:46 2011 PST by vadim # # files: * firewall10-1.fw /etc/fw/firewall10-1.fw # files: firewall10-1.conf /etc/fw/firewall10-1.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:26 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-2.fw.orig b/test/pf/firewall10-2.fw.orig index c847fb2ab..2baec7fa3 100755 --- a/test/pf/firewall10-2.fw.orig +++ b/test/pf/firewall10-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:27 2011 PST by vadim +# Generated Sun Feb 6 14:51:47 2011 PST by vadim # # files: * firewall10-2.fw /etc/fw/firewall10-2.fw # files: firewall10-2.conf /etc/fw/firewall10-2.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:27 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-3.fw.orig b/test/pf/firewall10-3.fw.orig index be35bebf6..332910bb2 100755 --- a/test/pf/firewall10-3.fw.orig +++ b/test/pf/firewall10-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:28 2011 PST by vadim +# Generated Sun Feb 6 14:51:49 2011 PST by vadim # # files: * firewall10-3.fw /etc/fw/firewall10-3.fw # files: firewall10-3.conf /etc/fw/firewall10-3.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:28 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-4.fw.orig b/test/pf/firewall10-4.fw.orig index 41585c187..4c9aafad4 100755 --- a/test/pf/firewall10-4.fw.orig +++ b/test/pf/firewall10-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:28 2011 PST by vadim +# Generated Sun Feb 6 14:51:50 2011 PST by vadim # # files: * firewall10-4.fw /etc/fw/firewall10-4.fw # files: firewall10-4.conf /etc/fw/firewall10-4.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:28 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-5.fw.orig b/test/pf/firewall10-5.fw.orig index aed84b959..ce8fc432f 100755 --- a/test/pf/firewall10-5.fw.orig +++ b/test/pf/firewall10-5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:29 2011 PST by vadim +# Generated Sun Feb 6 14:51:51 2011 PST by vadim # # files: * firewall10-5.fw /etc/fw/firewall10-5.fw # files: firewall10-5.conf /etc/fw/firewall10-5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-6.fw.orig b/test/pf/firewall10-6.fw.orig index 7fc6c1a00..036c6908d 100755 --- a/test/pf/firewall10-6.fw.orig +++ b/test/pf/firewall10-6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:29 2011 PST by vadim +# Generated Sun Feb 6 14:51:52 2011 PST by vadim # # files: * firewall10-6.fw /etc/fw/firewall10-6.fw # files: firewall10-6.conf /etc/fw/firewall10-6.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig index 67e90251a..d3d68d0b4 100755 --- a/test/pf/firewall100.fw.orig +++ b/test/pf/firewall100.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:25 2011 PST by vadim +# Generated Sun Feb 6 14:51:45 2011 PST by vadim # # files: * firewall100.fw /etc/fw/pf.fw # files: firewall100.conf /etc/fw/path\ with\ space/pf.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:25 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:45 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig index 264ed9381..9fca6caec 100755 --- a/test/pf/firewall101.fw.orig +++ b/test/pf/firewall101.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:26 2011 PST by vadim +# Generated Sun Feb 6 14:51:46 2011 PST by vadim # # files: * firewall101.fw /etc/fw/pf.fw # files: firewall101.conf /etc/fw/path\ with\ space/pf.conf @@ -162,7 +162,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:26 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig index e38cd15e1..70d1d7bc6 100755 --- a/test/pf/firewall102.fw.orig +++ b/test/pf/firewall102.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:27 2011 PST by vadim +# Generated Sun Feb 6 14:51:47 2011 PST by vadim # # files: * firewall102.fw /etc/fw/pf.fw # files: firewall102.conf /etc/fw/path\ with\ space/pf.conf @@ -21,17 +21,17 @@ gateway_enable="YES" ipv6_network_interfaces="em0 em1" network_interfaces="em0 em1" -ifconfig_em0="inet 10.3.14.81 netmask 0xffffff00" -ifconfig_em1="inet 10.1.1.81 netmask 0xffffff00" +ifconfig_em0="10.3.14.81 netmask 0xffffff00" +ifconfig_em1="10.1.1.81 netmask 0xffffff00" pf_enable="YES" pf_rules="/etc/fw/path\ with\ space/pf.conf" -static_routes="id157578X29229 id157600X29229 id157622X29229 id157644X29229 id157669X29229 id157688X29229" -route_id157578X29229="default 10.1.1.1 " -route_id157600X29229="default " -route_id157622X29229="192.168.171.2 10.1.1.1 " -route_id157644X29229="22.22.22.0/24 10.1.1.1 " -route_id157669X29229="22.22.22.0/24 10.1.1.1 " -route_id157688X29229="33.33.33.0/24 10.1.1.1 " +static_routes="id160538X13459 id160560X13459 id160582X13459 id160604X13459 id160629X13459 id160648X13459" +route_id160538X13459="default 10.1.1.1 " +route_id160560X13459="default " +route_id160582X13459="192.168.171.2 10.1.1.1 " +route_id160604X13459="22.22.22.0/24 10.1.1.1 " +route_id160629X13459="22.22.22.0/24 10.1.1.1 " +route_id160648X13459="33.33.33.0/24 10.1.1.1 " diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig index 43ed2a8db..c6d3ba018 100755 --- a/test/pf/firewall11.fw.orig +++ b/test/pf/firewall11.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:30 2011 PST by vadim +# Generated Sun Feb 6 14:51:53 2011 PST by vadim # # files: * firewall11.fw /etc/firewall11.fw # files: firewall11.conf /etc/firewall11.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:30 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index 8e73121f8..c553340e9 100755 --- a/test/pf/firewall12.fw.orig +++ b/test/pf/firewall12.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:31 2011 PST by vadim +# Generated Sun Feb 6 14:51:53 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # files: firewall12.conf /etc/fw/firewall12.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 6 12:35:31 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index 49d3e8e0a..dc2548e23 100755 --- a/test/pf/firewall13.fw.orig +++ b/test/pf/firewall13.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:31 2011 PST by vadim +# Generated Sun Feb 6 14:51:54 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # files: firewall13.conf /etc/fw/firewall13.conf @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:31 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14-1.fw.orig b/test/pf/firewall14-1.fw.orig index 93c7383d7..a6a6cb12a 100755 --- a/test/pf/firewall14-1.fw.orig +++ b/test/pf/firewall14-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:32 2011 PST by vadim +# Generated Sun Feb 6 14:51:55 2011 PST by vadim # # files: * firewall14-1.fw /etc/firewall14-1.fw # files: firewall14-1.conf /etc/firewall14-1.conf @@ -235,13 +235,13 @@ configure_interfaces() { : sync_vlan_interfaces vlan101 vlan103 update_vlans_of_interface "em0 vlan101 vlan103" - update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" - update_addresses_of_interface "pcn0 10.3.14.50/0xffffff00" "" update_addresses_of_interface "em0 10.1.1.50/0xffffff00" "" + update_addresses_of_interface "pcn0 10.3.14.50/0xffffff00" "" update_addresses_of_interface "vlan101 10.100.101.1/0xffffff00" "" + update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:32 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index f3f7da754..c19dfdb58 100755 --- a/test/pf/firewall14.fw.orig +++ b/test/pf/firewall14.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:32 2011 PST by vadim +# Generated Sun Feb 6 14:51:54 2011 PST by vadim # # files: * firewall14.fw /etc/firewall14.fw # files: firewall14.conf /etc/firewall14.conf @@ -235,13 +235,13 @@ configure_interfaces() { : sync_vlan_interfaces vlan101 vlan103 update_vlans_of_interface "em0 vlan101 vlan103" + update_addresses_of_interface "em0 10.1.1.50/0xffffff00" "" + update_addresses_of_interface "pcn0 10.3.14.50/0xffffff00" "" update_addresses_of_interface "vlan101 10.100.101.1/0xffffff00" "" update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" - update_addresses_of_interface "pcn0 10.3.14.50/0xffffff00" "" - update_addresses_of_interface "em0 10.1.1.50/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:32 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-1.fw.orig b/test/pf/firewall2-1.fw.orig index 2faa7ea27..66ccfb45d 100755 --- a/test/pf/firewall2-1.fw.orig +++ b/test/pf/firewall2-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:34 2011 PST by vadim +# Generated Sun Feb 6 14:51:57 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # files: firewall2-1.conf /etc/fw/firewall2-1.conf @@ -89,7 +89,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:34 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index 63757a00e..f6cfccd8f 100755 --- a/test/pf/firewall2.fw.orig +++ b/test/pf/firewall2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:33 2011 PST by vadim +# Generated Sun Feb 6 14:51:56 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # files: firewall2.conf /etc/fw/firewall2.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:33 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index f45055026..dec4e2f8e 100755 --- a/test/pf/firewall20.fw.orig +++ b/test/pf/firewall20.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:33 2011 PST by vadim +# Generated Sun Feb 6 14:51:56 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # files: firewall20.conf /etc/fw/firewall20.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:33 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index 6c46b027b..316201548 100755 --- a/test/pf/firewall21.fw.orig +++ b/test/pf/firewall21.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:34 2011 PST by vadim +# Generated Sun Feb 6 14:51:57 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # files: firewall21-NAT_1.conf /etc/fw/firewall21-NAT_1.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:34 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 3f9d91348..0b366af2d 100755 --- a/test/pf/firewall22.fw.orig +++ b/test/pf/firewall22.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:35 2011 PST by vadim +# Generated Sun Feb 6 14:51:58 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # files: firewall22-NAT_1.conf /etc/fw/firewall22-NAT_1.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:35 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index da0685e0c..bf2c95c1f 100755 --- a/test/pf/firewall3.fw.orig +++ b/test/pf/firewall3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:35 2011 PST by vadim +# Generated Sun Feb 6 14:51:58 2011 PST by vadim # # files: * firewall3.fw /etc/firewall3.fw # files: firewall3.conf /etc/firewall3.conf @@ -154,12 +154,12 @@ run_epilog_and_exit() { configure_interfaces() { : + update_addresses_of_interface "le0 22.22.22.21/0xffffff00 22.22.22.22/0xffffff00 22.22.22.0/0xffffff00 22.22.22.1/0xffffff00" "" update_addresses_of_interface "le1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" - update_addresses_of_interface "le0 22.22.22.21/0xffffff00 22.22.22.22/0xffffff00 22.22.22.0/0xffffff00 22.22.22.1/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:35 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index cc450a20c..20a9ac5ed 100755 --- a/test/pf/firewall33.fw.orig +++ b/test/pf/firewall33.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:36 2011 PST by vadim +# Generated Sun Feb 6 14:51:59 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # files: firewall33.conf /etc/fw/firewall33.conf @@ -158,11 +158,11 @@ run_epilog_and_exit() { configure_interfaces() { : - update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" update_addresses_of_interface "eth1 192.168.1.100/0xffffff00" "" + update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 6 12:35:36 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:51:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index 98933bd09..9ecf43a8d 100755 --- a/test/pf/firewall34.fw.orig +++ b/test/pf/firewall34.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:37 2011 PST by vadim +# Generated Sun Feb 6 14:52:00 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # files: firewall34.conf /etc/fw/firewall34.conf @@ -154,11 +154,11 @@ run_epilog_and_exit() { configure_interfaces() { : - update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" update_addresses_of_interface "eth1 192.168.1.100/0xffffff00" "" + update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 6 12:35:37 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index 7df3d5c70..59b724f34 100755 --- a/test/pf/firewall38.fw.orig +++ b/test/pf/firewall38.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:38 2011 PST by vadim +# Generated Sun Feb 6 14:52:00 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # files: firewall38.conf /etc/fw/firewall38.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:38 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index df2a37f78..8f30a6242 100755 --- a/test/pf/firewall39.fw.orig +++ b/test/pf/firewall39.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:38 2011 PST by vadim +# Generated Sun Feb 6 14:52:01 2011 PST by vadim # # files: * firewall39.fw pf.fw # files: firewall39.conf pf.conf @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:38 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index 52fd19041..eef9a31b4 100755 --- a/test/pf/firewall4.fw.orig +++ b/test/pf/firewall4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:39 2011 PST by vadim +# Generated Sun Feb 6 14:52:01 2011 PST by vadim # # files: * firewall4.fw pf.fw # files: firewall4.conf /etc/fw/pf.conf @@ -78,7 +78,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:39 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40-1.fw.orig b/test/pf/firewall40-1.fw.orig index 5814c2494..8ca53ffc7 100755 --- a/test/pf/firewall40-1.fw.orig +++ b/test/pf/firewall40-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:40 2011 PST by vadim +# Generated Sun Feb 6 14:52:03 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # files: firewall40-1.conf /etc/firewall40-1.conf @@ -170,13 +170,13 @@ run_epilog_and_exit() { configure_interfaces() { : - update_addresses_of_interface "le1 192.0.2.1/0xffffff00" "" update_addresses_of_interface "fxp0 192.168.1.1/0xffffff00" "" - update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" + update_addresses_of_interface "le1 192.0.2.1/0xffffff00" "" update_addresses_of_interface "le2 192.0.3.1/0xffffff00" "" + update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 6 12:35:40 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index 81d66e646..02a093492 100755 --- a/test/pf/firewall40.fw.orig +++ b/test/pf/firewall40.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:39 2011 PST by vadim +# Generated Sun Feb 6 14:52:02 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # files: firewall40.conf /etc/firewall40.conf @@ -154,13 +154,13 @@ run_epilog_and_exit() { configure_interfaces() { : - update_addresses_of_interface "le1 192.0.2.1/0xffffff00" "" update_addresses_of_interface "fxp0 192.168.1.1/0xffffff00" "" - update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" + update_addresses_of_interface "le1 192.0.2.1/0xffffff00" "" update_addresses_of_interface "le2 192.0.3.1/0xffffff00" "" + update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sun Feb 6 12:35:39 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index 5e48b7947..7ed9e31cd 100755 --- a/test/pf/firewall41.fw.orig +++ b/test/pf/firewall41.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:40 2011 PST by vadim +# Generated Sun Feb 6 14:52:03 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # files: firewall41.conf /etc/firewall41.conf @@ -159,11 +159,11 @@ run_epilog_and_exit() { configure_interfaces() { : - update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" update_addresses_of_interface "eth0 1.1.1.1/0xffffff00" "" + update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:40 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index ea4e88e91..3e11eabfb 100755 --- a/test/pf/firewall5.fw.orig +++ b/test/pf/firewall5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:41 2011 PST by vadim +# Generated Sun Feb 6 14:52:04 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # files: firewall5.conf /etc/fw/firewall5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:41 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index 65fce0601..e34718966 100755 --- a/test/pf/firewall51.fw.orig +++ b/test/pf/firewall51.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:42 2011 PST by vadim +# Generated Sun Feb 6 14:52:05 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # files: firewall51.conf /etc/fw/firewall51.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:42 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:05 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index 18bd14f1a..b612803e4 100755 --- a/test/pf/firewall6.fw.orig +++ b/test/pf/firewall6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:42 2011 PST by vadim +# Generated Sun Feb 6 14:52:05 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # files: firewall6.conf /etc/fw/firewall6.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:42 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:05 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index 99aef8caf..0a186002c 100755 --- a/test/pf/firewall62.fw.orig +++ b/test/pf/firewall62.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:43 2011 PST by vadim +# Generated Sun Feb 6 14:52:06 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # files: firewall62.conf /etc/firewall62.conf @@ -185,7 +185,7 @@ configure_interfaces() { update_addresses_of_interface "en1 222.222.222.222/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:43 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index 6479b5ff4..db592c7e0 100755 --- a/test/pf/firewall63.fw.orig +++ b/test/pf/firewall63.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:43 2011 PST by vadim +# Generated Sun Feb 6 14:52:06 2011 PST by vadim # # files: * firewall63.fw /etc/fw/firewall63.fw # files: firewall63.conf /etc/fw/firewall63.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:43 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index 2989dadfd..b1e9804ad 100755 --- a/test/pf/firewall7.fw.orig +++ b/test/pf/firewall7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:44 2011 PST by vadim +# Generated Sun Feb 6 14:52:07 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # files: firewall7.conf /etc/fw/firewall7.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:44 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index 88668a03f..ad75c1c8f 100755 --- a/test/pf/firewall70.fw.orig +++ b/test/pf/firewall70.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:44 2011 PST by vadim +# Generated Sun Feb 6 14:52:07 2011 PST by vadim # # files: * firewall70.fw /etc/fw/firewall70.fw # files: firewall70.conf /etc/fw/firewall70.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:44 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index bd7bad048..355d983d9 100755 --- a/test/pf/firewall8.fw.orig +++ b/test/pf/firewall8.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:45 2011 PST by vadim +# Generated Sun Feb 6 14:52:08 2011 PST by vadim # # files: * firewall8.fw /etc/firewall8.fw # files: firewall8.conf /etc/firewall8.conf @@ -72,7 +72,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:45 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:08 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80-4.5.fw.orig b/test/pf/firewall80-4.5.fw.orig index 330b41edb..caba4a953 100755 --- a/test/pf/firewall80-4.5.fw.orig +++ b/test/pf/firewall80-4.5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:46 2011 PST by vadim +# Generated Sun Feb 6 14:52:10 2011 PST by vadim # # files: * firewall80-4.5.fw /etc/firewall80-4.5.fw # files: firewall80-4.5.conf /etc/firewall80-4.5.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:46 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:10 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index 954f7f741..46337e031 100755 --- a/test/pf/firewall80.fw.orig +++ b/test/pf/firewall80.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:45 2011 PST by vadim +# Generated Sun Feb 6 14:52:08 2011 PST by vadim # # files: * firewall80.fw /etc/firewall80.fw # files: firewall80.conf /etc/firewall80.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:45 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:08 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index e75cb9d2e..15bfdf474 100755 --- a/test/pf/firewall9.fw.orig +++ b/test/pf/firewall9.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:47 2011 PST by vadim +# Generated Sun Feb 6 14:52:10 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # files: firewall9.conf /etc/fw/firewall9.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sun Feb 6 12:35:47 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:10 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index 676782fd8..a054fe806 100755 --- a/test/pf/firewall91.fw.orig +++ b/test/pf/firewall91.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:47 2011 PST by vadim +# Generated Sun Feb 6 14:52:11 2011 PST by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -234,13 +234,13 @@ configure_interfaces() { : sync_vlan_interfaces vlan101 vlan103 update_vlans_of_interface "em0 vlan101 vlan103" - update_addresses_of_interface "pcn0 10.3.14.50/0xffffff00" "" update_addresses_of_interface "em0 10.1.1.50/0xffffff00" "" + update_addresses_of_interface "pcn0 10.3.14.50/0xffffff00" "" update_addresses_of_interface "vlan101 10.100.101.1/0xffffff00" "" update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:47 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:11 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index c08255203..ae1365d05 100755 --- a/test/pf/firewall92.fw.orig +++ b/test/pf/firewall92.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:48 2011 PST by vadim +# Generated Sun Feb 6 14:52:11 2011 PST by vadim # # files: * firewall92.fw /etc/fw/pf.fw # files: firewall92.conf /etc/fw/path\ with\ space/pf.conf @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:48 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:11 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/objects-for-regression-tests.fwb b/test/pf/objects-for-regression-tests.fwb index 53a988aee..39e9fe08e 100644 --- a/test/pf/objects-for-regression-tests.fwb +++ b/test/pf/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - + @@ -1512,6 +1512,7 @@ + @@ -20397,7 +20398,7 @@ - + @@ -20425,7 +20426,7 @@ - + @@ -20437,7 +20438,7 @@ - + @@ -20449,7 +20450,7 @@ - + @@ -20461,7 +20462,7 @@ - + @@ -20473,7 +20474,7 @@ - + @@ -20600,6 +20601,705 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index 10667b808..306322c6e 100755 --- a/test/pf/pf_cluster_1_openbsd-1.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:50 2011 PST by vadim +# Generated Sun Feb 6 14:52:14 2011 PST by vadim # # files: * pf_cluster_1_openbsd-1.fw /etc/pf_cluster_1_openbsd-1.fw # files: pf_cluster_1_openbsd-1.conf /etc/pf_cluster_1_openbsd-1.conf @@ -279,16 +279,16 @@ configure_interfaces() { sync_carp_interfaces carp0 carp1 $IFCONFIG carp0 vhid 101 pass secret carpdev en0 $IFCONFIG carp1 vhid 100 pass secret carpdev en1 - update_addresses_of_interface "en0 172.24.0.2/0xffffff00 172.24.0.3/0xffffff00" "" - update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" - update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" - update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" sync_pfsync_interfaces pfsync0 $IFCONFIG pfsync0 syncdev en0 syncpeer 172.24.0.3 $IFCONFIG pfsync0 up + update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" + update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" + update_addresses_of_interface "en0 172.24.0.2/0xffffff00 172.24.0.3/0xffffff00" "" + update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:50 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:14 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-2.fw.orig b/test/pf/pf_cluster_1_openbsd-2.fw.orig index c3e381fee..28f72bd95 100755 --- a/test/pf/pf_cluster_1_openbsd-2.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:50 2011 PST by vadim +# Generated Sun Feb 6 14:52:14 2011 PST by vadim # # files: * pf_cluster_1_openbsd-2.fw /etc/pf_cluster_1_openbsd-2.fw # files: pf_cluster_1_openbsd-2.conf /etc/pf_cluster_1_openbsd-2.conf @@ -179,13 +179,13 @@ configure_interfaces() { sync_carp_interfaces carp0 carp1 $IFCONFIG carp0 vhid 101 pass secret advskew 1 carpdev en0 $IFCONFIG carp1 vhid 100 pass secret advskew 1 carpdev en1 - update_addresses_of_interface "en0 172.24.0.3/0xffffff00 172.24.0.2/0xffffff00" "" - update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" + update_addresses_of_interface "en0 172.24.0.3/0xffffff00 172.24.0.2/0xffffff00" "" + update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:50 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:14 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-1.fw.orig b/test/pf/pf_cluster_2_freebsd-1.fw.orig index 58335dcff..3f9a1fcce 100755 --- a/test/pf/pf_cluster_2_freebsd-1.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:50 2011 PST by vadim +# Generated Sun Feb 6 14:52:14 2011 PST by vadim # # files: * pf_cluster_2_freebsd-1.fw /etc/pf_cluster_2_freebsd-1.fw # files: pf_cluster_2_freebsd-1.conf /etc/pf_cluster_2_freebsd-1.conf @@ -282,16 +282,16 @@ configure_interfaces() { sync_carp_interfaces carp0 carp1 $IFCONFIG carp0 vhid 101 pass secret advskew 5 carpdev en0 $IFCONFIG carp1 vhid 100 pass secret advskew 5 carpdev en1 - update_addresses_of_interface "en0 172.24.0.2/0xffffff00" "" - update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" - update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" "" - update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" sync_pfsync_interfaces pfsync0 $IFCONFIG pfsync0 syncdev en0 $IFCONFIG pfsync0 up + update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" "" + update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" + update_addresses_of_interface "en0 172.24.0.2/0xffffff00" "" + update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:50 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:14 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-2.fw.orig b/test/pf/pf_cluster_2_freebsd-2.fw.orig index 79efe56bb..95a35d88c 100755 --- a/test/pf/pf_cluster_2_freebsd-2.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:50 2011 PST by vadim +# Generated Sun Feb 6 14:52:14 2011 PST by vadim # # files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw # files: pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf @@ -182,13 +182,13 @@ configure_interfaces() { sync_carp_interfaces carp0 carp1 $IFCONFIG carp0 vhid 101 pass secret advskew 10 carpdev en0 $IFCONFIG carp1 vhid 100 pass secret advskew 10 carpdev en1 - update_addresses_of_interface "en0 172.24.0.3/0xffffff00" "" - update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" update_addresses_of_interface "carp0 172.24.0.1/0xffffff00 172.24.0.1/0xffffff00" "" update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" + update_addresses_of_interface "en0 172.24.0.3/0xffffff00" "" + update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:50 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:14 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-3.fw.orig b/test/pf/pf_cluster_3_openbsd-3.fw.orig index 72c8a1de6..41f431497 100755 --- a/test/pf/pf_cluster_3_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:51 2011 PST by vadim +# Generated Sun Feb 6 14:52:15 2011 PST by vadim # # files: * pf_cluster_3_openbsd-3.fw /etc/pf_cluster_3_openbsd-3.fw # files: pf_cluster_3_openbsd-3.conf /etc/pf_cluster_3_openbsd-3.conf @@ -282,17 +282,17 @@ configure_interfaces() { $IFCONFIG carp2 vhid pass "" carpdev vlan100 $IFCONFIG carp0 vhid pass "" carpdev en0 $IFCONFIG carp1 vhid pass "" carpdev en1 - update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" - update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" - update_addresses_of_interface "en0 172.24.0.2/0xffffff00" "" - update_addresses_of_interface "vlan100 172.20.0.2/0xffffff00" "" - update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" + sync_pfsync_interfaces update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" - sync_pfsync_interfaces + update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" + update_addresses_of_interface "en0 172.24.0.2/0xffffff00" "" + update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" + update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" + update_addresses_of_interface "vlan100 172.20.0.2/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:51 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:15 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-4.fw.orig b/test/pf/pf_cluster_3_openbsd-4.fw.orig index d59447dc4..95f55c144 100755 --- a/test/pf/pf_cluster_3_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:51 2011 PST by vadim +# Generated Sun Feb 6 14:52:15 2011 PST by vadim # # files: * pf_cluster_3_openbsd-4.fw /etc/pf_cluster_3_openbsd-4.fw # files: pf_cluster_3_openbsd-4.conf /etc/pf_cluster_3_openbsd-4.conf @@ -181,16 +181,16 @@ configure_interfaces() { $IFCONFIG carp1 vhid pass "" advskew 1 carpdev en1 $IFCONFIG lo0 vhid pass "" advskew 1 carpdev lo $IFCONFIG carp2 vhid pass "" advskew 1 carpdev vlan100 - update_addresses_of_interface "en0 172.24.0.3/0xffffff00" "" - update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" - update_addresses_of_interface "vlan100 172.20.0.3/0xffffff00" "" - update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" update_addresses_of_interface "carp0 172.24.0.1/0xffffff00" "" update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" + update_addresses_of_interface "en0 172.24.0.3/0xffffff00" "" + update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" + update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" + update_addresses_of_interface "vlan100 172.20.0.3/0xffffff00" "" } -log "Activating firewall script generated Sun Feb 6 12:35:51 2011 by vadim" +log "Activating firewall script generated Sun Feb 6 14:52:15 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local index 34f8ef521..40f11a215 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3460 # -# Generated Sun Feb 6 12:35:51 2011 PST by vadim +# Generated Sun Feb 6 14:52:15 2011 PST by vadim # # files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local # files: pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf @@ -22,13 +22,13 @@ ifconfig_carp0="vhid 101 pass secret advskew 10 carpdev en0" ifconfig_carp1="vhid 100 pass secret advskew 10 carpdev en1" ipv6_network_interfaces="en0 en1 carp0 carp1" network_interfaces="en0 en1 carp0 carp1" -ifconfig_en0="inet 172.24.0.3 netmask 0xffffff00" -ifconfig_en1="inet 192.168.1.3 netmask 0xffffff00" -ifconfig_carp0="inet 172.24.0.1 netmask 0xffffff00" -ifconfig_carp1="inet 192.168.1.1 netmask 0xffffff00" pfsync_enable="YES" pfsync_syncdev="en0" pfsync_syncpeer="172.24.0.2" +ifconfig_carp0="172.24.0.1 netmask 0xffffff00" +ifconfig_carp1="192.168.1.1 netmask 0xffffff00" +ifconfig_en0="172.24.0.3 netmask 0xffffff00" +ifconfig_en1="192.168.1.3 netmask 0xffffff00" pf_enable="YES" pf_rules="/etc/pf_cluster_4_pf.conf"