holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
10,747 Commits 104 Branches 736 Tags 54 MiB
a842fad629
Commit Graph

1789 Commits

Author SHA1 Message Date
Tom Eastep
254e1ed784 Add 'I' STATE to secmarks 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-06-02 11:43:55 -07:00
Tom Eastep
c3b56c1e73 Merge branch '4.4.20' 2011-06-02 10:07:03 -07:00
Tom Eastep
561d461a25 Add 'NI' STATE setting in secmarks. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-06-02 10:06:27 -07:00
Tom Eastep
1e883c2fdf Merge branch '4.4.20' 2011-06-02 06:47:09 -07:00
Tom Eastep
f9c5b8b0d5 Improve some comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-06-02 06:23:37 -07:00
Tom Eastep
36aee407ef Merge branch '4.4.20' 2011-06-01 13:01:27 -07:00
Tom Eastep
5f08605adc Delete some cruft 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-06-01 12:26:05 -07:00
Tom Eastep
243a09783c Merge branch '4.4.20' 2011-05-31 15:45:09 -07:00
Tom Eastep
7bf74bb8c9 Add new builtin targets to %builtin_target 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-31 15:43:42 -07:00
Tom Eastep
468ff6efab First cut at IPSET/Dynamic-zone support in Shorewall6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-31 11:23:43 -07:00
Tom Eastep
8df470b5f5 Version to 4.4.20 2011-05-31 09:30:18 -07:00
Tom Eastep
2f6c5fd260 Set 'bridge-nf-call-ip6?tables' if bridges are configured. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-31 06:59:43 -07:00
Tom Eastep
4f296b62ae Another fix for auditone 2011-05-30 16:37:56 -07:00
Tom Eastep
e6275ba31d Fix a bug in auditing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-30 15:28:00 -07:00
Tom Eastep
d89a915f26 Load IPv6 libraries when processing /etc/shorewall6/params 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-30 13:24:36 -07:00
Tom Eastep
26d08b92c0 Correct use of null value as a hash 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-30 11:38:49 -07:00
Tom Eastep
b0447b8bd3 Remove another MACLIST defect 2011-05-30 08:49:41 -07:00
Tom Eastep
60d33740f6 Fix MACLIST_DISPOSITION defect introduced earlier in this release 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-30 07:59:44 -07:00
Tom Eastep
11c209c55f Restore access to $Shorewall::Rules::family 2011-05-29 17:22:36 -07:00
Tom Eastep
2852cdeb53 Another attempt at the IPMARK fix 2011-05-29 14:42:23 -07:00
Tom Eastep
a71136fd5a Rework configuration files for Shorewall and Shorewall6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-29 14:34:18 -07:00
Tom Eastep
243e8f1dbe Fix check for unreferenced 'sfilter' chain 2011-05-28 08:31:36 -07:00
Tom Eastep
a37dbf76dc Delete 'sfilter' chain if it isn't referenced 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-27 19:56:54 -07:00
Tom Eastep
1a2c9a08e1 Don't include comment in audit chain rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-27 19:56:04 -07:00
Tom Eastep
bac640e731 Get changes from 4.5.0 branch 2011-05-27 19:42:09 -07:00
Tom Eastep
586a3537bf Delete 'sfiter' chain if it doesn't have referenes 2011-05-27 19:38:03 -07:00
Tom Eastep
790c96c90a Version to RC 1 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-27 09:11:47 -07:00
Tom Eastep
c6e9de65f1 Prevent duplicate 'filter' rules when combining two interface chains 
into the same zone forwarding chain.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-27 06:43:47 -07:00
Tom Eastep
fbfe7b9f93 Don't create 'reject' and AUDIT' in the 'stopped' case. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-26 14:11:36 -07:00
Tom Eastep
0287d96aa2 Finish filtering implementation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-26 13:38:44 -07:00
Tom Eastep
6c3163cc27 Routeback corrections 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-25 10:45:57 -07:00
Tom Eastep
e4d667ca6a Add routeback protection 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-24 17:07:31 -07:00
Tom Eastep
bbe165c3cf Bump version to Beta 5 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-24 11:40:11 -07:00
Tom Eastep
84b844ae79 Implement -T option for compile and check 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-24 10:21:49 -07:00
Tom Eastep
ee98772349 Add -c to the start command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-24 09:13:02 -07:00
Tom Eastep
f464ec5624 Fixes for AUDIT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-23 20:59:33 -07:00
Tom Eastep
c050b29985 Factor some similar code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-23 14:20:14 -07:00
Tom Eastep
15e9e3182d Update copyrights 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-23 10:06:56 -07:00
Tom Eastep
e95003b82a Add FAKE_AUDIT option 2011-05-22 17:42:50 -07:00
Tom Eastep
5d04c93a16 Implement LEGACY_FASTSTART option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-22 15:36:29 -07:00
Tom Eastep
981b503fa4 Bump version to Beta 4 2011-05-22 11:05:22 -07:00
Tom Eastep
529e256856 Assigned unused dev numbers 2011-05-22 10:18:26 -07:00
Tom Eastep
83cdf78b18 Replace A_* builtin actions with builtin targets 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-21 15:02:04 -07:00
Tom Eastep
71ef1f48e2 Allow auditing of the builtin actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-21 10:38:25 -07:00
Tom Eastep
82d6a00c9e Implement some extentions to AUDIT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-21 09:25:58 -07:00
Tom Eastep
61b5dbbb95 Eliminate cruft left over from when Action.pm and Policy.pm were folded into Rules.pm - Phase II 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-20 10:48:28 -07:00
Tom Eastep
f64e171c19 Eliminate cruft left over from when Action.pm and Policy.pm were folded into Rules.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-20 10:46:18 -07:00
Tom Eastep
ac2e9cce64 Shrink process_actions2 further. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-20 10:28:30 -07:00
Tom Eastep
676af32ebc Simplify a loop in process_actions2() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-20 10:11:23 -07:00
Tom Eastep
7cbf113ba0 Simplify an RE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-20 08:33:36 -07:00
Tom Eastep
d15475efae Cleanup of AUDIT before Beta 3 
- Correct merge snafus
- Rename the new actions (e.g., ADROP->A_DROP)
- Correct MACLIST_DISPOSITION logic
 2011-05-20 07:47:35 -07:00
Tom Eastep
e9df13a42b Resolve merge conflicts 2011-05-19 15:10:22 -07:00
Tom Eastep
5e68dbfa9a Complete first attempt at AUDIT support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-19 12:06:43 -07:00
Tom Eastep
814494e277 More AUDIT changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-19 08:35:40 -07:00
Tom Eastep
d2ab27c071 More AUDIT changes 2011-05-18 21:25:57 -07:00
Tom Eastep
ce8df2f66c Revert "Bump version to Beta 3" 
This reverts commit 465e729288.
 2011-05-18 17:50:12 -07:00
Tom Eastep
465e729288 Bump version to Beta 3 2011-05-18 17:08:07 -07:00
Tom Eastep
314921f766 Revert "Set quantum in subordinate SFQ class to the MTU for HFSC parents." 
This reverts commit 5ab6f8e0e5.
 2011-05-18 11:13:50 -07:00
Tom Eastep
166d27f6d4 Minor tweak to blacklisting 
Reverse order of tests for 'from' and 'src'.
Use equivalent logic for generating unknown option error

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-18 11:13:03 -07:00
Tom Eastep
5ab6f8e0e5 Set quantum in subordinate SFQ class to the MTU for HFSC parents. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-18 10:34:46 -07:00
Tom Eastep
568e54b50d Update version to Beta 2 2011-05-18 09:58:35 -07:00
Tom Eastep
e940f5018e Implement whitelisting. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-18 08:30:01 -07:00
Tom Eastep
cec07a6be5 Don't apply HTB quantum to HFSC 2011-05-17 18:34:41 -07:00
Tom Eastep
495aa9b9ac Implement NFLOG accounting action. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-17 13:42:13 -07:00
Tom Eastep
fd70e73d34 Add ACCOUNTING_TABLE option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-17 12:51:33 -07:00
Tom Eastep
680ca519ed Correct deletion of ipv6 'shorewall' chain 2011-05-17 11:33:56 -07:00
Tom Eastep
11ff245697 Don't generate refresh rules unless the command is 'refresh' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-16 13:08:32 -07:00
Tom Eastep
ffe7a1b777 Avoid inconsistencies and errors in refresh 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-16 11:34:41 -07:00
Tom Eastep
30f2fbff60 Issue warning on missing IPSET 2011-05-15 11:48:34 -07:00
Tom Eastep
72a330cba2 Don't emit degenerate tcfilters 2011-05-15 10:57:02 -07:00
Tom Eastep
e459fbf997 Don't allow non-leaf default class 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-15 10:56:46 -07:00
Tom Eastep
3f90f00081 Issue warnings and ignore non-leaf class in tcfilters and tcrules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-15 10:56:31 -07:00
Tom Eastep
7d25f6356b Augment a comment 2011-05-15 08:45:41 -07:00
Tom Eastep
c247140063 Restore 'our' to a couple of exported variables in the Config module 2011-05-14 14:18:22 -07:00
Tom Eastep
00add745b7 Use -o when copying routing tables 2011-05-14 13:56:39 -07:00
Tom Eastep
05e385a748 Only use 'our' when required 2011-05-14 13:21:31 -07:00
Tom Eastep
0626594cda Restore accuracy of tcclasses diagram 2011-05-14 09:27:51 -07:00
Tom Eastep
539e42aa2e Correct earlier patch 2011-05-09 16:34:31 -07:00
Tom Eastep
bbab1c9682 Ensure USER/GROUP is only specified when SOURCE in $FW 2011-05-09 16:33:34 -07:00
Tom Eastep
359de906ca Refinement to fix for double exclusion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-09 16:28:53 -07:00
Tom Eastep
1a48dd3eb9 Correct last merged patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-05-08 05:51:58 -07:00
Tom Eastep
93d8b538eb Ensure route to gateway in the main table 2011-05-08 05:43:53 -07:00
Tom Eastep
a1bd664447 Fix issues with 'gawk' 2011-05-08 05:39:07 -07:00
Tom Eastep
afed909e52 Simplify the fix for double exclusion in ipset lists 2011-05-07 06:38:08 -07:00
Tom Eastep
0c59e0231d Correct double-exclusion fix 2011-05-07 06:37:37 -07:00
Tom Eastep
58c25e8517 Let tcfilters deal correctly with hex device numbers 2011-05-05 10:12:20 -07:00
Tom Eastep
59ea511201 Complain if there is no default class defined 2011-05-05 10:12:14 -07:00
Tom Eastep
91d8f39f2e Enforce limits on device and class numbers 2011-05-05 10:11:47 -07:00
Tom Eastep
349960294c Detect double exclusion in ipset expressions 2011-05-05 10:11:30 -07:00
Tom Eastep
368fe46932 Correct Comment 2011-05-05 10:11:22 -07:00
Tom Eastep
d8c2845085 Back out part of TC change 2011-05-05 10:11:13 -07:00
Tom Eastep
9a95bad17e Don't require '0x' on devnum > 10 in tcclasses 2011-05-05 10:06:55 -07:00
Tom Eastep
4300ef3ee2 Fix another couple of bugs with device numbers > 9 2011-05-05 10:06:41 -07:00
Tom Eastep
222c5dbf46 Normalize hex numbers before using them in string comparisons 2011-05-02 10:08:36 -07:00
Tom Eastep
e66d491f11 Correct patch for > 9 interfaces with tcfilters 2011-05-02 10:08:19 -07:00
Tom Eastep
bf10e104b7 Fix bug in tcfilters with device numbers > 9 2011-05-02 07:25:21 -07:00
Tom Eastep
d2407cb7a0 Don't allow IFB classes in tcrules 2011-05-02 07:23:28 -07:00
Tom Eastep
a0b00b4bd6 More fixes for TC 2011-05-01 21:24:52 -07:00
Tom Eastep
61c654634b Correct some TC issues 2011-05-01 06:40:14 -07:00
Tom Eastep
e2b1069c1c Support ipsets in the ORIGINAL DEST column for DNAT and REDIRECT rules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-28 12:22:26 -07:00
Tom Eastep
59024ff49d Delete some blank lines 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-24 08:29:28 -07:00
Tom Eastep
67e920eb53 Use del/add for provider ipv6 routes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-19 10:56:59 -07:00
Tom Eastep
1bcba8bbc7 Update version of changed Perl modules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-19 10:02:29 -07:00
Tom Eastep
ec8bb8049a Delete/Add routes for NDP rather than replace 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-19 09:40:24 -07:00
Tom Eastep
1a0388080f Initiate 4.4.20 
Update versions
    Update release documents
    Apply Togan Muftuoglu's change to increase installation flexibility
 2011-04-16 08:31:46 -07:00
Tom Eastep
4f5970b5f2 Use 'ip route list' rather than 'ip route ls' for busybox compatability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-15 11:15:32 -07:00
Tom Eastep
d42a65fd11 Correct one more default route save/restore defect 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-15 07:09:34 -07:00
Tom Eastep
dff405683c Correct default route save/restore 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-14 12:25:33 -07:00
Tom Eastep
96af7bfed6 Fix the prior commit 2011-04-13 17:56:15 -07:00
Tom Eastep
9a8f411531 Update version to 4.4.19.1 and document corrected problems 2011-04-13 17:22:07 -07:00
Tom Eastep
9008cd960c Fix a silly masq bug 2011-04-13 17:01:22 -07:00
Tom Eastep
16276b9900 Don't assume that all nexthop routes are default routes 2011-04-13 13:57:22 -07:00
Tom Eastep
a0b16e2803 Delete duplicate rule 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-13 06:56:17 -07:00
Tom Eastep
5919c234f4 Update version of IPAddrs.pm 2011-04-12 07:21:24 -07:00
Tom Eastep
53571043c0 Fix another proto editing defect 2011-04-11 17:18:39 -07:00
Tom Eastep
18f4b11b09 Don't allow '\!0' in the PROTO column 2011-04-11 16:25:19 -07:00
Tom Eastep
73754521b1 Correct Perl module versions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-04-11 15:05:18 -07:00
Tom Eastep
ca46052410 Fix file name in split_line error message for proxyndp file 2011-04-10 13:19:42 -07:00
Tom Eastep
512008170d Revert "Fold some long lines" 
This reverts commit 3674cfd387.
 2011-04-10 11:20:50 -07:00
Tom Eastep
3674cfd387 Fold some long lines 2011-04-10 10:10:00 -07:00
Tom Eastep
8abc78331b Two minor cosmetic changes 2011-04-10 09:52:00 -07:00
Tom Eastep
1be89edb49 Version to 4.4.19 2011-04-09 07:58:13 -07:00
Tom Eastep
92611d6789 A couple of tweaks before releasing RC1 2011-04-08 07:50:54 -07:00
Tom Eastep
7ab55f4217 Ensure that the PREROUTING->dnat jump is added when a wildcard interface is present 2011-04-06 15:14:39 -07:00
Tom Eastep
755c3cfd80 Quote param values that include shell metacharacters 2011-04-06 14:52:32 -07:00
Tom Eastep
6626ef06fb Fix yet another optimizer bug 2011-04-06 10:10:42 -07:00
Tom Eastep
159c871f18 Make simple TC work with both IPv4 and IPv6 2011-04-04 09:55:45 -07:00
Tom Eastep
7466895919 Revert tcpri change 2011-04-04 09:14:46 -07:00
Tom Eastep
3b0da84b8d Exit POSTROUTING early if a mark is restored 2011-04-04 08:19:58 -07:00
Tom Eastep
c1160ec076 Version to RC1 2011-04-03 15:54:36 -07:00
Tom Eastep
8609c97d1c Version to Beta 5 2011-04-03 10:30:33 -07:00
Tom Eastep
86f4d3bad6 Revert "Set version RC1" 
This reverts commit ae9558c7c6.
 2011-04-03 10:28:20 -07:00
Tom Eastep
ae9558c7c6 Set version RC1 2011-04-03 10:04:53 -07:00
Tom Eastep
cc633c5bd9 Shorewall 4.4.19 Changes 2011-04-03 09:56:30 -07:00
Tom Eastep
26e7f86c87 Fix icmp u32 match with type/code 2011-03-19 14:29:03 -07:00
Tom Eastep
742aa95660 Tighten editing of TC_PRIOMAP value 2011-03-17 11:50:13 -07:00
Tom Eastep
965ab0257f Correct fix for Tuomo's problem 2011-03-13 15:24:48 -07:00
Tom Eastep
f5d06024fc Bump version to 4.4.18.1 2011-03-13 07:56:12 -07:00
Tom Eastep
8383a6e75a Eliminate extra newline in WARNING message 2011-03-13 07:52:25 -07:00
Tom Eastep
68b15c9544 Fix for Tuomo's params issue 2011-03-13 07:47:06 -07:00
Tom Eastep
57f1a0fa34 Accomodate tcfilters entries for non-present interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-03-03 07:44:12 -08:00
Tom Eastep
0283a8eeec Fix for previous commit 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-03-03 07:43:37 -08:00
Tom Eastep
87240b00c9 Update version of the Tc module 2011-03-02 07:52:38 -08:00
Tom Eastep
1bbd963c3f Bump version to 4.4.18 2011-03-02 07:43:03 -08:00
Tom Eastep
329655cc66 Make burst in tcdevices IN-BANDWIDTH column work 2011-03-02 07:34:55 -08:00
Tom Eastep
e4e574605e Fix an edit about duplicate device:class 2011-03-01 20:48:40 -08:00
Tom Eastep
f92349edba Correct handling of IPv6 address used in a net context 2011-03-01 13:49:19 -08:00
Tom Eastep
428e898bfe Update version to RC1 2011-02-28 15:24:04 -08:00
Tom Eastep
9decf354d5 Update the version of the Config module 2011-02-24 16:50:48 -08:00
Tom Eastep
de7a0df550 Cosmetic changes to the Chains module 2011-02-24 15:56:50 -08:00
Tom Eastep
951f641a6c Cleanup of Rules file 2011-02-21 08:13:46 -08:00
Tom Eastep
fcebdc3ec2 Correct typo in Chains module 2011-02-21 08:09:33 -08:00
Tom Eastep
cf60752988 Move section processing to the Rules module where it belongs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-02-20 15:35:58 -08:00
Tom Eastep
c03caf7c2f Combine the Policy and Rules modules 2011-02-20 11:28:47 -08:00
Tom Eastep
052bc87bd5 Set version to Beta 4 2011-02-20 09:20:43 -08:00
Tom Eastep
b90ea8a9e0 Change default for MODULE_PREFIX 2011-02-20 08:52:07 -08:00
Tom Eastep
685de1c588 Cosmetic changes to the Accounting module" 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-02-19 15:50:18 -08:00
Tom Eastep
f44b643038 Fix another bug with tri-value 2011-02-19 15:46:06 -08:00
Tom Eastep
e69de13eff Fix common-rule/action2 processing order 2011-02-19 15:44:39 -08:00
Tom Eastep
59ac90d717 Couple of minor issues in the Chains module 2011-02-19 09:08:43 -08:00
Tom Eastep
30768a03d1 Bump version to Beta 3 2011-02-19 08:55:28 -08:00
Tom Eastep
974a542585 Improve MARK column validation 2011-02-19 08:18:21 -08:00
Tom Eastep
9173b22b58 Disallow USER/GROUP anywhere but in the OUTPUT section 2011-02-19 08:00:00 -08:00
Tom Eastep
cf2d4e154f Add a comment 2011-02-18 21:05:44 -08:00
Tom Eastep
d8c36da069 Make reserved name illegal for Actions -- take 2 2011-02-18 17:46:41 -08:00
Tom Eastep
011c90e6b8 Make reserved name illegal for Actions 2011-02-18 17:44:14 -08:00
Tom Eastep
b4946dcf65 Enforce a couple of accounting restrictions 2011-02-18 16:47:12 -08:00
Tom Eastep
e47cb61c33 Introduce 'accountfwd' chain for forwarded accounting in sectioned configuration 2011-02-18 15:44:55 -08:00
Tom Eastep
2e2472a15a Tighen up an RE 2011-02-17 17:56:29 -08:00
Tom Eastep
58e480b502 Correct defects in the prior commit 2011-02-17 17:35:56 -08:00
Tom Eastep
993bdc740d Make it invalid to to use a config file name as a chain name 2011-02-17 16:31:22 -08:00
Tom Eastep
b06630091d Make procedure to delete a chain plus references to it; make exclusion chains begin with '~' 2011-02-17 14:53:39 -08:00
Tom Eastep
6f00f2127c Delete optimize_okay() and add a couple of assertions 2011-02-17 10:48:46 -08:00
Tom Eastep
5634b08e22 Don't clear dont_optimize flag in accounting in sectioned configuration 2011-02-17 10:47:57 -08:00
Tom Eastep
300d931922 Assert correctness in decrement_reference_count() 2011-02-16 13:16:42 -08:00
Tom Eastep
fa8c8f5850 Dont optimize chains with RETURN 2011-02-16 13:15:29 -08:00
Tom Eastep
030839e4a4 Remove recursive_delete_references 2011-02-16 12:49:04 -08:00
Tom Eastep
2974167f06 Finally fix issue with copy_rules() 2011-02-16 10:08:11 -08:00
Tom Eastep
b03e3b94ef More optimization fixes 2011-02-15 19:24:14 -08:00
Tom Eastep
99f38bfca1 Make the source-net and dest-match routines more readable 2011-02-14 20:11:38 -08:00
Tom Eastep
32f341c279 Correct optimization fix 2011-02-14 16:54:27 -08:00
Tom Eastep
6a9ca303d1 Remove masking declaration 2011-02-14 15:56:02 -08:00
Tom Eastep
4ad9a83996 Centralize handling of MACs in the Chains module 2011-02-14 15:34:11 -08:00
Tom Eastep
0fa027802f Don't allow accounting or manual changes to have the name of a builtin target 2011-02-14 10:50:04 -08:00
Tom Eastep
3b7232a5fa Fix a bug in the optimizer 2011-02-14 10:00:28 -08:00
Tom Eastep
59e361e93e Split the 'restriction' member into two members 2011-02-14 09:22:27 -08:00
Tom Eastep
e64070f9e1 Restore loop detection in sectioned accounting rules 2011-02-13 16:38:01 -08:00
Tom Eastep
dd81eedb42 Fix another accounting sectioning bug 2011-02-13 14:32:11 -08:00
Tom Eastep
46a99a7cd9 Correct Config.pm version again 2011-02-13 11:46:56 -08:00
Tom Eastep
567824b7e2 Correct Config.pm version 2011-02-13 11:45:46 -08:00
Tom Eastep
95f8100696 Cosmetic change 2011-02-13 11:34:53 -08:00
Tom Eastep
b1abb3f554 Don't do unref/loop detection when accounting file is sectioned 2011-02-13 11:13:43 -08:00
Tom Eastep
a1eefea224 Fix FORWARD chain jumps with sectioning 2011-02-13 08:23:48 -08:00
Tom Eastep
1438332bbe Remove hard-coded 0.0.0.0/0 from Providers.pm 2011-02-13 08:13:22 -08:00
Tom Eastep
5c0b592934 Section the accounting file 2011-02-12 12:47:15 -08:00
Tom Eastep
195903444d Insist that SECTION headers have exactly two columns 2011-02-12 07:54:20 -08:00
Tom Eastep
677bd08d5d Add more targets 2011-02-11 17:13:48 -08:00
Tom Eastep
4acdc5314a Add 'NG' value for ACCOUNTING 2011-02-11 17:01:10 -08:00
Tom Eastep
9e921beb49 Fix a tri-value bug 2011-02-11 16:53:49 -08:00
Tom Eastep
af363888ab Alphabetize the builtin target list 2011-02-10 16:55:04 -08:00
Tom Eastep
64614b7464 Add CLASSIFY to the builtin targets 2011-02-10 16:46:44 -08:00
Tom Eastep
2885081d86 Add more keywords to %builtin_targets 2011-02-10 13:11:58 -08:00
Tom Eastep
a3232516bb Detect loops in accounting chain jumps 2011-02-09 15:43:19 -08:00
Tom Eastep
88244dc132 Don't allow MAC addresses in the accounting file 2011-02-07 17:12:43 -08:00
Tom Eastep
b4b59119ef Don't allow non-accounting chain in the CHAIN accounting column 2011-02-07 16:32:38 -08:00
Tom Eastep
6e66736d28 Make IPv6 logic safer; cosmetic improvements in the generated script 2011-02-06 08:57:48 -08:00
Tom Eastep
2c2fdab0fe Rename USE_LOCAL_MODULES to EXPORTMODULES 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-02-06 08:42:35 -08:00
Tom Eastep
2b8579c090 Tweak USE_LOCAL_MODULES change 
Make the "Other than /usr/share" test dependent on export

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-02-06 08:28:10 -08:00
Tom Eastep
106f23634c Make use of USE_LOCAL_MODULES independent of export 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-02-06 08:15:16 -08:00
Tom Eastep
88bce4100a Initiate 4.4.18 2011-02-05 16:41:34 -08:00
Tom Eastep
c557ec3740 Bump version of Tc module 2011-02-04 07:46:35 -08:00
Tom Eastep
ea2c72d1b1 Prepare for 4.4.17 2011-02-04 06:44:02 -08:00
Tom Eastep
838c7ac57b Change a comment 2011-02-03 17:22:04 -08:00
Tom Eastep
23eef3b215 Normalize IPv6 addresses in decompose_net 2011-02-03 09:57:47 -08:00
Tom Eastep
4ed4443abb Do a fancier job of comparing networks 2011-02-03 09:44:46 -08:00
Tom Eastep
27684908c4 Catch mis-matched nets in per-IP accounting rules 2011-02-03 09:25:13 -08:00
Tom Eastep
d68d40ee1c Correct an optimization bug involving empty/unreferenced chains 2011-02-03 09:12:50 -08:00
Tom Eastep
98ad7e15b0 Don't optimize the accounting chain 2011-02-03 08:45:54 -08:00
Tom Eastep
953c0b48de Fix several issues with IPv6 tcfilters 2011-02-03 08:28:00 -08:00
Tom Eastep
207db033b8 Disallow '.' in accounting and manual chain names 2011-02-01 12:58:05 -08:00
Tom Eastep
4e7f656a5b Better ACCOUNT(...) parsing 2011-01-31 20:17:56 -08:00
Tom Eastep
f8e6c80ca0 Tighen up editing of ACCOUNT(...) 2011-01-31 10:14:10 -08:00
Tom Eastep
fbdd4b5ede Ensure that accounting and manual chains aren't too long 2011-01-31 06:56:38 -08:00
Tom Eastep
5f76de3bda Fix Config version 2011-01-30 12:35:31 -08:00
Tom Eastep
303afe8c7e Some accounting fixes (code and docs) 2011-01-30 09:39:14 -08:00
Tom Eastep
b1f6895a1f Correct a couple of versions 2011-01-30 08:41:33 -08:00
Tom Eastep
70fc8bdfb6 Add support for per-IP accounting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-01-30 07:20:05 -08:00
Tom Eastep
4cc8e5422d Add ACCOUNT target detection 2011-01-30 07:14:08 -08:00
Tom Eastep
1c48a9dbd3 Fix a couple of defects in module loading 2011-01-29 12:42:22 -08:00
Tom Eastep
7555a0953d Add conditional logic for optional run-time address variables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-01-29 12:15:34 -08:00
Tom Eastep
1b87405d96 Fix silly bug in expand_rule() 2011-01-29 08:45:20 -08:00
Tom Eastep
7421a679ba Bump version of the Nat module 2011-01-28 16:46:36 -08:00
Tom Eastep
f3aedcf805 Allow runtime address variables in the ADDRESS column of the masq file 2011-01-28 16:32:53 -08:00
Tom Eastep
156b04c380 Implement Run-time Address Variables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-01-26 09:08:48 -08:00
Tom Eastep
82913abeca Specify 'mpu' when creating TBF 2011-01-23 09:23:17 -08:00
Tom Eastep
a2b440b093 Add USE_LOCAL_MODULES option 2011-01-22 08:13:17 -08:00
Tom Eastep
c0d5a32d11 Fix typo in alignment patch 2011-01-21 06:56:30 -08:00
Tom Eastep
3a5d664305 Fix 'check -r' output when OPTIMIZE=8 or OPTIMIZE=9 2011-01-21 06:52:58 -08:00
Tom Eastep
20cd9848f6 Align some assignments in the Config Module 2011-01-21 06:51:35 -08:00
Tom Eastep
24412c9498 Fix empty variable handling when /bin/sh is bash 2011-01-20 08:19:42 -08:00
Tom Eastep
9d06125129 Bump Version to Beta 2 2011-01-19 15:38:51 -08:00
Tom Eastep
d5f3b31032 Handle lines containing only 'INCLUDE' 2011-01-18 14:58:56 -08:00
Tom Eastep
eaa08ab76f Fix typo that broke ULOG 2011-01-16 09:45:49 -08:00
Tom Eastep
3074d3009f Tom being anal 2011-01-15 20:59:59 -08:00
Tom Eastep
4ea02a5e72 Eliminate silly duplication 2011-01-15 19:20:24 -08:00
Tom Eastep
370cd04408 Remove unneeded line of code in export_params() 2011-01-15 15:56:37 -08:00
Tom Eastep
265ca85d02 Allow INCLUDE in extension scripts 2011-01-15 15:43:45 -08:00
Tom Eastep
5c4da0b581 Use open_file()/close_file() in copy1 2011-01-15 14:33:16 -08:00
Tom Eastep
978e8e3849 Only issue 'done.' progress message on success 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-01-14 11:46:38 -08:00
Tom Eastep
12eaf81dcc Add some comments 2011-01-13 19:59:17 -08:00
Tom Eastep
8da9f4183a Tweaks to 4.4.17 2011-01-10 19:35:45 -08:00
Tom Eastep
2be63c9406 Delete unneeded exports 2011-01-10 19:30:38 -08:00
Tom Eastep
10ae1c7dde Don't export read_a_line1() 2011-01-10 19:14:10 -08:00
Tom Eastep
a04e854f21 Simplify exception processing in process_rules1() 2011-01-10 17:02:12 -08:00
Tom Eastep
fd6afa7742 Minor fixes to comments 2011-01-09 15:56:01 -08:00
Tom Eastep
3392312cef Automate the maintenance of the hash of compiler-defined entries in %params 2011-01-09 13:12:36 -08:00
Tom Eastep
0dc4cd7937 Don't quote param values unnecessarily; add a comment to the emitted params 2011-01-09 12:14:48 -08:00
Tom Eastep
3bb67423c3 Tweak release notes 2011-01-09 11:31:38 -08:00
Tom Eastep
08f09d7de0 Deprecate EXPORTPARAMS 2011-01-09 10:12:36 -08:00
Tom Eastep
14c4bd99aa Don't lookup standard target if target is an action, macro, or chain 2011-01-09 10:10:27 -08:00
Tom Eastep
97bba29c07 Add lookup hash for standard targets 2011-01-08 15:29:10 -08:00
Tom Eastep
8dc60e788f Avoid early return in process_action() 2011-01-08 14:05:27 -08:00
Tom Eastep
6143c7ddbd Improve readability of logging logic in expand_rule() 2011-01-08 09:07:32 -08:00
Tom Eastep
bdbc9ab29d Initiate 4.4.17 2011-01-08 08:00:56 -08:00
Tom Eastep
ad57272c7f Fix tag handling in Limit() 2011-01-05 17:21:50 -08:00
Tom Eastep
974aeb9e39 Reword a comment 2011-01-03 18:48:09 -08:00
Tom Eastep
e3c16b8233 Different way to catch empty parameter lists 2011-01-03 17:56:07 -08:00
Tom Eastep
014d0eb607 Don't recognize an empty param list 2011-01-03 17:06:54 -08:00
Tom Eastep
b7a9a48508 Handle COUNT:<level> correctly 2011-01-03 14:29:10 -08:00
Tom Eastep
8400a2ab31 Handle ':' in a param 2011-01-03 12:18:04 -08:00
Tom Eastep
33b54e4ebe Version to 4.4.16 2011-01-03 09:00:39 -08:00
Tom Eastep
fe86964fd6 Move and reword an error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-01-02 08:42:09 -08:00
Tom Eastep
f6228ca31b Two error messages: 
- Disallow server port in ACTION rule.
- Add server IP address in message re: REDIRECT

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-01-02 08:20:28 -08:00
Tom Eastep
b3598f3766 Validate action names 2011-01-02 07:09:42 -08:00
Tom Eastep
cb372cf2cd Change a couple of comments 2011-01-01 16:13:38 -08:00
Tom Eastep
d64edf3470 Clone a small function 2011-01-01 11:19:53 -08:00
Tom Eastep
8f0d0ac5a7 Use external representation in recursive call message 2011-01-01 09:18:10 -08:00
Tom Eastep
d71c11791f Report normalized action names in recursive call message 2011-01-01 09:06:11 -08:00
Tom Eastep
4da682365d Restore ability to detect recursive action invocations 2011-01-01 08:58:00 -08:00
Tom Eastep
ed3b336a81 Correct prototype 2011-01-01 06:55:10 -08:00
Tom Eastep
fc2d76aa7a Move a function; don't export %policy_actions 2010-12-31 16:58:06 -08:00
Tom Eastep
e1b4e345fb Add Eclipse files to project 2010-12-31 15:19:56 -08:00
Tom Eastep
8e6fdceeb5 Back out useless change 2010-12-31 14:30:31 -08:00
Tom Eastep
b36ad0d065 Change several more compiler progress messages 2010-12-31 14:19:31 -08:00
Tom Eastep
f8e04b4110 Change a couple of compiler progress messages 2010-12-31 14:12:57 -08:00
Tom Eastep
e0d2eb997d Restore the name 'process_rule1' 2010-12-31 12:41:01 -08:00
Tom Eastep
1bdaf862d3 Populate %targets out of new_action() 2010-12-31 10:36:07 -08:00
Tom Eastep
6c14c76ab5 Another comment 2010-12-31 08:37:56 -08:00
Tom Eastep
aa6754cb40 Add a comment 2010-12-31 07:51:15 -08:00
Tom Eastep
d4d1bb7b41 Bump version of the Zones module 2010-12-30 13:14:07 -08:00
Tom Eastep
33ff6db6bc Whitespace changes 2010-12-30 12:25:22 -08:00
Tom Eastep
cd7f94dbdb Merge branch 'master' into 4.4.16 2010-12-30 10:37:15 -08:00
Tom Eastep
746c2a5163 Correct comment about the action member of the chain structure 2010-12-30 10:36:03 -08:00
Tom Eastep
cb751bd225 Remove extraneous change log entries 2010-12-30 10:02:39 -08:00
Tom Eastep
91227b6d13 Don't log jumps to NAT actions 2010-12-30 09:56:44 -08:00
Tom Eastep
d8541e4a58 Update problems corrected 2010-12-30 08:05:04 -08:00
Tom Eastep
e3d1032ab3 Set version to Beta 8 2010-12-30 07:32:30 -08:00
Tom Eastep
3c4cddeeeb Eliminate process_action3() 2010-12-30 06:56:21 -08:00
Tom Eastep
d767d9fea3 Better Editing of BLACKLIST_DISPOSITION 2010-12-29 18:43:14 -08:00
Tom Eastep
1c55143524 Allow parameterized Limit to use log tags 2010-12-29 12:20:18 -08:00
Tom Eastep
230d284980 Correct a couple of comments 2010-12-29 11:36:59 -08:00
Tom Eastep
b7d936dd8e Merge levels in process_action2() 2010-12-29 08:23:44 -08:00
Tom Eastep
a4bf11c7d5 Some cosmetic cleanup 2010-12-28 17:18:43 -08:00
Tom Eastep
d90d56161c Improve readability 2010-12-28 16:42:28 -08:00
Tom Eastep
7d41e4b38c Restore level merge behavior with nested actions 2010-12-28 16:04:55 -08:00
Tom Eastep
17ed14a895 Update comments in the Rules module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-12-28 16:02:10 -08:00
Tom Eastep
17a3ca62d5 Eliminate the Actions module 2010-12-28 13:51:45 -08:00
Tom Eastep
3d4aaad0eb Remove a couple of superfluous tests 2010-12-28 12:53:16 -08:00
Tom Eastep
4a8f724f9b Handle duplicate chain name for action chain 2010-12-28 12:18:42 -08:00
Tom Eastep
50a3b76e40 Rename a variable; reformat an error message 2010-12-28 07:49:35 -08:00
Tom Eastep
cc30fc4dbb Eliminate max nest level on actions 2010-12-27 17:16:34 -08:00
Tom Eastep
0c3ed598ca Improve diagnostic 2010-12-27 17:02:06 -08:00
Tom Eastep
297df02047 Catch loops in action invocation graph 2010-12-27 16:41:53 -08:00
Tom Eastep
6a1487d628 Correct existing optimization issue 2010-12-27 12:31:34 -08:00
Tom Eastep
215c05d12b Add some comments -- fix logging with NAT actions 2010-12-27 09:05:44 -08:00
Tom Eastep
d5ac12a8ff Bump version to RC 1 2010-12-27 07:49:52 -08:00
Tom Eastep
311797e0bf Create nat chain during pre-processing of nat action 2010-12-27 07:47:16 -08:00
Tom Eastep
79cbfd0126 Allow '--' to specify '-' as an action parameter 2010-12-26 17:03:05 -08:00
Tom Eastep
4111432a52 Implement optional action parameters 2010-12-26 16:13:53 -08:00
Tom Eastep
d8bcbffb88 Dead code removal 2010-12-26 12:08:10 -08:00
Tom Eastep
d1d9518c42 Move process_action2() 2010-12-26 11:44:15 -08:00
Tom Eastep
088480e5d9 Fix a couple of bugs 2010-12-26 11:34:58 -08:00
Tom Eastep
8f9d5a967b Simplify variable substitution 2010-12-26 11:07:00 -08:00
Tom Eastep
d4d285af39 Revert version to Beta 7 2010-12-26 09:01:15 -08:00
Tom Eastep
4fdec73808 Fix target of <action(params)> 2010-12-26 07:58:20 -08:00
Tom Eastep
758a50fa84 Extantiate params during module processing 2010-12-25 14:48:14 -08:00
Tom Eastep
bdc3ca16a4 Finish revision of action processing 2010-12-25 14:28:57 -08:00
Tom Eastep
8218cb3444 Pass normalized action name to process_rule_common() 2010-12-25 10:15:08 -08:00
Tom Eastep
39f4f03b60 Segregate process_action1() from process_actions1() 2010-12-25 08:21:32 -08:00
Tom Eastep
1285b73d52 Simplify detection of action self-invocation 2010-12-25 08:10:23 -08:00
Tom Eastep
6240d41754 Add new progress message 2010-12-25 07:41:18 -08:00
Tom Eastep
ce8f33b623 Add a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-12-23 15:38:47 -08:00
Tom Eastep
5e642a1406 Update a comment 2010-12-23 15:34:07 -08:00
Tom Eastep
b100991cfa Add a couple of comments; move a declaration; simplify a statement 2010-12-23 14:17:22 -08:00
Tom Eastep
8ad7300165 Fix NONAT and NATONLY rules in an action 2010-12-23 07:49:20 -08:00
Tom Eastep
37a383ea4d Used normalized names in requires list 2010-12-22 16:57:59 -08:00
Tom Eastep
a51eac91b0 Add documentation for parameterized actions 2010-12-22 15:09:54 -08:00
Tom Eastep
c6e35be8bc Update version to RC 1 2010-12-22 14:37:10 -08:00
Tom Eastep
350f20fc7e Add a comment 2010-12-22 14:35:19 -08:00
Tom Eastep
e8de4ce563 Add an <action> member to the chain table 2010-12-22 10:59:02 -08:00
Tom Eastep
e52feb7da7 Fix another bug 2010-12-21 17:50:35 -08:00
Tom Eastep
f3abf56cac Restore proper NAT in action handling 2010-12-21 15:20:19 -08:00
Tom Eastep
b8d5e09b58 Put a couple of routines back in the Rules module 2010-12-21 14:57:46 -08:00
Tom Eastep
7052738cd0 Remove param manipulation routines for now 2010-12-21 13:38:10 -08:00
Tom Eastep
ffbcd1b1fe Catch an action that invokes itself 2010-12-21 13:20:44 -08:00
Tom Eastep
ac42fddbce Finish (unpublished) parameterized actions 2010-12-21 12:29:52 -08:00
Tom Eastep
6263689c3e Allow Limit to accept parameters 2010-12-21 11:38:54 -08:00
Tom Eastep
7989f5094e Implement a better solution to down shared gateways 2010-12-21 11:15:41 -08:00
Tom Eastep
25e93b4df3 Change dummy MAC address. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-12-21 09:22:58 -08:00
Tom Eastep
242a9f5a98 Remove trailing whitespace 2010-12-20 15:16:20 -08:00