extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-22 18:51:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Include kernel release that changes physdev-out; minor tweak to bridge detection

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5120 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-12-14 17:22:24 +00:00
parent 715910dce0
commit 685ccdd771
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/compiler
View File

@ -101,7 +101,7 @@ progress_message_and_save()
indent() { indent() {
if [ -n "$INDENT" ]; then if [ -n "$INDENT" ]; then
if [ -n "$HAVEAWK" ]; then if [ -n "$HAVEAWK" ]; then
eval awk \''BEGIN { indent=1; }; /^[[:space:]]*$/ { print ""; indent=1; next; }; { if (indent == 1) print "'"$INDENT"'" $0; else print; }; { indent=1; }; /\\$/ { indent=0; };'\' $1 eval awk \''BEGIN { indent=1; }; /^\s*$/ { print ""; indent=1; next; }; { if (indent == 1) print "'"$INDENT"'" $0; else print; }; { indent=1; }; /\\$/ { indent=0; };'\' $1
else else
eval sed \'s\/^/"$INDENT"\/\' $1 eval sed \'s\/^/"$INDENT"\/\' $1
fi fi
@ -3467,7 +3467,7 @@ __EOF__
for interface in $interfaces; do for interface in $interfaces; do
if [ -n "$BRIDGING" ]; then if [ -n "$BRIDGING" ]; then
is_bridge=$( brctl show $interface 2> /dev/null | grep ^$interface[[:space:]] ) is_bridge=$( brctl show 2> /dev/null | grep "^$interface[[:space:]]" )
[ -n "$is_bridge" ] && \ [ -n "$is_bridge" ] && \
do_iptables -A $(forward_chain $interface) -p udp -o $interface --dport 67:68 -j ACCEPT do_iptables -A $(forward_chain $interface) -p udp -o $interface --dport 67:68 -j ACCEPT
fi fi

3
Shorewall/releasenotes.txt
View File

@ -61,7 +61,8 @@ Other Changes in 3.3.6
3) Shorewall now uses tc fwmark filters to classify packets for 3) Shorewall now uses tc fwmark filters to classify packets for
traffic shaping when the DEVICE isn't an interface described in traffic shaping when the DEVICE isn't an interface described in
/etc/shorewall/interfaces. This is in preparation for the upcoming /etc/shorewall/interfaces. This is in preparation for the upcoming
change to the way that --physdev-out works in iptables/Netfilter. change to the way that --physdev-out works in iptables/Netfilter;
that change is now scheduled for kernel 2.6.20.
4) If your kernel and iptables have extended multiport support, then 4) If your kernel and iptables have extended multiport support, then
Shorewall will use that support for the destination port when Shorewall will use that support for the destination port when