onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-20 18:27:16 +01:00
Code Issues Releases Wiki Activity

fixes #2093 build failed because function QStringList::removeDuplicates() is only available in Qt 4.5

Browse Source
This commit is contained in:
Vadim Kurland 2011-02-16 15:49:02 -08:00
parent 174686d281
commit 8de52b3f06
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pflib/OSConfigurator_bsd_interfaces.cpp
View File

@ -286,10 +286,23 @@ string OSConfigurator_bsd::configureInterfaces()
// sort interfaces by name
all_names.sort();
// remove duplicates. We get duplicates in all_names when an
// interface appears twice, once as a bridge port and another time as
// vlan parent interface
all_names.removeDuplicates();
//
// Note that QStringList::removeDuplicates() is only available in Qt 4.5
// all_names.removeDuplicates();
QStringList deduplicated_names;
QString prev;
foreach(QString name, all_names)
{
if (name != prev) deduplicated_names << name;
prev = name;
}
all_names = deduplicated_names;
ipv6_names.sort();
intf_names.sort();

15
test/pf/objects-for-regression-tests.fwb
View File

@ -22589,7 +22589,7 @@
<Option name="use_tables">True</Option>
</FirewallOptions>
</Firewall>
<Firewall id="id35204X5121" host_OS="freebsd" inactive="False" lastCompiled="1297728239" lastInstalled="1271995582" lastModified="1297727993" platform="pf" version="4.7" name="firewall109" comment="complex configuration with bridge and vlan" ro="False">
<Firewall id="id35204X5121" host_OS="freebsd" inactive="False" lastCompiled="1297728239" lastInstalled="1271995582" lastModified="1297899814" platform="pf" version="4.7" name="firewall109" comment="complex configuration with bridge and vlan" ro="False">
<NAT id="id35272X5121" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<RuleSetOptions/>
</NAT>
@ -22627,13 +22627,22 @@
</Interface>
<Interface id="id35217X5121" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="100" unnum="True" unprotected="False" name="em1" comment="" ro="False">
<InterfaceOptions>
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">False</Option>
<Option name="iface_mtu">1500</Option>
<Option name="iface_options">media 100baseTX mediaopt full-duplex</Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
</Interface>
<Interface id="id35222X5121" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="True" unprotected="False" name="em2" comment="" ro="False">
<InterfaceOptions>
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">False</Option>
<Option name="iface_mtu">1500</Option>
<Option name="iface_options">media 100baseTX mediaopt full-duplex</Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
<Interface id="id35231X5121" dedicated_failover="False" dyn="False" label="" mgmt="False" security_level="0" unnum="False" unprotected="False" name="vlan101" comment="" ro="False">
<IPv4 id="id35234X5121" name="firewall109:em2:vlan101:ip" comment="" ro="False" address="192.168.101.1" netmask="255.255.255.0"/>
@ -22673,7 +22682,7 @@
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">False</Option>
<Option name="iface_mtu">1500</Option>
<Option name="iface_options">media 100baseTX mediaopt full-duplex up</Option>
<Option name="iface_options"></Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>
@ -22683,7 +22692,7 @@
<Option name="enable_stp">False</Option>
<Option name="iface_configure_mtu">False</Option>
<Option name="iface_mtu">1500</Option>
<Option name="iface_options">media 100baseTX mediaopt full-duplex up</Option>
<Option name="iface_options"></Option>
<Option name="type">ethernet</Option>
<Option name="vlan_id">0</Option>
</InterfaceOptions>

2
test/pf/pf_cluster_4_rc.conf.local
View File

@ -3,7 +3,7 @@
#
# Firewall Builder fwb_pf v4.2.0.3479
#
# Generated Wed Feb 16 15:16:52 2011 PST by vadim
# Generated Wed Feb 16 15:46:54 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