extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-20 21:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,669 Commits 104 Branches 736 Tags 55 MiB
e17010018c
Commit Graph

5081 Commits

Author SHA1 Message Date
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
182a4c3080 Correct 'compile' usage text 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-21 07:10:38 -07:00
Tom Eastep
ab2376d61d Document 15-cc limit. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-21 07:03:53 -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
e086067567 Reverse logic in the installer to allow for Digest::SHA being the default now 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-17 14:29:57 -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
3436fbd6ad Don't use ?INCLUDE in modules files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-17 10:45:12 -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
0673898e85 GeoIP tweaks: 
- Error if no CC
- switch an 'if' expression to 'unless'.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-16 07:52:19 -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
17e25932f0 Fixes for GeoIP 
- Correct check for valid ACTION
- Add to Shorewall6/actions.std
- Only use geoip once per invocation

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-15 11:14:28 -07:00
Tom Eastep
63ae00e4a4 Fix bug in 'interface_is_usable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-15 06:58:03 -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
9f1c920a39 Don't allow RSTs to be REJECTed 2012-05-14 10:34:11 -07:00
Tom Eastep
9ea233d55f Split a couple of functions with address-family dependent logic. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-13 15:53:02 -07:00
Tom Eastep
60bde6231a Improve interface_is_usable() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-13 13:49:59 -07:00
Tom Eastep
3d575a45bd Re-code interface_is_usable() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-13 11:56:52 -07:00
Tom Eastep
1f621002b7 Ignore 'isusable' on 'enable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-12 19:38:18 -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
cb159eba2e Add RST action. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-06 12:14:30 -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
cd35b6a13f Modify macro.BLACKLIST to use blacklog when appropriate 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-05 08:56: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
69f6aae982 Delete extra copy of macro.BLACKLIST 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-05 08:40:25 -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
097ab853db Apply Tuomo Soini's tunnels patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-04 06:18:22 -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
bd30d59f3d Fix annotated interfaces files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-03 14:09:49 -07:00
Tom Eastep
e4c4900b32 Add recent changes to a couple of config files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-03 12:32:47 -07:00
Tom Eastep
4d23ec2c48 Belatedly document FORMAT-2 interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-03 10:07:36 -07:00
Tom Eastep
15aa1dae62 Enhancements to the 'refresh' command. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-02 13:48:18 -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
3333486c9d Another change to Debian startup at boot 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-01 10:55:29 -07:00
Tom Eastep
2dd82a9898 Update Multi-ISP documentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-01 10:28:12 -07:00
Tom Eastep
45c637ad6b Fix Debian boot startup (again) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-01 10:15:39 -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
9efb60c53a Move init.slackware.firewall.sh to Shorewall-core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-27 16:15:04 -07:00
Tom Eastep
e0570cc35e Install fixes for Slackware 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-27 07:16:11 -07:00
Tom Eastep
9612044933 Make products start automatically at boot on Debian and derivatives 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-25 11:49:22 -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
dc63efdbfd Use ?INCLUDE in modules files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-25 07:33:40 -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
0f53c3cc7d Convert all interfaces files to format-2 only 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 10:53:09 -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
dc85d4a844 Do SHA/SHA1 test if $BUILD = $TEST, independent of $DESTDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 08:52:17 -07:00
Tom Eastep
a50bb407aa Patch from Roberto 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-21 17:51:54 -07:00
Tom Eastep
f40144f6af Corret tcrules manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-21 09:53:00 -07:00
Tom Eastep
0adbdbb101 Add TCP to macro.Amanda 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-20 09:46:13 -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
52ebca3fe1 Merge branch '4.5.2' 
Conflicts:
	Shorewall-core/lib.cli
	Shorewall/Perl/Shorewall/Config.pm

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-16 13:47:05 -07:00
Tom Eastep
805166a354 Ressurect LOCKFILE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-16 07:21:06 -07:00
Tom Eastep
1462fcd351 Synchronize global settings 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-15 09:43:41 -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
eb7a21030d Correct Makefiles 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:03:51 -07:00
Tom Eastep
1bc03123b9 Delete code to modify Makefile 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:03:08 -07:00
Tom Eastep
e6aabec7ef Install correct Makefile 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:03:00 -07:00
Tom Eastep
a32ce5c34a Correct Makefiles 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:01:37 -07:00
Tom Eastep
fdc4a84a83 Delete code to modify Makefile 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 11:36:08 -07:00
Tom Eastep
d3943ea0fe Install correct Makefile 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 11:17:27 -07:00
Tom Eastep
79b5c38ecb Handle trailing whitespace in Shorewall::Config::read_a_line1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 10:14:25 -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
f88584b916 Merge branch '4.5.2' 
Conflicts:
	Shorewall-core/configure.pl

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-12 14:48:56 -07:00
Tom Eastep
69a133083c Modify Makefiles for directory relocation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-12 10:15:55 -07:00
Tom Eastep
59d1a57f06 Add the -T option to the load, reload, restart and start commands. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 14:28:44 -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
74fdd97b14 Warn about not using sections in the accounting file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-09 16:47:56 -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
Tom Eastep
860141127a Re-enable '#' in quoted strings within embedded shell and perl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-08 07:30:46 -07:00
Tom Eastep
f8f599c1db Restore progress message that was inadvertently deleted. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 09:34:32 -07:00
Tom Eastep
a2abad3f68 Modify getparams to use the installed shorewallrc file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 09:07:07 -07:00
Tom Eastep
c5f44d8737 Move read_a_line() prototype before first use. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 07:42:27 -07:00
Tom Eastep
25bca70ff2 Merge branch 'master' into 4.5.2 2012-04-07 07:39:14 -07:00
Tom Eastep
7204220991 Some more fixes to conditional inclusion. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 07:16:17 -07:00
Tom Eastep
97cc4930cf Deimplement option leading ? in embedded directives 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 16:26:05 -07:00
Tom Eastep
5688dc77a3 Make ?BEGIN PERL end ?END PERL work. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 15:58:21 -07:00
Tom Eastep
9dd6f86c55 Use read_a_line() in the embedded_shell() and embedded_perl() functions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 15:46:01 -07:00
Tom Eastep
53395e788d Add a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 11:49:59 -07:00
Tom Eastep
2de64d5820 Remove find_echo() from lib.core 
- Also correct a couple of typos in comments

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 08:01:07 -07:00
Tom Eastep
24e115d0f9 Move a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 08:00:20 -07:00
Tom Eastep
29a820b2f2 Make handling of remote configuration data consistent. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 11:47:45 -07:00
Tom Eastep
bff3473279 Fix preceding commit -- it missed to cases of absolute pathnames. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 09:43:39 -07:00
Tom Eastep
319d07b1d3 Remove more absolute path names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 09:24:48 -07:00
Tom Eastep
38b6dca223 Correct a number of issues with Shorewall-lite 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 07:08:02 -07:00
Tom Eastep
24d30275fa Correct syntax errors in the generated script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-03 17:08:14 -07:00
Tom Eastep
fb428bf564 Don't modify CONFDIR and SHAREDIR in the shell code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-02 12:39:49 -07:00
Tom Eastep
348c99c7d0 Compiler changes for Shorewall[6]-lite relocation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-02 07:46:38 -07:00
Tom Eastep
a11e2dd452 Correct uninstall scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-02 06:48:23 -07:00
Tom Eastep
85fce606dc Give all config files access to shorewallrc variables. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-01 13:19:38 -07:00
Tom Eastep
bb6e17fd3e Many changes involved in getting a relocated installations to work 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-01 10:47:24 -07:00
Tom Eastep
e48e13012c Fix up lib.base during installation 
- Shorewall-core installer creates all necessary directories.
 2012-04-01 08:16:07 -07:00
Tom Eastep
02a68aa436 Look for ./shorewallrc first 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 17:40:18 -07:00
Tom Eastep
766370e22a More work on installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 14:42:01 -07:00
Tom Eastep
75b57b926a Revert "Replace lib.base with symbolic link" 
This reverts commit 98f4a1c545.
 2012-03-31 12:57:38 -07:00
Tom Eastep
cf176474ac Merge branch '4.5.2' 
Conflicts:
	Shorewall/Perl/Shorewall/Chains.pm
 2012-03-31 09:44:36 -07:00
Tom Eastep
6ed207aba0 Fix 'dhcp' with 'nets' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 09:30:29 -07:00
Tom Eastep
924ec49d09 Add OWNER_NAME_MATCH to do_user 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:58:38 -07:00
Tom Eastep
a4097b7a02 Correct Typo in setup_null_routing() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:57:26 -07:00
Tom Eastep
e38fcb2bfc Correct ipset creation and add a WARNING when creating an ipset 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:56:43 -07:00
Tom Eastep
c3b56d4123 Add BLACKLIST Macro 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:53:02 -07:00
Tom Eastep
fead683f18 Modify init scripts if ${SHAREDIR} is non-standard 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:21:37 -07:00
Tom Eastep
98f4a1c545 Replace lib.base with symbolic link 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 15:30:04 -07:00
Tom Eastep
f5414d0fd1 Create ${SYSTEMD} if needed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 13:56:59 -07:00
Tom Eastep
15335f8615 Modify CLIs and libs to know where shorewallrc is. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 12:02:25 -07:00
Tom Eastep
0d19c99699 Correct default setting of CONFDIR when .shorewallrc is not found 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-28 06:28:53 -07:00
Tom Eastep
c2fa5ae78f Correct typo in install.sh files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-27 20:19:06 -07:00
Tom Eastep
e1e4855211 Rename USR to PREFIX 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-27 07:47:22 -07:00
Tom Eastep
e09457cdf9 Correct Typo in setup_null_routing() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-27 07:46:53 -07:00
Tom Eastep
f2311f1987 Update install scripts to look for .shorewallrc in many places 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 17:01:55 -07:00
Tom Eastep
b31f656d63 Update uninstall scripts for multiple .shorewallrc locations. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 16:19:40 -07:00
Tom Eastep
e641bf7ac2 Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 16:01:35 -07:00
Tom Eastep
8a164adf98 Export TMPDIR if it exists in the .shorewallrc file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 15:43:04 -07:00
Tom Eastep
7b9c1d43cd Look in additional places for .shorewallrc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 15:00:43 -07:00
Tom Eastep
fd82877312 Another fix for init.sh 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 07:49:49 -07:00
Tom Eastep
2518c653af Modify RedHat/Fedora init scripts for shorewallrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 07:20:31 -07:00
Tom Eastep
c23deed3a7 Correct syntax error in init.sh 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 07:04:21 -07:00
Tom Eastep
dee20c8d74 Add OWNER_NAME_MATCH to do_user 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 20:18:20 -07:00
Tom Eastep
ee15baf98c Correct typo in Chains.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 12:48:57 -07:00
Tom Eastep
25e7555e80 Correct typo in the compiler 2012-03-25 12:36:25 -07:00
Tom Eastep
9dd9ee614b Correct ipset creation and add a WARNING when creating an ipset 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 08:27:28 -07:00
Tom Eastep
8a18dac870 Installer tweaks 
- Give instructions when Shorewall-core installer finds no rc file
- Update help

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 07:49:52 -07:00
Tom Eastep
5aed14ffdc Set PRODUCT before processing rc file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 07:25:15 -07:00
Tom Eastep
59aab485c3 Handle 'PRODUCT' more gracefully 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 22:21:42 -07:00
Tom Eastep
173d29969d Improve shorewallrc variable expansion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 21:34:24 -07:00
Tom Eastep
7390789b5e Add BLACKLIST Macro 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 21:33:57 -07:00
Tom Eastep
fc4aaa97c6 Expand variables in shorewallrc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 21:26:20 -07:00
Tom Eastep
217d5e636c Add BLACKLIST Macro 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 19:29:27 -07:00
Tom Eastep
eb118e4443 Add shorewallrc files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 13:05:39 -07:00
Tom Eastep
f4ed4109c6 Fix LENGTH handling (again) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-23 15:40:48 -07:00
Tom Eastep
398c843643 Concatenate match options when not KLUDGEFREE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-23 15:40:25 -07:00
Tom Eastep
01d07f55a9 Only include user exit basename in exported progress messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-20 07:33:32 -07:00
Tom Eastep
a7b10c99da Add some comments to lib.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-20 07:17:19 -07:00
Tom Eastep
bdc8cb66bd Correct load_kernel_modules() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-20 07:15:47 -07:00
Tom Eastep
7bc823fb8b Support 'kerneltz' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 15:57:38 -07:00
Tom Eastep
48b7594b64 Delete prog.header* 
- Move functions into lib.core with ?IF ... ?ELSE ... ?END

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 15:56:02 -07:00
Tom Eastep
88b1180817 Support ?IF in copied files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 13:38:24 -07:00
Tom Eastep
8803cd8d3b ?IF improvements 
- Pass line number to make process_conditional more general
- Add debugging output
- Do first_line processing prior to looking for ?

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 12:51:22 -07:00
Tom Eastep
0063de1564 Add capabilities to conditionals 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 11:57:33 -07:00
Tom Eastep
f104596b39 Merge branch '4.5.1' 2012-03-19 10:13:08 -07:00
Tom Eastep
146d66f0aa Don't complain about SHOREWALL_INIT_SCRIPT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 09:52:55 -07:00
Tom Eastep
0ccb398cec Merge branch '4.5.1' 2012-03-19 09:22:44 -07:00
Tom Eastep
287a44be52 Allow TOS to work on RHEL5 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 09:22:21 -07:00
Tom Eastep
86f3667b82 Correct nested ?IF 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 08:19:32 -07:00
Tom Eastep
962b1cca1f Remove Perl diagnostic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 07:46:45 -07:00
Tom Eastep
2026fdab6a Correct IPSET_WARNINGS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 07:44:52 -07:00
Tom Eastep
722e888043 Fix ?IF 
- Allow nested ?IFs to work correctly
- Correct push logic for $ifstack

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 07:38:52 -07:00
Tom Eastep
e3997abfb9 Merge branch '4.5.2' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 07:27:53 -07:00
Tom Eastep
710687bbd6 Revert "Move conditional processing to it's own function" 
This reverts commit 8262cff71a.
 2012-03-19 07:23:57 -07:00
Tom Eastep
d4a1e7dba9 Revert "Allow ?IF, ?ELSE and ?ENDIF in copied files" 
This reverts commit 29dd342118.
 2012-03-19 07:23:24 -07:00
Tom Eastep
c7237e5c8e Revert "Move all functions from prog.header* to lib.core" 
This reverts commit f9f557e1c6.
 2012-03-19 07:22:51 -07:00
Tom Eastep
c299c6d61a Revert "Correct spelling" 
This reverts commit 1d021e3701.
 2012-03-19 07:22:29 -07:00
Tom Eastep
6769acc7a7 Revert "Some corrections to conditional inclusion" 
This reverts commit 164d2f5d1b.
 2012-03-19 07:22:07 -07:00
Tom Eastep
df33587395 Revert "Clean up of conditional inclusion." 
This reverts commit 5f3ba4eb40.
 2012-03-19 07:21:36 -07:00
Tom Eastep
508f33a183 Revert "Eliminate prog.header6" 
This reverts commit 60f1004339.
 2012-03-19 07:21:12 -07:00
Tom Eastep
11f970d1c2 Revert "Eliminate prog.header" 
This reverts commit 13bf383ce8.
 2012-03-19 07:20:57 -07:00
Tom Eastep
72e6330ff4 Revert "Add capabilities to ?IF conditionals" 
This reverts commit 0d71c590e4.
 2012-03-19 07:20:31 -07:00
Tom Eastep
5caf68bc31 Remove .project 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 19:31:40 -07:00
Tom Eastep
78306e9f5b Don't issue missing SHOREWALL_SHELL warning when compiling for export 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 19:30:32 -07:00
Tom Eastep
15ca0fd1f0 Add IPSET_WARNINGS option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 19:30:04 -07:00
Tom Eastep
955a9f0051 Correct Steven's issues 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 19:10:46 -07:00
Tom Eastep
bd56caf74f Don't issue missing SHOREWALL_SHELL warning when compiling for export 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 12:54:53 -07:00
Tom Eastep
5bfd2cc2c9 Remove some WARNINGs 
- Mr Dash4 has decided he doesn't want them after all.
 2012-03-18 12:42:32 -07:00
Tom Eastep
e47ae4f26e Don't issue missing SHOREWALL_SHELL warning when compiling for export 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 12:28:26 -07:00
Tom Eastep
56f66bd966 Require the correct PROTO to use a port range in the ADDRESS column of masq 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 11:22:37 -07:00
Tom Eastep
6e089fb0e2 Require the correct PROTO to use a port range in the ADDRESS column of masq 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 11:21:53 -07:00
Tom Eastep
0d71c590e4 Add capabilities to ?IF conditionals 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 08:48:26 -07:00
Tom Eastep
d1661c95d5 Remove .project 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 18:29:32 -07:00
Tom Eastep
13bf383ce8 Eliminate prog.header 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 18:07:36 -07:00
Tom Eastep
60f1004339 Eliminate prog.header6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 17:51:56 -07:00
Tom Eastep
5f3ba4eb40 Clean up of conditional inclusion. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 12:12:32 -07:00
Tom Eastep
164d2f5d1b Some corrections to conditional inclusion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 10:26:36 -07:00
Tom Eastep
1d021e3701 Correct spelling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 09:42:15 -07:00
Tom Eastep
f9f557e1c6 Move all functions from prog.header* to lib.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 09:35:35 -07:00
Tom Eastep
29dd342118 Allow ?IF, ?ELSE and ?ENDIF in copied files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 09:33:40 -07:00
Tom Eastep
8262cff71a Move conditional processing to it's own function 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 09:32:56 -07:00
Tom Eastep
b7465262ca Rename MARK/CLASSIFY column to ACTION 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-16 10:09:13 -07:00
Tom Eastep
ab13fbe95e Allow conditional compilation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-16 08:16:12 -07:00
Tom Eastep
f7a2cd4ef1 Correct typos in accounting manpages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 15:34:19 -07:00
Tom Eastep
95e4f8dd91 Fix TOS(tos/mask) in tcrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 15:34:11 -07:00
Tom Eastep
8e413a7bf0 Fix TOS(tos/mask) in tcrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 15:33:31 -07:00
Tom Eastep
3e9edcb7e8 Correct typos in accounting manpages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 14:50:25 -07:00
Tom Eastep
4ba88d2e9c Merge branch '4.5.1' 2012-03-14 11:00:56 -07:00
Tom Eastep
aa503e7211 Apply Tuomo Soini's Makefile patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 10:57:41 -07:00
Tom Eastep
2a67a202b0 Merge branch '4.5.1' 2012-03-13 20:16:01 -07:00