From 3adff7f55094a0fe1ec72d0210911a2585a4df16 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 2 Mar 2009 03:25:16 +0000 Subject: [PATCH] release doc update; add comments to prog.* git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9574 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/changelog.txt | 6 ++++++ Shorewall/prog.footer | 3 +++ Shorewall/prog.footer6 | 3 +++ Shorewall/prog.functions | 9 +++++++++ Shorewall/prog.functions6 | 9 +++++++++ Shorewall/prog.header | 20 ++++++++++++++++++-- Shorewall/prog.header6 | 22 ++++++++++++++++++++-- Shorewall/releasenotes.txt | 7 ++++++- 8 files changed, 74 insertions(+), 5 deletions(-) diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 43bdeb962..79dc6905a 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,9 @@ +Changes in Shorewall 4.3.7 + +1) Fix forward treatment of interface options. + +2) Replace $VARDIR/.restore with $VARDIR/firewall + Changes in Shorewall 4.3.6 1) Add SAME tcrules target. diff --git a/Shorewall/prog.footer b/Shorewall/prog.footer index 92cc5d453..57006c929 100644 --- a/Shorewall/prog.footer +++ b/Shorewall/prog.footer @@ -1,3 +1,6 @@ +############################################################################### +# Code imported from /usr/share/shorewall/prog.footer +############################################################################### # # Give Usage Information # diff --git a/Shorewall/prog.footer6 b/Shorewall/prog.footer6 index 4fa6d61a9..6f03e47de 100644 --- a/Shorewall/prog.footer6 +++ b/Shorewall/prog.footer6 @@ -1,3 +1,6 @@ +############################################################################### +# Code imported from /usr/share/shorewall/prog.footer6 +############################################################################### # # Give Usage Information # diff --git a/Shorewall/prog.functions b/Shorewall/prog.functions index 5ef27ecf7..dd6a2d220 100644 --- a/Shorewall/prog.functions +++ b/Shorewall/prog.functions @@ -1,3 +1,6 @@ +#################################################################################### +# Functions imported from /usr/share/shorewall/prog.functions +#################################################################################### # # Clear Proxy Arp # @@ -155,6 +158,9 @@ run_tc() { fi } +# +# Restore the rules generated by 'drop','reject','logdrop', etc. +# restore_dynamic_rules() { if [ -f ${VARDIR}/save ]; then progress_message2 "Setting up dynamic rules..." @@ -271,3 +277,6 @@ debug_restore_input() { esac done } +#################################################################################### +# End of f unctions imported from /usr/share/shorewall/prog.functions +#################################################################################### diff --git a/Shorewall/prog.functions6 b/Shorewall/prog.functions6 index 0c4d41f2a..542212f04 100644 --- a/Shorewall/prog.functions6 +++ b/Shorewall/prog.functions6 @@ -1,3 +1,6 @@ +#################################################################################### +# Functions imported from /usr/share/shorewall/prog.functions6 +#################################################################################### # # Remove all Shorewall-added rules # @@ -131,6 +134,9 @@ run_tc() { fi } +# +# Restore the rules generated by 'drop','reject','logdrop', etc. +# restore_dynamic_rules() { if [ -f ${VARDIR}/save ]; then progress_message2 "Setting up dynamic rules..." @@ -232,3 +238,6 @@ debug_restore_input() { esac done } +#################################################################################### +# End of f unctions imported from /usr/share/shorewall/prog.functions +#################################################################################### diff --git a/Shorewall/prog.header b/Shorewall/prog.header index 4049962b6..a73bd32ff 100644 --- a/Shorewall/prog.header +++ b/Shorewall/prog.header @@ -20,7 +20,7 @@ # generated this program # ################################################################################ -# Functions imported from /usr/share/shorewall/lib.base +# Functions imported from /usr/share/shorewall/prog.header ################################################################################ # # Message to stderr @@ -647,6 +647,9 @@ get_routed_networks() # $1 = interface name, $2-n = Fatal error message done } +# +# Get the broadcast addresses associated with an interface +# get_interface_bcasts() # $1 = interface { local addresses @@ -796,6 +799,9 @@ add_ip_aliases() # $* = List of addresses done } +# +# Detect the gateway through a PPP or DHCP-configured interface +# detect_dynamic_gateway() { # $1 = interface local interface interface=$1 @@ -817,6 +823,9 @@ detect_dynamic_gateway() { # $1 = interface [ -n "$gateway" ] && echo $gateway } +# +# Detect the gateway through an interface +# detect_gateway() # $1 = interface { local interface @@ -872,6 +881,10 @@ truncate() # $1 = length cut -b -${1} } +# +# Clear the current traffic shaping configuration +# + delete_tc1() { clear_one_tc() { @@ -953,6 +966,9 @@ undo_routing() { } +# +# Restore the default route that was in place before the initial 'shorewall start' +# restore_default_route() { if [ -z "$NOROUTES" -a -f ${VARDIR}/default_route ]; then local default_route @@ -1052,5 +1068,5 @@ conditionally_flush_conntrack() { } ################################################################################ -# End of functions imported from /usr/share/shorewall/lib.base +# End of functions in /usr/share/shorewall/prog.header ################################################################################ diff --git a/Shorewall/prog.header6 b/Shorewall/prog.header6 index cf947efc1..defe00f50 100644 --- a/Shorewall/prog.header6 +++ b/Shorewall/prog.header6 @@ -20,7 +20,7 @@ # generated this program # ################################################################################ -# Functions imported from /usr/share/shorewall/lib.base +# Functions imported from /usr/share/shorewall/prog.header ################################################################################ # # Message to stderr @@ -522,6 +522,9 @@ get_routed_networks() # $1 = interface name, $2-n = Fatal error message done } +# +# Normalize an IPv6 Address by compressing out consecutive zero elements +# normalize_address() # $1 = valid IPv6 Address { local address @@ -743,6 +746,9 @@ INCLUDE() { . $(find_file $(expand $@)) } +# +# Detect the gateway through an interface +# detect_gateway() # $1 = interface { local interface @@ -765,11 +771,20 @@ detect_gateway() # $1 = interface [ -n "$gateway" ] && echo $gateway } +# Function to truncate a string -- It uses 'cut -b -' +# rather than ${v:first:last} because light-weight shells like ash and +# dash do not support that form of expansion. +# + truncate() # $1 = length { cut -b -${1} } +# +# Clear the current traffic shaping configuration +# + delete_tc1() { clear_one_tc() { @@ -851,6 +866,9 @@ undo_routing() { } +# +# Restore the default route that was in place before the initial 'shorewall start' +# restore_default_route() { if [ -z "$NOROUTES" -a -f ${VARDIR}/default_route ]; then local default_route @@ -950,5 +968,5 @@ conditionally_flush_conntrack() { } ################################################################################ -# End of functions imported from /usr/share/shorewall/lib.base +# End of functions imported from /usr/share/shorewall/prog.header ################################################################################ diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 9329ee938..289297aea 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -57,7 +57,12 @@ None. N E W F E A T U R E S I N 4 . 3 . 6 ---------------------------------------------------------------------------- -None. +1) The file /var/lib/shorewall/.restore has been renamed to + /var/lib/shorewall/firewall. A similar change has been made in + Shorewall6. + + When a successful start or restart is completed, the script that + executed the command copies itself to to /var/lib/shorewall[6/firewall. ---------------------------------------------------------------------------- N E W F E A T U R E S IN 4 . 3