extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-22 15:43:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct issues with debugging the generated script

Browse Source 
a) Rename DEBUG to g_debug_iptablesb
b) Clear all of the tables prior to handling iptables-restore input.
This commit is contained in:
Tom Eastep 2012-03-05 15:21:10 -08:00
parent 93df86c90a
commit 649f73a360
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -6413,7 +6413,7 @@ sub create_netfilter_load( $ ) {
# #
emit( 'exec 3>&-', emit( 'exec 3>&-',
'', '',
'[ -n "$DEBUG" ] && command=debug_restore_input || command=$' . $UTILITY, '[ -n "$g_debug_iptables" ] && command=debug_restore_input || command=$' . $UTILITY,
'', '',
'progress_message2 "Running $command..."', 'progress_message2 "Running $command..."',
'', '',

4
Shorewall/Perl/prog.footer
View File

@ -62,12 +62,14 @@ checkkernelversion() {
# #
# Start trace if first arg is "debug" or "trace" # Start trace if first arg is "debug" or "trace"
# #
g_debug_iptables=
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then
if [ "x$1" = "xtrace" ]; then if [ "x$1" = "xtrace" ]; then
set -x set -x
shift shift
elif [ "x$1" = "xdebug" ]; then elif [ "x$1" = "xdebug" ]; then
DEBUG=Yes g_debug_iptables=Yes
shift shift
fi fi
fi fi

13
Shorewall/lib.core
View File

@ -510,6 +510,19 @@ debug_restore_input() {
qt1 $g_tool -t raw -P $chain ACCEPT qt1 $g_tool -t raw -P $chain ACCEPT
done done
qt1 $g_tool -t rawpost -F
qt1 $g_tool -t rawpost -X
for chain in POSTROUTING; do
qt1 $g_tool -t rawpost -P $chain ACCEPT
done
qt1 $g_tool -t nat -F
qt1 $g_tool -t nat -X
for chain in PREROUTING POSTROUTING; do
qt1 $g_tool -t nat -P $chain ACCEPT
qt1 $g_tool -t filter -F qt1 $g_tool -t filter -F
qt1 $g_tool -t filter -X qt1 $g_tool -t filter -X