onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2025-10-16 07:28:25 +02:00
Code Issues Releases Wiki Activity

better behavior of FWObjectTypedChildIterator::operator--(); deleted test file that should have been recycled but wasnt

Browse Source
This commit is contained in:
Vadim Kurland 2011-07-05 18:00:48 -07:00
parent 531c5a83fe
commit 021cadf062
3 changed files with 26 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libfwbuilder/src/fwbuilder/FWObject.cpp
View File

@ -1385,6 +1385,14 @@ void FWObject::checkReadOnly() throw(FWException)
throw FWException(string("Attempt to modify read-only object ")+getName());
}
FWObjectTypedChildIterator::FWObjectTypedChildIterator() :
type_name(), real_iterator()
{
}
FWObjectTypedChildIterator::FWObjectTypedChildIterator(
const FWObjectTypedChildIterator &o) :
type_name(o.type_name),
@ -1394,11 +1402,18 @@ FWObjectTypedChildIterator::FWObjectTypedChildIterator(
FWObjectTypedChildIterator::FWObjectTypedChildIterator(
const FWObject *o, const std::string &_type_name)
{
init(o, _type_name);
}
void FWObjectTypedChildIterator::init(
const FWObject *o, const std::string &_type_name)
{
type_name = _type_name ;
_end = o->end() ;
real_iterator = o->begin() ;
// position to first element
real_iterator = o->begin() ;
while(real_iterator!=_end && (*real_iterator)->getTypeName()!=type_name)
real_iterator++;
_begin = real_iterator;
@ -1432,15 +1447,18 @@ FWObjectTypedChildIterator& FWObjectTypedChildIterator::operator++()
return *this;
}
/*
* if iterator points to the first element in the list, then operator--()
* should move it and make it point to end()
*/
FWObjectTypedChildIterator& FWObjectTypedChildIterator::operator--()
{
if(real_iterator==_begin)
if(real_iterator==_end)
return *this;
do
{
real_iterator--;
} while(real_iterator!=_begin &&
(real_iterator==_end || (*real_iterator)->getTypeName()!=type_name));
} while(real_iterator!=_end && (*real_iterator)->getTypeName()!=type_name);
return *this;
}

6
src/libfwbuilder/src/fwbuilder/FWObject.h
View File

@ -577,8 +577,8 @@ class FWObjectTypedChildIterator
{
public:
FWObjectTypedChildIterator(const FWObjectTypedChildIterator &o);
FWObjectTypedChildIterator();
FWObjectTypedChildIterator(const FWObjectTypedChildIterator &o);
FWObjectTypedChildIterator(const FWObject *o, const std::string &_type_name);
bool operator==(const FWObject::const_iterator& __x) const;
@ -596,6 +596,8 @@ class FWObjectTypedChildIterator
FWObject::const_iterator real_iterator;
FWObject::const_iterator _begin;
FWObject::const_iterator _end;
void init(const FWObject *o, const std::string &_type_name);
};
/**

183
test/pf/firewall40-2.fw
View File

@ -1,183 +0,0 @@
#!/bin/sh
#
# This is automatically generated file. DO NOT MODIFY !
#
# Firewall Builder fwb_pf v5.0.0.3556
#
# Generated Tue Jul 5 13:58:41 2011 PDT by vadim
#
# files: * firewall40-2.fw /etc/firewall40-2.fw
# files: firewall40-2.conf /etc/firewall40-2.conf
#
# Compiled for pf 4.7
#
# testing Route action for PF v4.7 and later
FWDIR=`dirname $0`
IFCONFIG="/sbin/ifconfig"
PFCTL="/sbin/pfctl"
SYSCTL="/sbin/sysctl"
LOGGER="/usr/bin/logger"
log() {
echo "$1"
command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
}
diff_intf() {
func=$1
list1=$2
list2=$3
cmd=$4
for intf in $list1
do
echo $list2 | grep -q $intf || {
# $vlan is absent in list 2
$func $intf $cmd
}
done
}
missing_address() {
address=$1
cmd=$2
oldIFS=$IFS
IFS="@"
set $address
addr=$1
interface=$2
IFS=$oldIFS
if echo "$addr" | grep -q ':'
then
inet="inet6"
addr=$(echo "$addr" | sed 's!/! prefixlen !')
else
inet="inet"
addr=$(echo "$addr" | sed 's!/! netmask !')
fi
parameter=""
test "$cmd" = "add" && {
echo "# Adding ip address: $interface $addr"
parameter="alias"
}
test "$cmd" = "del" && {
echo "# Removing ip address: $interface $addr"
parameter="delete"
}
$FWBDEBUG $IFCONFIG $interface $inet $addr $parameter || exit 1
$FWBDEBUG $IFCONFIG $interface up
}
list_addresses_by_scope() {
interface=$1
scope=$2
ignore_list=$3
scope_regex="1"
if test -n "$scope"; then scope_regex=" \$0 !~ \"$scope\" "; fi
$IFCONFIG $interface | sed "s/%$interface//" | \
awk -v IGNORED="$ignore_list" \
"BEGIN {
split(IGNORED,ignored_arr);
for (a in ignored_arr) {ignored_dict[ignored_arr[a]]=1;}
}
(/inet |inet6 / && $scope_regex && !(\$2 in ignored_dict)) {printf \"%s/%s\n\",\$2,\$4;}" | \
while read addr; do
echo "${addr}@$interface"
done | sort
}
update_addresses_of_interface() {
ignore_list=$2
set $1
interface=$1
shift
FWB_ADDRS=$(
for addr in $*; do
echo "${addr}@$interface"
done | sort
)
CURRENT_ADDRS_ALL_SCOPES=""
CURRENT_ADDRS_GLOBAL_SCOPE=""
$IFCONFIG $interface >/dev/null 2>&1 && {
CURRENT_ADDRS_ALL_SCOPES=$(list_addresses_by_scope $interface '' "$ignore_list")
CURRENT_ADDRS_GLOBAL_SCOPE=$(list_addresses_by_scope $interface 'scopeid .*' "$ignore_list")
} || {
echo "# Interface $interface does not exist"
# Stop the script if we are not in test mode
test -z "$FWBDEBUG" && exit 1
}
echo "$interface" | grep -q carp && {
diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
} || {
diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
}
}
verify_interfaces() {
:
}
set_kernel_vars() {
:
$SYSCTL -w net.inet.ip.forwarding=1
}
prolog_commands() {
:
}
epilog_commands() {
:
}
run_epilog_and_exit() {
epilog_commands
exit $1
}
configure_interfaces() {
:
update_addresses_of_interface "fxp0 192.168.1.1/0xffffff00" ""
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 Tue Jul 5 13:58:41 2011 by vadim"
set_kernel_vars
configure_interfaces
prolog_commands
$PFCTL -f /etc/firewall40-2.conf || exit 1
epilog_commands