extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-21 05:41:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,294 Commits 104 Branches 736 Tags 55 MiB
810ebe32ce
Commit Graph

2685 Commits

Author SHA1 Message Date
Tom Eastep
8487c78a0a Adjust reference counts when splicing in short chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-14 08:34:51 -07:00
Tom Eastep
fdc45a990d Arrange for HELPER to match in the RELATED section. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-13 15:44:19 -07:00
Tom Eastep
44a550870c Add HELPER action. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-13 13:23:38 -07:00
Tom Eastep
bd3295b0e3 Remove temporary hack 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-13 08:55:43 -07:00
Tom Eastep
45288f5927 Revise notrack/conntrack handling: 
- Purge empty notrack files.
- Process both files.
 2012-08-13 07:28:07 -07:00
Tom Eastep
75b830b10e Merge branch 'master' into 4.5.7 2012-08-13 06:57:54 -07:00
Tom Eastep
4b2d48d621 Hardwire AUTOHELPERS until 4.5.8. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-13 06:48:19 -07:00
Tom Eastep
50362040d7 Enable automatic helper association during 'stop'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-12 08:46:06 -07:00
Tom Eastep
2f1d59366c Unconditionally disable kernel automatic helper association during start. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-12 08:43:28 -07:00
Tom Eastep
b372163122 Enable automatic helper association during 'stop'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-12 08:42:53 -07:00
Tom Eastep
50bd1d6398 Add AUTOHELPER option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-12 07:25:11 -07:00
Tom Eastep
e6ef32ebc2 Make conditional directives case insensitive 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-11 08:48:35 -07:00
Tom Eastep
a5824dc2d4 Optimize extension 
- Eliminate short chains with a single reference.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-11 08:47:10 -07:00
Tom Eastep
b5af6f03fb Create better rules when a HELPER appears in an action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-11 07:48:03 -07:00
Tom Eastep
50dfffec94 Eliminate duplicate rules in raw-table chains when optimize level 16. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-10 07:09:01 -07:00
Tom Eastep
ad818c071a Generate omnibus tracking rules when NAT/ACCEPT with helper appears in an action. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-10 06:55:18 -07:00
Tom Eastep
2ab50e65d7 Make conditional directives case insensitive 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-09 10:30:02 -07:00
Tom Eastep
4d3fbd1dfa Allow '?IF 0' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-08 07:24:17 -07:00
Tom Eastep
e8a4728981 Allow '?IF 0' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-08 07:23:43 -07:00
Tom Eastep
ee28638604 Add HELPERS to rules file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-08 07:23:20 -07:00
Tom Eastep
a8495626b0 Merge branch '4.5.6' into 4.5.7 2012-08-07 15:10:15 -07:00
Tom Eastep
c6186571e5 Handle raw table zones from VSERVERS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-07 15:09:40 -07:00
Tom Eastep
ccf517307e Handle raw table zones from VSERVERS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-07 14:51:58 -07:00
Tom Eastep
c007f847a0 Handle disabled helpers in pre-3.5 kernels. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-06 15:54:45 -07:00
Tom Eastep
b4c812b676 Correct helper parsing in the Raw module. 
- Require (...) around multiple ctevents
- Detect invalid options

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-05 08:09:17 -07:00
Tom Eastep
9a0d53194a Correct Helper detection in the compiler. 
Use CT_MATCH when available.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-05 08:08:20 -07:00
Tom Eastep
093985dd93 Use HELPERS to enable/disable helper association. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-03 19:26:02 -07:00
Tom Eastep
72307df6d2 Replace the AUTOHELPERS option with the HELPERS option. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-03 10:53:20 -07:00
Tom Eastep
7689b1e84b Remove the 'zone' helper option for now. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-03 06:39:58 -07:00
Tom Eastep
82c057d1ed Fix *VERSION handling. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 16:44:02 -07:00
Tom Eastep
21770a89d6 Detect which matches are available. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 15:38:23 -07:00
Tom Eastep
223ed5b3a3 More additions to the helper table and to the conntrack files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 13:25:44 -07:00
Tom Eastep
9ba0c07956 Redesign the CT:helper feature. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 11:10:08 -07:00
Tom Eastep
7d32258e6e Correct Helpers Module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 11:09:34 -07:00
Tom Eastep
07e56d129a Add AUTOHELPERS option. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 11:09:18 -07:00
Tom Eastep
62d6d2558e Rename AUTO_COMMENT to AUTOCOMMENT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 11:06:41 -07:00
Tom Eastep
833e54c9c3 Rename the notrack file to conntrack 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-02 11:02:17 -07:00
Tom Eastep
f2dd43855e Correct typo in warning message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-01 13:13:18 -07:00
Tom Eastep
eaf238fa66 Merge branch '4.5.6' 2012-08-01 10:37:45 -07:00
Tom Eastep
542f279544 Don't allow a source interface in a DNAT/REDIRECT rule with source == firewall 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-01 10:01:08 -07:00
Tom Eastep
735b7c2cf5 Add support for nfacct 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-28 11:21:16 -07:00
Tom Eastep
87c0f934aa Add NFacct Match capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-28 08:19:05 -07:00
Tom Eastep
55b527d065 Eliminate a local variable. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-15 20:22:19 -07:00
Tom Eastep
e1e7ab42c1 Make 'routefilter' and 'sfilter' mutually exclusive 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-15 10:37:56 -07:00
Tom Eastep
65b16a1acf Compensate for bugs in the latest CPerl emacs extension 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-15 10:07:06 -07:00
Tom Eastep
1db79a91eb 'rpfilter' option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-15 10:05:32 -07:00
Tom Eastep
e7cd84a72c Implement rpfilter match capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-15 07:54:46 -07:00
Tom Eastep
2cce81cfc1 Revert 83a8c7eda3 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-09 10:58:15 -07:00
Tom Eastep
9f4ca3ebc5 Additional simplification of evaluate_expression() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-08 07:48:27 -07:00
Tom Eastep
3c2385de06 Merge branch '4.5.6' 2012-07-08 07:36:15 -07:00
Tom Eastep
6ce3d0180e Ensure a defined value for __IPV[46] 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-07 09:47:10 -07:00
Tom Eastep
83a8c7eda3 When TC_ENABLED=No, require providers to process tcrules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-07 08:02:57 -07:00
Tom Eastep
83df8a4e39 Avoid a call to eval() for simple expressions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-06 07:26:54 -07:00
Tom Eastep
e9d8228b6f Simplify handling of __IPVn in conditional directives. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-06 06:43:15 -07:00
Tom Eastep
65d8341c6c Correct a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-05 15:43:20 -07:00
Tom Eastep
61a9584433 Only require MANGLE_ENABLED to process the tcrules file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-04 14:45:24 -07:00
Tom Eastep
000cc6978a Add missing 'sleep' when waiting for wildcard interface to come up 
- Also reverse the order of test and sleep when waiting for a regular
  interface to come up.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-03 08:06:30 -07:00
Tom Eastep
e4d66fb5fc Back out redundant part of recent patch 
- setup_traffic_shaping is only called when there are tc devices so the
  test of @tcdevices in that function is redundant.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-03 06:33:46 -07:00
Tom Eastep
537f6c157c Allow the compiler version to be tested in ?IF/?ELSIF 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-02 11:53:32 -07:00
Tom Eastep
a5b637b2a7 Use the correct filename in ?IF/?ELSIF exec call. 
- Also extend a comment in the TC module

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-02 11:53:01 -07:00
Tom Eastep
09c00cf425 Don't print phoney progress message 
- The 'Setting up Traffic Shaping' progress message was being issued when
  traffic shaping was not enabled.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-07-01 08:27:07 -07:00
Tom Eastep
6ddaa0190e Improve USER/GROUP validation. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-30 14:46:50 -07:00
Tom Eastep
5c176c64b7 Add an ORIGINAL DEST column to /etc/shorewall/masq 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-29 15:32:01 -07:00
Tom Eastep
b195884b1f Insure that the correct filename/linenumber are printed in error messages out of process_conditional() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-29 09:01:26 -07:00
Tom Eastep
56d5ae2d41 Ensure that exclusion chains have DONT_MOVE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-27 18:06:38 -07:00
Tom Eastep
0bf2753472 Re-implement conditional inclusion 
- Correct defects
- Add ?ELSIF support
- Allow Perl-compatible expressions in ?IF
 2012-06-27 15:15:44 -07:00
Tom Eastep
c90006ecf8 Correct another logical name bug -- this time in TC 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-27 11:34:19 -07:00
Tom Eastep
af302900c6 Prevent multiple 'tproxy' providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-23 17:09:46 -07:00
Tom Eastep
9aa78656ec Add TPROXY_MARK to the output of 'shorewall show marks' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-23 07:57:39 -07:00
Tom Eastep
9d3766b77f Allow fwmarks with 'classify' interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-20 14:04:48 -07:00
Tom Eastep
24ddae6ede Don't use '--ctmark' when saving marks 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-20 13:30:27 -07:00
Tom Eastep
4d336ed8d6 Rewrite handling of the USER/GROUP column 
- Remove code that handled '+program' as that support was removed from
  the kernel in 2.6.14.
 2012-06-19 08:14:31 -07:00
Tom Eastep
da3e1b720c Apply user/group Id range patch from Gergely Risko 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-19 06:17:13 -07:00
Tom Eastep
7b4e5828e0 Clean up handling of RED options. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-18 12:17:22 -07:00
Tom Eastep
4c10fcd503 Complain if a RED_NONE option has a value specified. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-16 15:51:20 -07:00
Tom Eastep
5fc295e8cc Fix handling of stab 'tsize' option. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-14 15:44:15 -07:00
Tom Eastep
c5ba167a3e Make CEIL optional 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-14 13:10:09 -07:00
Tom Eastep
6c47349689 Support 'red' queuing discipline 
- Also added 'ls' support for HFSC

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-13 14:29:13 -07:00
Tom Eastep
d2c415c580 Make IFB work with logical interface names. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-13 13:48:12 -07:00
Tom Eastep
28ab3749ca Allow fractional delays in TC 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-13 13:47:31 -07:00
Tom Eastep
a29dbf4ff8 Fix for linklayer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-12 11:48:12 -07:00
Tom Eastep
19cace7e8d Merge branch '4.5.5' 
Conflicts:
	Shorewall/Perl/Shorewall/Providers.pm
 2012-06-11 17:02:59 -07:00
Tom Eastep
4791a8ca66 Don't delete default routes when 'fallback' is specified. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-11 16:57:49 -07:00
Tom Eastep
844f6c63e4 Add support for TC size tables. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-11 15:45:47 -07:00
Tom Eastep
08db919479 Merge branch '4.5.5' 2012-06-11 13:55:47 -07:00
Tom Eastep
2dd9e6c91f Don't delete default routes when 'fallback' is specified. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-11 13:53:53 -07:00
Tom Eastep
c57f627a21 Add some comments. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-11 11:25:19 -07:00
Tom Eastep
1d0ab43fbb Change indentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-10 15:38:09 -07:00
Tom Eastep
1f54d19981 Split add_input_jumps() into two functions 
- Added add_forward_jump()
- Added lots of comments

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-09 17:21:59 -07:00
Tom Eastep
00f7b9d0dd More useful trace of enable/disable optimization 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-09 15:36:29 -07:00
Tom Eastep
a2f32f25c5 Add some comments. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-09 06:20:40 -07:00
Tom Eastep
ae66d7d7a5 Eliminate the hideously complex forwarding code in generate_matrix() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-08 08:29:36 -07:00
Tom Eastep
63eb0bee5b Break up and eliminate handle_pio_jumps() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-08 07:40:26 -07:00
Tom Eastep
8a9427ebff Merge branch '4.5.4' 2012-06-07 14:12:48 -07:00
Tom Eastep
4a383540be Merge branch '4.5.4' into 4.5.5 2012-06-07 14:12:10 -07:00
Tom Eastep
db6a7276ec Don't optimize chains with commands 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-07 14:11:44 -07:00
Tom Eastep
d771c6b2c2 Delete the 'dnat' nat-table chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-07 13:44:03 -07:00
Tom Eastep
fe7d0730d5 Break up generate_matrix() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-07 07:47:33 -07:00
Tom Eastep
a2a9ef0958 Rename OPTIMIZE_MASK1 to OPTIMIZE_MASK2n4 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-06 13:08:45 -07:00
Tom Eastep
21eda5daec Fix multiple iprange matches without kludgefree. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-06 11:26:52 -07:00
Tom Eastep
6bd81145e9 Fix single-line embedded Perl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-06 11:23:33 -07:00
Tom Eastep
49050e61de Fix multiple iprange matches without kludgefree. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-06 10:50:16 -07:00
Tom Eastep
225101b802 Rename OPTIMIZE_MASK1 to OPTIMIZE_MASK2n4 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-05 12:51:52 -07:00
Tom Eastep
fa3164fb1b Re-enable single-line embedded SHELL and PERL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-05 12:51:16 -07:00
Tom Eastep
3294f7c4c3 Add a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-05 09:02:29 -07:00
Tom Eastep
654f7dd805 Fix single-line embedded Perl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-05 09:02:12 -07:00
Tom Eastep
ee467a4877 Allow embedded shell/Perl directives to have leading '?' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-05 07:32:43 -07:00
Tom Eastep
170875c7dd Convert the 'ignore' interface to be multi-valued 
-Allows 'ignore=1' to only exempt interface from updown processing

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-05 07:23:23 -07:00
Tom Eastep
c8156cfdb1 Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-04 08:18:57 -07:00
Tom Eastep
57a9feaf2f Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-04 08:00:07 -07:00
Tom Eastep
92a13ec87c Merge branch '4.5.4' 
Conflicts:
	Shorewall/Perl/Shorewall/Config.pm
 2012-06-03 18:51:03 -07:00
Tom Eastep
040f693583 Cosmetic changes in code from when I was still learning Perl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-03 17:50:34 -07:00
Tom Eastep
69387b9099 Make 'check -r' work like 'compile' WRT optimization 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-03 15:43:43 -07:00
Tom Eastep
28f0a066da Make 'check -r' work like 'compile' WRT optimization 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-03 15:15:11 -07:00
Tom Eastep
621aa3fc6a Another approach to reporting errors from process_conditional() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-03 13:47:38 -07:00
Tom Eastep
9869420106 Check for conditional directives prior to continuation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-03 09:05:09 -07:00
Tom Eastep
39b3a0da65 Check for conditional directives prior to continuation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-03 08:43:48 -07:00
Tom Eastep
121d34aed0 Add constant LOG_OPTIONS capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-02 14:06:31 -07:00
Tom Eastep
4b69216c83 Relocate lib.core in the Source Tree 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-02 12:46:35 -07:00
Tom Eastep
7ff15b0625 Merge branch '4.5.4' 
Conflicts:
	Shorewall/Perl/Shorewall/Zones.pm
 2012-06-02 11:41:45 -07:00
Tom Eastep
41dcd5826f Minimize the list of plain interfaces 
Omit bridge ports and interfaces that match a wildcard.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-02 11:39:16 -07:00
Tom Eastep
26502034ec Minimize the list of plain interfaces 
Omit bridge ports and interfaces that match a wildcard.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-02 11:17:10 -07:00
Tom Eastep
baa2c4f5eb Merge branch '4.5.4' 2012-06-02 09:30:47 -07:00
Tom Eastep
9e9c44d4ac Handle Debian pre-down/post-down correctly 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-02 09:26:00 -07:00
Tom Eastep
01eb1a580b Merge branch '4.5.4' 2012-06-02 08:20:40 -07:00
Tom Eastep
b3316d755a Correct silly typo in Providers.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-01 17:14:08 -07:00
Tom Eastep
73274b9b0b Correct progress message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-01 15:55:22 -07:00
Tom Eastep
c823b0e41e More Shorewall-init fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-01 14:04:08 -07:00
Tom Eastep
78f9b76dae Move mutex handling to the main program. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-01 14:03:47 -07:00
Tom Eastep
402e155148 More Shorewall-init fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-01 14:01:58 -07:00
Tom Eastep
9c4a01bcdd Move mutex handling to the main program. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-01 11:47:58 -07:00
Tom Eastep
21b9a194ca Merge branch '4.5.4' 2012-06-01 11:30:35 -07:00
Tom Eastep
312efe5c7b Use enable/disable for up and down of provider interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-01 11:27:57 -07:00
Tom Eastep
f25187adb1 Move compile_updown() from the Zones module to the Providers module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-06-01 08:12:07 -07:00
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
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
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
24e115d0f9 Move a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 08:00:20 -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
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
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
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
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
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
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
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
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
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
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
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
ab13fbe95e Allow conditional compilation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-16 08:16:12 -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
2a67a202b0 Merge branch '4.5.1' 2012-03-13 20:16:01 -07:00
Tom Eastep
7e14777b8f Fix typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 19:54:58 -07:00
Tom Eastep
c1d0681e17 Correct LENGTH column validation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 17:58:18 -07:00
Tom Eastep
e3f2c49c7e Remove level of indirection for the 'super' property 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 12:23:33 -07:00
Tom Eastep
fecd091078 Remove %zones{option}{nested} 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 11:31:13 -07:00
Tom Eastep
e0b360513c Remove a level of indirection for 'complex' zone flag. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 09:47:31 -07:00
Tom Eastep
01d99d4873 Move zone mss handling to the Rules File 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-12 15:59:35 -07:00
Tom Eastep
acb2e2a8ab Implement mss= in hosts file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-12 15:14:35 -07:00
Tom Eastep
48570227ba Big cleanup of TOS handling 
- Validate settings/matches
- Allow setting in the tcrules file.
- Deprecate /etc/shorewall[6]/tos
 2012-03-09 16:16:25 -08:00
Tom Eastep
c112f20e17 Tighten editing of LENGTH column(s) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-07 14:07:04 -08:00
Tom Eastep
b2842ae8d4 Don't allow reserved variables to be set in params 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-05 15:42:53 -08:00
Tom Eastep
dff5136134 Correct issues with debugging the generated script 
a) Rename DEBUG to g_debug_iptablesb
b) Clear all of the tables prior to handling iptables-restore input.
 2012-03-05 15:21:10 -08:00
Tom Eastep
a84e131115 Fix bug in DSCP implementation. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-05 09:50:15 -08:00
Tom Eastep
aab6e67e70 Omit non-default geometry settings from updated shorewall.conf. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-29 12:34:06 -08:00
Tom Eastep
47453a20f7 Tweak to Run-time gateway variables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-24 09:02:04 -08:00
Tom Eastep
7273f4d8d4 Implement run-time gateway variables. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-23 13:36:00 -08:00
Tom Eastep
2624005fa8 Fix FORMAT-2 interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 16:41:56 -08:00
Tom Eastep
d5af9c360d Implement FORMAT-2 interfaces file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 11:23:58 -08:00
Tom Eastep
2137840fec Fix bug in DSCP support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 16:40:11 -08:00
Tom Eastep
a1ec1dc178 Add DSCP match support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 08:47:48 -08:00
Tom Eastep
e2f4af6e48 Create a Perl-style switch statement to handle irregular entries in 
the tcrules file.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 17:28:49 -08:00
Tom Eastep
b1272e8835 Add DSCP target support. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 17:04:16 -08:00
Tom Eastep
75d5957020 Unify 'dont_' chain flags 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 14:20:09 -08:00
Tom Eastep
1896e56894 Rework some newbie code in add_group_to_zone() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 08:39:17 -08:00
Tom Eastep
7cd7f1ebbe Make zone-option hashes and constants global 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 08:30:39 -08:00
Tom Eastep
7fef97d92d Fix compiler crash from unknown interface 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 10:02:39 -08:00
Tom Eastep
cd3a9854f8 Change ipset flags error to a warning 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 08:22:16 -08:00
Tom Eastep
59fea1a05d Add a SWITCH column to /etc/shorewall/masq 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 08:17:14 -08:00
Tom Eastep
1c7476fe61 Validate SOURCE/DEST fit for ipset flags 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-17 15:46:28 -08:00
Tom Eastep
460efbac77 Merge branch '4.5.0' 2012-02-11 11:36:38 -08:00
Tom Eastep
09078cf6ad Add comments to add_interface_options() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-07 14:20:11 -08:00
Tom Eastep
f5c09a9e2e Restore 'update -b' functionality 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-07 07:40:35 -08:00
Tom Eastep
f4be778b86 Restore 'update -b' functionality 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-07 07:38:07 -08:00
Tom Eastep
bd959884cc Don't require a MARK value on the default class. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-06 14:40:22 -08:00
Tom Eastep
a87a981a2e Merge branch '4.5.0' 2012-02-05 13:19:54 -08:00
Tom Eastep
e8875ae50b Sort emitted param settings in export_params() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-05 10:03:47 -08:00
Tom Eastep
8561bb77ee Delete the BLACKLIST entry in %sections 2012-02-05 09:40:02 -08:00
Tom Eastep
a25075d3c5 Minor cleanup of Rules file 
- Correct comments
- Delete stale comments
- Simplify a statement in process_rules1()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 10:34:53 -08:00
Tom Eastep
63aaeb37c4 Remove redundant prototype. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 10:34:37 -08:00
Tom Eastep
99e0a340b1 Cosmetic changes to Zones.pm source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 10:34:30 -08:00
Tom Eastep
b5e3a41e13 Remove redundant logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 10:34:20 -08:00
Tom Eastep
5c30c236a3 Minor cleanup of Rules file 
- Correct comments
- Delete stale comments
- Simplify a statement in process_rules1()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 09:53:43 -08:00
Tom Eastep
cdf284a4ee Remove redundant prototype. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 09:06:20 -08:00
Tom Eastep
57d1b29d1e Cosmetic changes to Zones.pm source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 07:29:13 -08:00
Tom Eastep
25031c3a42 Remove redundant logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 07:21:28 -08:00
Tom Eastep
0c1beb50ae Add 'IMQ Target' capability to tcrules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-02 12:54:00 -08:00
Tom Eastep
ab04a7fb46 Fix comments -- reflect changes done during the irule implementation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-01 13:53:12 -08:00
Tom Eastep
45a1f9df4f Streamline exclusion of the %vserver% pseudo-interface. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-01 10:25:26 -08:00
Tom Eastep
3f42b6d76f Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall 2012-01-25 20:41:50 -08:00
Tom Eastep
df3bded324 Simply getparams as a result of the new lib.cli variable-setting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-25 20:41:08 -08:00
Tom Eastep
7cd05fd874 Correct routing commands in proxy NDP 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-21 19:58:47 -08:00
Tom Eastep
7d1bb30175 Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall 2012-01-17 13:12:01 -08:00
Tom Eastep
fc5f439b4b Generate prio 999 rule when USE_DEFAULT_RT=Yes, even when there are no balance providers. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-17 13:00:34 -08:00
Tom Eastep
ed3a623184 Cosmetic and maintainability improvements: 
1. Export optimization masks from Shorewall::Chains for use in
   Shorewall::Compiler.
2. Move capability reporting and checkint from Shorewall::Compiler to
   Shorewall::Config.
3. Eliminate some gratuitous black lines.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-17 07:24:12 -08:00
Tom Eastep
3120bb37d1 Reload load distribution chains during 'refresh' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-16 10:07:18 -08:00
Tom Eastep
58bf562747 Generate load rules at runtime rather than at compile time. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-15 19:23:44 -08:00
Tom Eastep
364420c4eb Don't derive base in load_chain() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-15 07:54:30 -08:00
Tom Eastep
b0f7c08844 Save load and status of each interface. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-14 17:43:25 -08:00
Tom Eastep
7316a2c51a Implement 'load=<load-factor>' in providers file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-13 16:37:05 -08:00
Tom Eastep
3920cef17e Update copyright on Shorewall::Providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-12 07:14:04 -08:00
Tom Eastep
ec8491caf8 Issue a warning message when both 'route_rules' and 'rtrules' exist. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-12 07:10:16 -08:00
Tom Eastep
057ea718cd Remove 'stat' provider option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-12 07:09:53 -08:00
Tom Eastep
58a0b9b5c1 Rename route_rules to rtrules -- phase 2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-09 07:19:10 -08:00
Tom Eastep
048d380c28 Issue warning if there is a deprecated option setting in the .conf file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-07 19:58:45 -08:00
Tom Eastep
ce73bb3d22 Unify prog.footer and prog.footer6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-07 13:53:41 -08:00
Tom Eastep
6f5ab698b4 Add a PROBABILITY column to the tcrules file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-06 12:54:37 -08:00
Tom Eastep
c4768d4a4a Allow run-time address variable in the SOURCE column of route_rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-06 11:59:22 -08:00
Tom Eastep
f003c0644b Fix MARK_IN_FORWARD_CHAIN=Yes with fw source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-06 09:26:43 -08:00
Tom Eastep
5ddb197680 Make '0' equivalent to '-' in the IN_BANDWIDTH column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-06 09:14:07 -08:00
Tom Eastep
cda4c6ed11 Implement 'stat' provider option -- phase 1 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-05 16:49:26 -08:00
Tom Eastep
46d8adcfe9 Add STATISTIC_MATCH capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-04 15:46:01 -08:00
Tom Eastep
84dc26b82c Create lib.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-03 13:06:00 -08:00
Tom Eastep
7d756f51ac More unification of prog.header and prog.header6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-03 08:39:18 -08:00
Tom Eastep
4216d80c12 Allow Provider name in 'disable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-02 15:25:43 -08:00
Tom Eastep
018ba394e3 Move common code from prog.header[6] to lib.common 2012-01-02 14:13:19 -08:00
Tom Eastep
a39f4699dc Update versions and copyrights 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-01-02 07:43:13 -08:00
Tom Eastep
288c7b06dc Place sfilter jumps in the option chains 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-31 14:47:36 -08:00
Tom Eastep
4b8fb130ba Update copyright dates. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-31 14:15:25 -08:00
Tom Eastep
c2293f3d64 Eliminate the $blrules global in Shorewall::Rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-31 13:16:04 -08:00
Tom Eastep
d6bac484dc Allow the timeout to be specified in that 'safe' commands. 
Also, allow a suffix (s, m or h) in the <timeout> paramater to the 'try' command.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-31 09:40:36 -08:00
Tom Eastep
64d3ac036b Disable BLACKLIST section 2011-12-30 20:25:54 -08:00
Tom Eastep
28f27c65aa Use SHA1 to shorten digests. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-30 14:58:49 -08:00
Tom Eastep
4d9a43a4dd Delete some 'dont_move' flags 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-30 11:31:08 -08:00
Tom Eastep
1d9a4c58e9 Cosmetic change with comments. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-30 10:59:23 -08:00
Tom Eastep
6f61293b08 Reduce the size of many configs by not copying long chains multiple times. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-30 10:27:58 -08:00
Tom Eastep
b63c7e0016 A bit of optimization in add_interface_options() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-30 08:08:28 -08:00
Tom Eastep
6bed5e5e55 Merge branch '4.4.27' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-30 07:28:14 -08:00
Tom Eastep
5b2f960db3 Disallow :P in CLASSIFY rules and complain if :F is used when the SOURCE or DEST is $FW. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-30 07:22:14 -08:00
Tom Eastep
1da7f52ed5 Copy output interface options rather than jump 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-29 18:49:47 -08:00
Tom Eastep
39f214208a Fix silly bug in the new option chain implementation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-29 17:57:39 -08:00
Tom Eastep
6926bcdbb9 More refinements of the option chain stuff. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-29 14:52:07 -08:00
Tom Eastep
f9960a0c94 Restore blacklst and blackout chains 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-29 13:45:35 -08:00
Tom Eastep
2c441b5393 Copy option rules into interface chains if no blacklist 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-29 09:32:16 -08:00
Tom Eastep
bddfb4f41c Add output option chains 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-29 08:22:00 -08:00
Tom Eastep
03610181fd Disallow :P in CLASSIFY rules and complain if :F is used when the SOURCE or DEST is $FW. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-29 07:49:53 -08:00
Tom Eastep
3ca9577f04 Cruft removal 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-28 16:22:11 -08:00
Tom Eastep
8cdc83638e Don't allow PREROUTING CLASSIFY rules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-28 14:07:12 -08:00
Tom Eastep
a98c85cbc4 Make 'audit' work on a converted blacklist file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-28 10:30:24 -08:00
Tom Eastep
eda918215d Option chain phase II implementation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-28 10:29:15 -08:00
Tom Eastep
0518def9cf Merge branch '4.4.27' 2011-12-28 09:58:19 -08:00
Tom Eastep
09f58512be Make 'audit' work on a converted blacklist file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-28 09:34:34 -08:00
Tom Eastep
eff447ac11 Phase one option chain implementation. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-27 18:12:58 -08:00
Tom Eastep
ea9c59a297 Add an interface filter chain for each interface. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-27 13:52:44 -08:00
Tom Eastep
49eb84b9e2 Remove more helper/proto silliness 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-27 13:06:37 -08:00
Tom Eastep
8a8214704e Centralize checking for required proto with helper 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-27 13:04:19 -08:00
Tom Eastep
aa743f2886 Merge branch '4.4.27' 2011-12-27 13:02:08 -08:00
Tom Eastep
c5868ef6e4 Revert "Remove redundant check." 
This reverts commit 53dd13cf15.
 2011-12-27 13:01:27 -08:00
Tom Eastep
7721644209 Merge branch '4.4.27' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.4.27 
Conflicts:
	Shorewall/Perl/Shorewall/Chains.pm
	Shorewall/Perl/Shorewall/Raw.pm
 2011-12-27 12:32:13 -08:00
Tom Eastep
1c2ab238a5 Merge branch '4.4.27' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.4.27 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-26 13:22:30 -08:00
Tom Eastep
3541767881 Don't croak when adding gateway route fails for IPv6. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-26 11:58:06 -08:00
Tom Eastep
53dd13cf15 Remove redundant check. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-26 11:57:34 -08:00
Tom Eastep
5520a6d31d Validate helper<->protocol 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-24 09:24:01 -08:00
Tom Eastep
be4cb9d26a Validate helper<->protocol 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-23 17:55:13 -08:00
Tom Eastep
97354c8ce8 Detect CT_TARGET when LOAD_HELPERS_ONLY=No 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-23 11:59:51 -08:00
Tom Eastep
0e3ad6ff91 Omit the chain designator from an error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-23 07:51:12 -08:00
Tom Eastep
1c535ee0f9 Correct handling of a chain designator in CLASSIFY rules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-23 07:44:16 -08:00
Tom Eastep
3081ab1da1 Correct RELATED_DISPOSITION error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-22 15:51:50 -08:00
Tom Eastep
ce735e9415 Allow a chain designator in CLASSIFY rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-22 15:41:16 -08:00
Tom Eastep
e93dbdcb99 Stop generation of superfluous routing rules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-21 08:01:25 -08:00
Tom Eastep
c03fe0a076 Implement USE_LOGICAL_NAMES. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-20 16:03:56 -08:00
Tom Eastep
1c8f6d3856 Eliminate a variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-18 15:05:03 -08:00
Tom Eastep
c00068e08d Another correction to the 'CT' target 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-18 07:21:32 -08:00
Tom Eastep
a80b46be81 Allow a port number to be appended to a helper name 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-17 17:08:24 -08:00
Tom Eastep
ec848ebc01 Parenthesize qa/.../ in embedded Perl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-17 10:09:23 -08:00
Tom Eastep
ba5db8753e Fix CT helpers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-17 08:59:27 -08:00
Tom Eastep
9d66f34932 Allow config options to be used as shell variables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-15 12:52:22 -08:00
Tom Eastep
10d10b1c16 Remove a redundant capability test 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-15 12:52:06 -08:00
Tom Eastep
6194eceaa4 Restore text of 'Provider "..." compiled' message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-15 12:51:39 -08:00
Tom Eastep
2142baca4f Avoid inappropriate RELATED,ESTABLISHED rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-06 19:04:43 -08:00
Tom Eastep
004d0bcc38 Allow rules in the RELATED section when there are non-default settions of 
the new RELATED_* options.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-06 13:38:11 -08:00
Tom Eastep
d4957696d1 Update man pages and sample files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-05 17:45:09 -08:00
Tom Eastep
439af55312 Implement RELATED_DISPOSITION and RELATED_LOG_LEVEL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-05 16:08:17 -08:00
Tom Eastep
febe9e5222 Apply Chris Boot's fix for TC_ENABLED=Shared 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-05 12:22:48 -08:00
Tom Eastep
2cffae738f Initial implementation of CT target support in the 'notrack' file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-04 17:15:58 -08:00
Tom Eastep
a794027f63 Implement CT capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-04 14:35:53 -08:00
Tom Eastep
e7d2b1d4ed Consolidate the lib.common files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-04 09:19:48 -08:00
Tom Eastep
6bb487bb68 Pass $CONFIG_PATH to compiler.pl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2011-12-02 07:36:23 -08:00