extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-23 22:58:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,509 Commits 104 Branches 736 Tags 55 MiB
08db919479
Commit Graph

2201 Commits

Author SHA1 Message Date
Tom Eastep
eb03168685 Cleanup of process_rules1() breakup 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-31 15:32:16 -07:00
Tom Eastep
69badac72f Merge branch '4.5.4' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-30 14:43:05 -07:00
Tom Eastep
de184b32bc Fix sectioned IPSEC accounting. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-30 14:37:29 -07:00
Tom Eastep
303c661409 Eliminate bogus term in an expression. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-30 12:49:18 -07:00
Tom Eastep
e88c2c8cd3 Move rules file nat handling to the Nat module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-30 09:01:24 -07:00
Tom Eastep
67932f2d42 Break up expand_rule() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-30 06:49:00 -07:00
Tom Eastep
eb63745352 Merge branch '4.5.4' 2012-05-29 06:48:04 -07:00
Tom Eastep
32e0f154b5 Correct pptpserver tunnel configuration. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-29 06:46:40 -07:00
Tom Eastep
db50454afc Complete removal of optimize level 4 when level 4 is set. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-25 15:42:34 -07:00
Tom Eastep
ed352f60b6 Complete removal of optimize level 4 when level 4 is set. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-25 15:41:55 -07:00
Tom Eastep
fc97f6d00e Implement LOG target option control. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-24 13:54:59 -07:00
Tom Eastep
6142d4d535 Fix typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-23 07:55:07 -07:00
Tom Eastep
1f2ca30ebd Infrastructure for iRule-based logging. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-22 16:46:11 -07:00
Tom Eastep
f147046288 Change 'cc' to 'country-code' in invalid cc list error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-21 07:01:07 -07:00
Tom Eastep
daaf3c031f Change the 'no isocodes' error message to include the address family. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-20 09:40:37 -07:00
Tom Eastep
6b23eff650 Add a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-20 09:05:42 -07:00
Tom Eastep
ef974b5c8d Clear the DEFAULT table if no FALLBACK providers are up. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-20 09:00:22 -07:00
Tom Eastep
d8ec051114 Load the geoip cc's dynamically. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-20 08:59:59 -07:00
Tom Eastep
84f92aa87c Don't capture result of an RE match. Correct a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-20 07:06:59 -07:00
Tom Eastep
70e4c26df1 Delete a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-19 16:46:57 -07:00
Tom Eastep
db96f6ead2 Reject long CC lists. 
- include offending CC in 'Invalid or Unknown' error

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-19 12:44:24 -07:00
Tom Eastep
f0a3e1652a Bracket non-trivial cc lists with [...] 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-19 09:39:49 -07:00
Tom Eastep
56b8a9b9fa Some code cleanup: 
- Store config value in a local rather than repeatedly referencing the
  %config hash.
- Centralize generation of the valid table array

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-19 09:02:44 -07:00
Tom Eastep
231c5dbca0 Eliminate need to call optimize_policy_chains() when OPTIMIZE 4 is selected 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-19 08:15:20 -07:00
Tom Eastep
1a9789a3da Optimization tracing 
- Correct tracing in optimize_chain()
- Add tracing to new level 4 optimization

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-19 07:54:50 -07:00
Tom Eastep
f15e6d3995 Additional optimization in level 4. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-18 16:50:08 -07:00
Tom Eastep
3f42350a7b Don't overwrite empty mark geometry settings. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-18 11:37:49 -07:00
Tom Eastep
e8648c993d Use blackhole routes rather than unreachable. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-18 10:50:13 -07:00
Tom Eastep
55c88e8e81 Replace curly brace enclosure with a preceding caret to avoid ambiguity. 
- {...} is used to enclose a set of column/value pairs and it is certain
  that the two will become confused.
 2012-05-17 15:26:16 -07:00
Tom Eastep
f5f80d2ccc Re-arrange enforcement of restrictions on geoip. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-17 13:59:56 -07:00
Tom Eastep
d220d3d9d5 Abandon action.GeoIP in favor of extended syntax in the SOURCE and DEST columns. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-17 10:44:02 -07:00
Tom Eastep
6148c909f2 fix multiple ipsets in an imatch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-16 19:52:41 -07:00
Tom Eastep
2eb25f3f6a Correct the grammar in an error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-16 07:52:42 -07:00
Tom Eastep
43d882db2b Cosmetic cleanup 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-15 16:44:35 -07:00
Tom Eastep
78af118b9a Quote original list when a translated list is ill-formed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-15 16:39:46 -07:00
Tom Eastep
85f58d6906 Avoid funny-looking ERROR: messages out of Embedded Perl. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-15 16:38:56 -07:00
Tom Eastep
ac2ed505bb Add GeoIP support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-14 17:12:46 -07:00
Tom Eastep
926e589414 Exit the tcpost chain if a connection mark is restored 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-14 10:35:42 -07:00
Tom Eastep
cd150af790 Update .status file on disable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-12 07:44:46 -07:00
Tom Eastep
cd98266396 Correct add of default IPv6 route when no gateway specified 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-12 07:15:24 -07:00
Tom Eastep
3d541f50c8 Use "(S)" consistently in column headings. 
- add synonyms so both the singular and plural forms are accepted.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 12:42:04 -07:00
Tom Eastep
f77b350a7b Clear the 'balance' table if no balanced providers. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 11:28:06 -07:00
Tom Eastep
bed4457e0e Delete jump to 'tproxy' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 09:00:09 -07:00
Tom Eastep
2d5269be7b Fix another conditional compilation bug. 
?IF $false
   ?IF $false
      ...
   ?ENDIF
   foo <------- This line is not omitted!
?ENDIF

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 07:44:46 -07:00
Tom Eastep
a05b3afd7f Eliminate the 'tproxy' chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 07:42:44 -07:00
Tom Eastep
9e743451f6 Add FORMAT 2 to tcrules files. Initialize $format in Tc.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 07:08:06 -07:00
Tom Eastep
cb7fc31f0b Restore 4.5.3 compatibility 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-10 14:23:33 -07:00
Tom Eastep
69d735ea0a Make TPROXY actually work! 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-10 11:19:23 -07:00
Tom Eastep
4d4fc315e0 More TPROXY changes 
- Combine identical DIVERT chains.
- Add --transparent to -m socket
- Reserve a TPROXY bit in the fwmark

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-10 07:25:07 -07:00
Tom Eastep
820c965b72 Allow Shorewall::Config::in_hex() to accept an argument already expressed in hex. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-09 13:51:49 -07:00
Tom Eastep
605ef6ef86 Tweak to DIVERT plus correct TPROXY in man pages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-09 13:10:51 -07:00
Tom Eastep
2eb7af23dc Merge branch 'master' into 4.5.3 2012-05-09 10:03:43 -07:00
Tom Eastep
582d025f58 Add DIVERT action to tcrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-09 09:41:58 -07:00
Tom Eastep
b55d8c04e4 Do logical->physical mapping in rtrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-08 14:52:18 -07:00
Tom Eastep
3b6f5b2d8a Finish alternative balancing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-08 13:55:13 -07:00
Tom Eastep
6639b3534e Close all input files in Shorewall::Config::cleanup() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-08 08:58:14 -07:00
Tom Eastep
59bf343521 Leave first filename and linenumber on the same line as error text. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-08 08:55:24 -07:00
Tom Eastep
1d6e6b65db Finish a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 17:06:35 -07:00
Tom Eastep
2224fdbc65 Correct help text in compiler.pl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 16:55:51 -07:00
Tom Eastep
fd1d6cf935 Handle default shorewallrc location 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 16:55:17 -07:00
Tom Eastep
5d7442e9e9 Correct typo in converted blrules file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 12:13:26 -07:00
Tom Eastep
ef90006334 Avoid reference to unitialized variable on bogus FORMAT in interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 12:00:21 -07:00
Tom Eastep
2cbf1e86ad Allow synonyms for column names in alternate specification formats 
- gateway and gateways in the tunnels file
- mark and action in the tcrules file

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 11:59:47 -07:00
Tom Eastep
dd8e9ff09d Fix 'COMMENT' along in the tunnels file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 11:58:37 -07:00
Tom Eastep
4320150dc4 Add alternate specification in tunnels file ('gateways') 
- Make similar change in tcrules file with 'action'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 07:43:11 -07:00
Tom Eastep
003daec41c Remove a couple of hard-coded '/usr/share' in Shorewall::Config 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-06 17:30:17 -07:00
Tom Eastep
aac00c3cc7 Pop open stack in run_user_exit1 and run_user_exit2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-05 10:31:55 -07:00
Tom Eastep
af228806fc Allow manual changes to be used in macros. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-05 08:56:26 -07:00
Tom Eastep
1d90ee174c Cleanup of ERROR/WARNING message enhancement. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-04 07:01:08 -07:00
Tom Eastep
3e37f47fb5 Print out the include/open stack in WARNING and ERROR messages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-03 17:17:55 -07:00
Tom Eastep
894931731b Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall 2012-05-02 07:04:30 -07:00
Tom Eastep
731b310359 Use --hashlimit-upto when available. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-30 13:45:09 -07:00
Tom Eastep
35c08c109e Fix IPv4 'reset' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-30 07:54:40 -07:00
Tom Eastep
766771d812 Remove absurd test 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-30 07:48:07 -07:00
Tom Eastep
b9e6349994 Add some comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-29 09:07:34 -07:00
Tom Eastep
c9b4d3d8c8 Add/improve comments. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-25 09:44:08 -07:00
Tom Eastep
d904a2de86 Search and destroy trailing whitespace 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 14:52:57 -07:00
Tom Eastep
f860cd037d Change a comment in generate_matrix() to acknowledge 'KLUDGEFREE' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 13:34:56 -07:00
Tom Eastep
3bdf703522 Allow TC experts to SAVE/RESTORE all parts of the packet mark 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 09:19:38 -07:00
Tom Eastep
34f5838365 Allow multiple GATEWAYS to be listed in the tunnels file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-18 09:28:37 -07:00
Tom Eastep
2b7e5dd9d8 Suppress duplicate option when not KLUDGEFREE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-17 07:35:37 -07:00
Tom Eastep
44c8ef2ede Correct ill-advised change to push_matches() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-17 07:30:17 -07:00
Tom Eastep
aaab505006 Improve the debuggability of failed assertions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 17:57:49 -07:00
Tom Eastep
63a2a32b4b Suppress trailing whitespace. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 13:50:59 -07:00
Tom Eastep
31752d9ee1 Move macro.BLACKLIST to where it belongs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 08:14:45 -07:00
Tom Eastep
24e2fe4a04 Make options argument to read_a_line manditory 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 08:04:28 -07:00
Tom Eastep
42950e53cd Use logical add rather than arithmetic add for uniformity 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 14:28:09 -07:00
Tom Eastep
ae9f538ef8 Simplify an assertion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 14:27:48 -07:00
Tom Eastep
e880d2fd84 Remove some whitespace 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 08:03:02 -07:00
Tom Eastep
e791a63671 Merge branch '4.5.2' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 07:13:40 -07:00
Tom Eastep
e263a3c27d Remove redundant logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 07:11:05 -07:00
Tom Eastep
0b5e30aa7b Fix INCLUDE inside an ?IF ... ?ENDIF 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-10 17:27:47 -07:00
Tom Eastep
07ff3f294d Fix INCLUDE inside an ?IF ... ?ENDIF 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-10 17:27:23 -07:00
Tom Eastep
6ba69c9540 Eliminate read_a_line1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-10 17:01:38 -07:00
Tom Eastep
5ee554708c Control the proliferation of arguments to read_a_line() by using 
a bit-mapped single argument.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-10 13:51:25 -07:00
Tom Eastep
623e545f09 Don't allow accounting chains to be altered when OPTIMIZE_ACCOUNTING=No 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-09 21:44:44 -07:00
Tom Eastep
2545322163 Cleanup of read_a_line() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-09 16:00:26 -07:00
Tom Eastep
7b511f449f Don't strip comments until after embedded Perl or Shell have been handled. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-09 15:12:13 -07:00
Tom Eastep
94097e2561 Add newlines to embedded multi-line shell and perl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-08 12:17:00 -07:00
Tom Eastep
50405f57ba Don't suppress whitespace in embedded Perl and Shell 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-08 07:54:03 -07:00