Commit Graph

181 Commits

Author SHA1 Message Date
Tom Eastep
7766855e98 More comments about failing 'tc filter add' command 2009-05-08 08:12:54 -07:00
Tom Eastep
d66fc7a7e1 Add warning when successful tc command returns non-zero exit status 2009-05-07 07:19:25 -07:00
Tom Eastep
c9538bbdee Minor code cleanup in Tc 2009-05-06 13:40:18 -07:00
Tom Eastep
71480f38e2 Complete prior commit.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-06 09:49:06 -07:00
Tom Eastep
202d5f800e 1) Avoid multiple pri 65535 fw filters
2) Fix tcdevices > 9
3) Add some decimal/binary comments

Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-06 09:47:13 -07:00
Tom Eastep
56016ca1bb Improve interface number assignment 2009-05-06 07:07:38 -07:00
Tom Eastep
83bef182b1 Update some module versions 2009-05-05 18:11:49 -07:00
Tom Eastep
2125f3140f Allow upper case A-F in Hex numbers 2009-05-05 16:23:37 -07:00
Tom Eastep
df42a82b01 Minor cosmetic improvements 2009-05-05 16:00:12 -07:00
Tom Eastep
404a7250b0 Some early code cleanup 2009-05-05 15:43:38 -07:00
Tom Eastep
5758ba3f69 Fix SCTP source port filtering 2009-05-05 14:13:05 -07:00
Tom Eastep
94a7df0cd5 Pass many fewer arguments while processing providers file and route_rules file 2009-05-05 11:38:45 -07:00
Tom Eastep
1b380fbbab Pass many fewer arguments while processing masq rules 2009-05-05 11:31:47 -07:00
Tom Eastep
e68b571abe Pass many fewer arguments while processing accounting rules 2009-05-05 11:25:56 -07:00
Tom Eastep
293987a383 Pass many fewer arguments while processing traffic shaping files 2009-05-05 11:23:01 -07:00
Tom Eastep
a23fc3c46c Pass many fewer arguments while processing a record in /etc/shorewall/rules 2009-05-05 11:14:53 -07:00
Tom Eastep
c05071afc4 Another class number decimal/hex fix 2009-05-05 08:24:02 -07:00
Tom Eastep
624c24f2c0 Sequentially assign class numbers when WIDE_TC_MARKS=Yes 2009-05-05 07:50:46 -07:00
Tom Eastep
8f6130cca4 Update to nested classes; document nested classes in the release docs 2009-05-04 16:03:14 -07:00
Tom Eastep
03cd8350dc Initial implementation of nested classes 2009-05-04 14:19:09 -07:00
Tom Eastep
d3cd3ea26c Remove obsolete test 2009-05-04 13:25:21 -07:00
Tom Eastep
2db6130c26 Disallow 'occurs' with 'classify'; allow '<devname>:<classnum>' in tcclasses 2009-05-04 09:48:22 -07:00
Tom Eastep
13d3f86e23 Correct clearing of marks in POSTROUTING so that IPMARK works in the FORWARD table 2009-05-04 08:54:20 -07:00
Tom Eastep
b02dc1692f Clean up latest occurs effort 2009-05-03 17:05:02 -07:00
Tom Eastep
f533468da0 Resolve merge conflicts 2009-05-03 09:56:13 -07:00
Tom Eastep
79adcb964f Cosmetic improvements in tcclasses processing 2009-05-03 09:03:00 -07:00
Tom Eastep
90b07d849d Fix compile for export 2009-05-03 09:01:33 -07:00
Tom Eastep
16826aeb31 Remove IPMARK support 2009-05-03 08:38:27 -07:00
Tom Eastep
626b60ff0e Add error check 2009-05-02 17:28:50 -07:00
Tom Eastep
5e4196dafb Fix occurs suffix handling 2009-05-02 16:19:50 -07:00
Tom Eastep
4a9a8534e3 Finish fast per-IP classifier 2009-05-02 16:01:48 -07:00
Tom Eastep
3e0a55f072 Fix 'all' in the SOURCE of DNAT- rules 2009-05-02 13:23:29 -07:00
Tom Eastep
2aecb9ac12 More tcfilter readability improvements 2009-05-02 10:47:23 -07:00
Tom Eastep
8216a4e721 Simplify tcfilter generation -- take 2
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-02 09:46:54 -07:00
Tom Eastep
ababc533f1 Revert "Vastly simplify generation of tc filters"
This reverts commit 22da513b3a.
2009-05-02 09:33:21 -07:00
Tom Eastep
22da513b3a Vastly simplify generation of tc filters
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2009-05-02 09:25:27 -07:00
Tom Eastep
c1cf1695c0 Deprecate interface names in the SOURCE column of /etc/shorewall/masq 2009-04-29 15:13:22 -07:00
Tom Eastep
7cf5c32358 Treat Class IDs as hex rather than as decimal numbers 2009-04-23 12:43:57 -07:00
Tom Eastep
7cd9a2a983 Replace 'pref' by 'prio' in 'tc xxx add' commands 2009-04-21 16:44:41 -07:00
Tom Eastep
b6090948dd Allow compile to STDOUT 2009-04-21 09:41:23 -07:00
Tom Eastep
e465fea86a Better fix for '-0x...' handling 2009-04-21 07:08:47 -07:00
Tom Eastep
846af27ebf Fix Steven's other nit regarding -0x... 2009-04-20 20:39:38 -07:00
Tom Eastep
82bf6eb3f5 Revise WIDE_TC_MARKS classid generation 2009-04-20 17:54:33 -07:00
Tom Eastep
dcee6562a2 Fix another bug reported by Steven Springl 2009-04-20 16:35:48 -07:00
Tom Eastep
34791612b5 Implement WIDE_TC_MARKS. Fix problems reported by Steven Springl. 2009-04-20 13:26:47 -07:00
Tom Eastep
58fa0fe114 Clean up of shared optional provider fix 2009-04-20 10:28:18 -07:00
Tom Eastep
ec04636c86 Correct handling of optional shared providers 2009-04-20 08:30:15 -07:00
Tom Eastep
aa4afa6b66 Prepare 4.3.10 2009-04-19 17:37:36 -07:00
teastep
8d450e673c Change classid generation algorithm
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9939 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 19:56:04 +00:00
teastep
0bb8fffcd9 Add support for IPMARK -- Phase II
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9937 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 16:47:40 +00:00
teastep
32a1ac87f5 Add IPMARK target support -- first phase
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9936 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 15:46:57 +00:00
teastep
3cb7186e90 Modify regression test to ensure that modification timestamp of the output file changes
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9935 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-19 14:19:40 +00:00
teastep
322a5de871 Recommit lost commit
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9934 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 18:48:28 +00:00
teastep
834064f3af Cosmetic improvement to generated script
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9933 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:32:45 +00:00
teastep
985c551d26 Add IP, TC and IPSET configuration options
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9932 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:28:25 +00:00
teastep
b8988a2171 Handle empty setup_common()
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9930 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-18 16:20:06 +00:00
teastep
0cc60ea021 Avoid 'Invalid BROADCAST address' errors
Signed-off-by: Tom Eastep <teastep@shorewall.net>


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9919 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-17 22:57:59 +00:00
teastep
fd7108784f Allow Shorewall6 on kernel 4.2.24
Signed-off-by: Tom Eastep <teastep@shorewall.net>


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9908 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-17 16:04:54 +00:00
teastep
ade958dd51 Add undocumented LOGMARK log level
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9851 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-12 15:22:19 +00:00
teastep
347090da6e Correct netmask generation in tcfilters
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9850 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-12 15:22:00 +00:00
teastep
97e61965c0 Fix another inversion case
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9846 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-11 21:48:34 +00:00
teastep
de037034a5 Bump version to 4.3.9
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9845 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-11 15:31:25 +00:00
teastep
9bfc7b6d99 Tiny optimization.
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9844 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-11 15:28:50 +00:00
teastep
c39fcc4db7 Optimization of log rule code
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9843 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2009-04-10 20:36:22 +00:00
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