holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
9,008 Commits 104 Branches 736 Tags 54 MiB
224f1798af
Commit Graph

743 Commits

Author SHA1 Message Date
Tom Eastep
fca404eeaf Update version to 4.4.9 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-03 10:02:02 -07:00
Tom Eastep
c7848be266 Back out the rest of the original change for dup / -[psiod] 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-03 09:59:25 -07:00
Tom Eastep
70c6a2cdf3 Update version to 4.4.9-RC2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-02 07:25:50 -07:00
Tom Eastep
639b3ea57d Simplify checking for /! -[piosd] / 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-01 09:13:16 -07:00
Tom Eastep
311372013d More fixes to optimization 
Only disallow / ! -[piosd] / if the target is a chain

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-01 08:58:41 -07:00
Tom Eastep
518416ec2e Add a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-01 08:08:39 -07:00
Tom Eastep
94c6b37e8e Avoid leaving an orphan '!' behind. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-01 07:51:24 -07:00
Tom Eastep
219b2e0761 A more comprehensive solution to multiple -[piosd] matches. 
- eliminate duplicate -[piosd] matches in merged rules
- avoid tracing !* unconditionally

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-01 07:26:25 -07:00
Tom Eastep
16161d9cfc Add new trace types. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-05-01 06:43:09 -07:00
Tom Eastep
1173518d78 More minor cleanup of first code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-30 07:22:09 -07:00
Tom Eastep
076da4bd5c Couple of tweaks to my earliest code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-29 11:19:50 -07:00
Tom Eastep
2c1cede54e Revise addressless bridge change 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-27 15:23:38 -07:00
Tom Eastep
d8b0f496df Allow simple configuration of a bridge with no IP address 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-27 12:26:58 -07:00
Tom Eastep
988f7c4d7e More fixes for bad NAT optimization 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-26 16:50:18 -07:00
Tom Eastep
0e4698d57c Fix rare optimization bug 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-26 16:19:58 -07:00
Tom Eastep
6d61e962eb Use -m conntrack if available in place of -m state 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-25 13:35:41 -07:00
Tom Eastep
21e0c68ef2 Bump version to 4.4.9 RC1 2010-04-25 09:37:17 -07:00
Tom Eastep
fb2ddcee7b Bump Version to 4.4.9 Beta 5 2010-04-24 21:53:12 -07:00
Tom Eastep
b821bdcdfd One more pass at improving regex's for target isolation and matching 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-22 14:45:34 -07:00
Tom Eastep
64bf772594 Set OUTPUT policy to ACCEPT when optimize_chain deletes all of its rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-22 13:38:38 -07:00
Tom Eastep
fb754b3a2e Don't remove a lone ACCEPT rule from the OUTPUT chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-22 11:35:14 -07:00
Tom Eastep
a1a78cf09b Abandon the fantesy that multiple optimize 8 passes will achieve anything. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-16 17:12:08 -07:00
Tom Eastep
c52a3dcd14 Don't generate policy chains for fw to bridgeport zones. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-16 09:56:11 -07:00
Tom Eastep
1030c852f9 Simplify a test 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-16 09:21:30 -07:00
Tom Eastep
e7a4aaafc1 Modify optimization 8 loop to continue until no chains are combined. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-16 09:17:57 -07:00
Tom Eastep
4f00de0c57 Make additional optimize 8 passes. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-16 08:42:25 -07:00
Tom Eastep
21b44ac42b Change version to 4.4.9-Beta4 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-16 07:25:53 -07:00
Tom Eastep
82d6ba511f Unify the REs that look for '-[jg] <chain>' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-15 18:02:31 -07:00
Tom Eastep
cec59360f6 Use '-j' rather than '-g' when jumping to tcpre, just to be safe 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-15 14:14:13 -07:00
Tom Eastep
46d207a86f Restore original amount of whitespace in maclist rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-15 14:13:37 -07:00
Tom Eastep
e9a94b0cfb Unify reference count adjustment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-15 14:12:48 -07:00
Tom Eastep
cf59d9ec68 Fix an optimize 8 bug. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-15 12:45:00 -07:00
Tom Eastep
c1bcf360ee Fix another 'add_rule' that should have been an 'add_jump' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-15 09:59:57 -07:00
Tom Eastep
96d69bd8c3 Centralize message generation; optimize optimization-8 loop 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-15 09:29:37 -07:00
Tom Eastep
cff6f0010f Remove chain name after '-A' (again). 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-14 17:05:03 -07:00
Tom Eastep
f8bacb54ef Optimize 8 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-14 13:21:10 -07:00
Tom Eastep
4137961169 Speed up the replace_references* functions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-11 09:00:24 -07:00
Tom Eastep
715ea9ef32 Speed up delete_jumps() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-11 08:38:14 -07:00
Tom Eastep
76b9ef7005 Use unshift rather than splice for readability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-10 09:25:29 -07:00
Tom Eastep
2e443df8e3 Adjust references in move_rules() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-10 09:09:46 -07:00
Tom Eastep
ff73d802da More cleanup of rule and chain deletion: 
- Rename purge_jumps() to delete_jumps()
- Add delete_chain() function
- Remove an unnecessary assertion

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-10 08:37:17 -07:00
Tom Eastep
1de304bfd9 Relocate purge_jumps() and change the loop exit condition to be a bit safer. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-09 13:51:44 -07:00
Tom Eastep
14477d61fe Verify that purge_jumps() reset the 'to' chain's referenced flag. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-09 12:28:01 -07:00
Tom Eastep
2ff1df53da Unify chain deletion. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-09 11:38:18 -07:00
Tom Eastep
7a831107c7 Replace the complex rule deletion loops with C-stype for loops. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-09 09:58:32 -07:00
Tom Eastep
9dc8267888 Don't apply RE to rules that we've already checked. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-09 09:46:07 -07:00
Tom Eastep
1e078b8c8d Use splice() to delete rules from chains 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-09 09:38:03 -07:00
Tom Eastep
56bc28a182 Prepare 4.4.9 Beta 3 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-09 07:32:21 -07:00
Tom Eastep
c2c0fb0dd2 Fix deletion of only rule in a chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-08 17:20:11 -07:00
Tom Eastep
ab1a27ca2a Update version to 4.4.9 Beta 2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-08 13:14:51 -07:00
Tom Eastep
9a00191c88 Remove a 'defined' test that is no longer needed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-08 13:12:17 -07:00
Tom Eastep
359c221783 Keep rules arrays compressed throughout the compilation process 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-08 12:53:30 -07:00
Tom Eastep
3937c10251 Keep rule arrays compressed during optimization 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-08 11:35:15 -07:00
Tom Eastep
9126cc63d9 Delete unused rules arrays 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-08 10:55:31 -07:00
Tom Eastep
cca2c18370 Another case where reference counts are wrong 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-07 20:07:03 -07:00
Tom Eastep
aeb3b277b0 Fix reference count issue 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-07 19:47:49 -07:00
Tom Eastep
3711e64d71 Fix for 0 values propagated to the script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-07 14:38:29 -07:00
Tom Eastep
3092a85999 SWAG regarding LOG_VERBOSITY issue 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-04-07 13:43:57 -07:00
Tom Eastep
af893b6296 Add 'N' trace records for chain creation. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-30 07:32:38 -07:00
Tom Eastep
b2d8039ff6 Remove unnecessary text and 'before' images from trace entries 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-30 07:12:22 -07:00
Tom Eastep
7e97e9519d Conditionally trace writes by copy2(). 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-29 11:56:26 -07:00
Tom Eastep
51d4bf19b5 Conditionally trace writes by copy2(). 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-29 11:56:06 -07:00
Tom Eastep
350a89e449 More complete generated script trace 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-29 09:48:23 -07:00
Tom Eastep
5c91fb40e2 Remove unneeded test; correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-29 09:04:45 -07:00
Tom Eastep
6d7226ae93 Remove special trace entries 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-28 16:31:03 -07:00
Tom Eastep
1fd656b8c9 Tweak trace facility 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-28 15:31:05 -07:00
Tom Eastep
b0733d93ee Implement a more robust trace 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-28 13:09:04 -07:00
Tom Eastep
ef4237f5a0 Avoid verbosity overflow/underflow 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-28 07:27:27 -07:00
Tom Eastep
3e215d0482 Minor cleanup in the Chains module. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-27 08:18:41 -07:00
Tom Eastep
1153ff0c75 Avoid a shell warning when brctl is not installed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-27 07:33:40 -07:00
Tom Eastep
f30cd7e287 Clarify provisional policy handling. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-26 08:02:49 -07:00
Tom Eastep
6cdc1ab7a2 Allow a logical interface name in the EXTERNAL column of the proxyarp file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-25 11:41:06 -07:00
Tom Eastep
7d91edc6ec Remove redundant line of code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-23 12:49:06 -07:00
Tom Eastep
626b28fcd0 Auto-detect bridge when no options specified. Remove extra logic. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-23 09:28:11 -07:00
Tom Eastep
5e9aceae68 Detect bridges 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-23 08:38:54 -07:00
Tom Eastep
914d829a49 Don't optimize the 'blacklst' chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-22 06:47:39 -07:00
Tom Eastep
6ac549ef4e Add a comment explaining why avoiding creation of the blacklst chain 
and branching to it is a bad idea.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-21 07:24:29 -07:00
Tom Eastep
6fc347b9be Prepare 4.4.9-Beta1 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-20 07:06:47 -07:00
Tom Eastep
9a88156769 Back off on not jumping to the blacklist chain when there are no blacklist entries. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-19 11:32:22 -07:00
Tom Eastep
fae29bcf6f Change version to 4.4.8 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-19 10:17:32 -07:00
Tom Eastep
b22b279bd1 Some additional idiot-proofing. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-19 10:01:02 -07:00
Tom Eastep
a71f5df64f Fix indentation and quoting in TC progress messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-19 06:59:58 -07:00
Tom Eastep
f44dbcf20b More copyright updates 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-18 11:13:51 -07:00
Tom Eastep
91bc3b3293 Mark a restored configuration as 'Restored' rather than 'Started'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-17 10:10:56 -07:00
Tom Eastep
1177540fd8 Update version to RC2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-16 12:39:35 -07:00
Tom Eastep
66c883de2c Fix UDPLITE handling of source port when no dest port given. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-16 10:45:31 -07:00
Tom Eastep
b2a56cd542 Copyright update 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-16 09:53:51 -07:00
Tom Eastep
a01fa345b7 Add support for UDP Lite 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-16 09:42:50 -07:00
Tom Eastep
16bbe780c7 Try to avoid printing import banners unnecessarily 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-16 07:23:02 -07:00
Tom Eastep
787cec4fe7 Fix 'uninitialized variable' bug in Config::copy2 
Bug reported by Tuomo Soini

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-16 07:12:39 -07:00
Tom Eastep
196cd5417f Allow 'default' optimizations to be disabled by specifying optimization 4096. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-11 17:15:44 -08:00
Tom Eastep
249f9412f6 Add undocumented OPTIMIZE=-1 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-10 17:31:08 -08:00
Tom Eastep
4f32be03d7 Fix typo in comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-08 15:34:38 -08:00
Tom Eastep
93494c6ae3 Eliminate nested function declarations in generate_matrix() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-08 13:11:10 -08:00
Tom Eastep
07cba9e066 Bump version to RC1 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-08 08:11:00 -08:00
Tom Eastep
efed2286b0 Move qt1() to lib.common 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-07 11:50:54 -08:00
Tom Eastep
f246f728e7 Flag '-' used as a port range separator 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-07 08:36:26 -08:00
Tom Eastep
5671a7ae2f Add new options to online usage info. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-06 08:45:43 -08:00
Tom Eastep
88447bfc7d Avoid dropping first line of library source text 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-06 08:45:21 -08:00
Tom Eastep
2d458b46b4 Update help text in prog.header* 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2010-03-06 08:13:33 -08:00