Commit Graph

67 Commits

Author SHA1 Message Date
teastep
b734d3af31 Fix subtle bug introduced in last commit
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9842 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 20:36:09 +00:00
teastep
20cfd0033c Fix a 4.3 bug in expand_rule().
Don't repeat matches on target rule when log chain is used.

Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9841 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 19:47:39 +00:00
teastep
28e84a6aba Break up long port lists in jump to logging chain
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9840 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 16:31:04 +00:00
teastep
e0040f4011 Small optimizations in expand_rule()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9837 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 16:16:25 +00:00
teastep
ff014f328b Correct usage text
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9836 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 16:15:36 +00:00
teastep
8278203e03 Remove one argument from expand_rule()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9835 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-09 22:21:48 +00:00
teastep
f20013898e Don't use -g when the target might not be terminating
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9834 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-09 20:18:11 +00:00
teastep
ae169f00a7 Implement rules that also log as a separate chain. Preserve original target in logging rules
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9833 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-09 18:45:21 +00:00
teastep
7d2b410904 Correct rule generation when an interface is specified as the destination of a PREROUTING rule.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9831 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-08 03:37:15 +00:00
teastep
28b6fd8033 Simplify hashlimit match code
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9830 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-07 18:15:51 +00:00
teastep
36e0c85f5f Require the Hashlimit Match capability for per-IP rate limiting
Use the current key words in the generated hashlimit match

Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9828 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-07 17:36:23 +00:00
teastep
c545e65cea First part of 'hashlimit' implemenation
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9826 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-07 03:23:01 +00:00
teastep
b1e9453c62 The other half of the re-implementation of 'enable/disable_object'
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9825 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-07 03:22:49 +00:00
teastep
0744df13d6 Reimplement object_enable/disable
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9824 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-07 03:22:30 +00:00
teastep
b6053d8577 Fix second bug regarding ADD_IP_ALIASES=Yes
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9823 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-07 03:22:16 +00:00
teastep
844bb448c7 Fix inversion rules (omitted hunk)
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9797 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-04 15:09:17 +00:00
teastep
e2c5ad441a Generate inversion that satisfies iptables 1.4.3.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9796 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-04 15:09:04 +00:00
teastep
77bbd88ab4 Cosmetic improvement in generated code for arp and route filtering.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9787 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-03 14:36:16 +00:00
teastep
54620a962e Small optimization in "logmartians" fix. Update manpage to reflect new implementation
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9786 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-03 14:31:21 +00:00
teastep
8a9af0acf5 Fix LOG_MARTIANS=Yes
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9784 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-02 16:33:56 +00:00
teastep
29c8098d37 Cosmetic improvement in generated script.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9780 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-01 19:53:38 +00:00
teastep
ef50c0be25 More removal of SAME target
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9775 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-01 01:31:16 +00:00
teastep
dbf23f64e2 Removal of SAME support
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9774 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-01 01:31:04 +00:00
teastep
35790476a3 Fix bug in Shorewall::Rules::process_rule1()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9773 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-01 00:04:04 +00:00
teastep
d3a54e626c De-implement $Shorewall::Config::object_enabled and associated methods
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9772 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-01 00:03:51 +00:00
teastep
d00f52f933 Fix run-time error in Shorewall::process_rules1()
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9771 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-31 22:42:49 +00:00
teastep
39131f3809 Some optimizations in Shorewall::Rules::compile_stop_firewall()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9770 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-31 22:42:37 +00:00
teastep
6c205d922a Add AUTOMAKE option
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9767 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-31 17:31:23 +00:00
teastep
22526979db Make generation of 'stop' ruleset activation more foolproof.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9764 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-30 19:58:26 +00:00
teastep
b215f91d4a Pass input directly to iptables[6]-restore during stop
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9763 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-30 18:33:30 +00:00
teastep
715554e579 Cleanup of iptables-restore/stop code. Don't purge ipsets on stop.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9762 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-30 18:00:23 +00:00
teastep
cddd1b1ae9 Use iptables[6]-restore to instantiate the 'stopped' ruleset
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9761 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-30 00:49:00 +00:00
teastep
7210e8c15e Move generation of stop_firewall() to the end of the compilation sequence
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9760 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-29 17:52:24 +00:00
teastep
adb9830e9e Move 'compile_stop_firewall' to Shorewall::Rules
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9743 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-28 19:22:15 +00:00
teastep
d9622dabfe Centralize iptables knowledge in the Chains module -- first phase
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9742 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-28 19:21:36 +00:00
teastep
b663644d0d Ignore leading white space on certain continuation lines
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9740 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-27 16:55:51 +00:00
teastep
d67c94de9c Move extension script handling to generate_script_1()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9739 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-26 18:18:09 +00:00
teastep
9328f0fc4c Detect dhclient dynamic gateway
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9734 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-24 20:58:04 +00:00
teastep
6013e8b53d Improve error message for startup errors. Document in release documents.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9730 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-23 22:51:05 +00:00
teastep
1545d62ba9 Update version by hand
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9729 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-23 22:50:04 +00:00
teastep
1ff093b1c0 Minor tweak to Shorewall::Zones
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9724 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-21 22:46:16 +00:00
teastep
bb8e562d18 Detect IP configuration early in start/restart so that stopping the fireawall isn't necessary in the case of failure.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9722 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-21 16:45:27 +00:00
teastep
6dac69554f Apply Tuomo Soini's patch for USE_DEFAULT_RT
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9704 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-19 14:04:57 +00:00
teastep
2734d2b8cb Change 'flow' filter rule (which still doesn't work :-()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9702 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-18 21:33:28 +00:00
teastep
08cd0684ec Use new syntax in standard actions. Add additional comments in Shorewall::Config
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9695 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-16 16:37:21 +00:00
teastep
fc3a2fc386 Add explanation of maximum zone length
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9690 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-15 15:54:29 +00:00
teastep
229e573c3c Make zone type numeric for faster comparison
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9684 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-13 22:59:49 +00:00
teastep
e75789d894 A few minor changes in Shorewall::Chains.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9682 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-11 01:16:45 +00:00
teastep
77444634e1 Correct fatal error message generated by assert()
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9675 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-09 21:45:30 +00:00
teastep
ce5efc5dfa Add a comment
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9674 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-03-09 21:45:18 +00:00