extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-03 13:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,048 Commits 104 Branches 736 Tags 55 MiB
7edf4918d7
Commit Graph

7590 Commits

Author SHA1 Message Date
Tom Eastep
32f888a7d4 Add an ENVIRONMENT section to the CLI manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-15 15:41:55 -07:00
Tom Eastep
c725372639 Correct logging of 'reloaded' message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-15 14:46:21 -07:00
Tom Eastep
524838ae47 Implement $SW_LOGGERTAG 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-15 14:29:51 -07:00
Tom Eastep
6aa0ecae4f Re-factor the code for saving/loading ipsets 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-14 15:15:47 -07:00
Tom Eastep
434e042494 Add the deprecated/ directories to the CONFIG_PATH 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-14 14:17:06 -07:00
Tom Eastep
9fa0df2fd1 Move the code that generates zap_ipsets() to after save_ipsets() generation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-14 09:56:48 -07:00
Tom Eastep
074655d1bd Fix AUTOMAKE and the start command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-14 09:43:21 -07:00
Tom Eastep
216bc715e8 Clean up V4/V5 ipset enforcement 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-14 09:00:38 -07:00
Tom Eastep
dbd42e1d5d More ipset fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-12 16:29:13 -07:00
Tuomo Soini
772f88b1fd action.A_Reject: improve comment text 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-12 13:17:56 +03:00
Tuomo Soini
3e0b8c60a2 Reverse the order of ICMP and Broadcast checking in the default actions 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-12 10:12:29 +03:00
Tom Eastep
16afd880b2 Reverse the order of ICMP and Broadcast checking in the default actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-11 11:16:46 -07:00
Tom Eastep
76a5841fcd Reverse the order of Broadcast and ICMP checking in the default actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-11 10:47:11 -07:00
Tom Eastep
9758e8cdc5 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-04-11 10:41:44 -07:00
Tom Eastep
2cf3706864 Correct handling of a zone with two interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-11 10:32:26 -07:00
Tom Eastep
3028dafbac Correct DBL 'src-dst' handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-11 09:13:17 -07:00
Tom Eastep
16a31c3d29 Make MINIUPNPD work with DOCKER 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-11 09:02:44 -07:00
Tom Eastep
d3f377e915 Don't double-save the dynamic blacklisting ipset 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-11 08:37:39 -07:00
Tuomo Soini
54a5748395 macros: RedisCluster and RedisSentinel 
http://redis.io/topics/sentinel

Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-11 14:39:21 +03:00
Tom Eastep
6c00f72f44 Create ipsets with the 'counters' option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-10 18:09:41 -07:00
Tom Eastep
deaaecdf1c Add 'nodbl' interface option. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-10 16:09:39 -07:00
Tom Eastep
05e4049174 Ipset-based blacklisting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-10 16:07:56 -07:00
Tom Eastep
ef10515a42 Correct FASTACCEPT description 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-10 07:20:45 -07:00
Tom Eastep
5db6cb1b7d Correct load_ipsets() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-09 16:07:10 -07:00
Tom Eastep
76c8917aa7 Add a sixth parameter to Drop and Reject 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-08 09:10:45 -07:00
Tom Eastep
be58d530c4 Document 'logjump' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-08 09:09:59 -07:00
Tom Eastep
321476fd51 Tweak terminating() implementation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-08 08:24:57 -07:00
Tom Eastep
bd6b32eb25 Add a progress message for REJECT_ACTION processing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-07 10:30:54 -07:00
Tom Eastep
4fdf54eca1 Tweak process_reject_action() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-07 10:02:48 -07:00
Tom Eastep
70bbd21b35 Ensure that the REJECT_ACTION is terminating 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-07 09:34:38 -07:00
Tom Eastep
87a9b95f73 Catch case where a transformed rule jumps to its own chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-07 08:58:50 -07:00
Tom Eastep
ecd7261365 Use -g when target is a terminating chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-07 08:48:36 -07:00
Tom Eastep
293cd1d66a Always go to the reject chain rather than jump to it 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-06 09:14:06 -07:00
Tom Eastep
436b5d89ce Correct comment 
- The chain will only exist if logging wasn't specified for the same
  disposition.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-06 08:50:29 -07:00
Tom Eastep
26795cf082 Correct setup of $usedactions{A_REJECT} 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-06 08:18:36 -07:00
Tom Eastep
95e4071f34 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-04-06 07:42:46 -07:00
Tuomo Soini
20179a5c9d remove completely false README.txt 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-06 10:23:58 +03:00
Tom Eastep
b7e6893f7d Restore DropUPnP behavior in Reject 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-05 20:00:15 -07:00
Tom Eastep
3ac3ae279f Add A_REJECT action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-05 16:38:39 -07:00
Tom Eastep
54843c617d Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-04-05 11:46:42 -07:00
Tom Eastep
e9467326f3 Allow allow REJECT to take a parameter 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-05 11:20:44 -07:00
Tuomo Soini
80bf77e8a8 modules.xtables: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:31:36 +03:00
Tuomo Soini
1e5ebee799 modules.tc: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:31:36 +03:00
Tuomo Soini
74fe7b302e modules.ipset: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:31:36 +03:00
Tuomo Soini
d70e18535b modules.extensions: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:31:36 +03:00
Tuomo Soini
64a6b36918 modules.essential: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:31:36 +03:00
Tuomo Soini
2962809243 action.Untracked: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
23a91d7c26 action.template: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
30b2b2dcb4 action.TCPFlags: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
46a86cfa58 action.SetEvent: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
ad2dfd9eaf action.RST: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
001aabf72c action.ResetEvent: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
7052819a9c action.Related: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
2b1244c110 action.Reject: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
94803b63b1 action.NotSyn: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
5f33cb5d0a action.New: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
deda26c790 action.mangletemplate: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
f9f349a148 action.Invalid: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
2842e897c9 action.IfEvent: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
de44a16094 action.GlusterFS: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
6560e74c2c action.Established: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
f7ddf3008d action.DropSmurfs: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
cb608172d3 action.dropInvalid: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
f806010521 action.Drop: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
205254e043 action.DNSAmp: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
a7efa12fff action.Broadcast: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
95c4f2d7f6 action.AutoBLL: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
89189f7836 action.AutoBL: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
c2e3156e5c action.A_Reject: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
ffe9f88c07 action.allowInvalid: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tuomo Soini
e4c9c83e2b action.A_Drop: reformat to new header style 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-04-05 20:13:55 +03:00
Tom Eastep
77a93d10a4 Don't pass an argument to DropUPnP out of Drop and Reject 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-04 15:55:48 -07:00
Tom Eastep
75df718865 Reword comment in push_action_params() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-04 09:41:28 -07:00
Tom Eastep
ae8e2f70ea Efficiency change to known_interface() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-03 17:34:02 -07:00
Tom Eastep
39f5b77e5f Fix known_interface() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-03 16:31:45 -07:00
Tom Eastep
cb5a2519f3 Keep hyphens in @chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-03 16:30:31 -07:00
Tom Eastep
4151f7c504 Revert change to log_[i]rule_limit 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-03 16:29:52 -07:00
Tom Eastep
054837aeea Use the real chain name in log messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-03 13:04:25 -07:00
Tom Eastep
b637d303b9 Correct use of a physical interface name in the hosts file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-02 17:27:20 -07:00
Tom Eastep
0dbf42424d Make physical name a synonym for the correcponding logical name. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-02 10:04:05 -07:00
Tom Eastep
f22e8d6d55 Allow physical interface to work in the ecn file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-01 15:10:49 -07:00
Tom Eastep
d98305c6f4 Correct default for MINIUPNOD 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-01 12:20:42 -07:00
Tom Eastep
3cbfdadb32 Merge branch '5.0.7' 2016-04-01 09:46:53 -07:00
Tom Eastep
81d76e3817 Document + in the MODULESDIR setting. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-01 09:43:06 -07:00
Tom Eastep
df1b1f6768 Add MINIUPNPD option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-04-01 08:57:08 -07:00
Tom Eastep
3881b38e02 Fix similar INTERFACE column issue in the nat and netmap files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-31 14:16:43 -07:00
Tom Eastep
8a8f3b6f59 Merge branch '5.0.7' 2016-03-31 12:55:16 -07:00
Tom Eastep
b9bed00123 Correct handling of a physical name in a masq rule 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-31 12:52:30 -07:00
Tom Eastep
38aa7797c4 Allow protocol and user lists in actions and macros 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-30 08:34:42 -07:00
Tom Eastep
404540ffe1 Merge branch '5.0.7' 2016-03-30 08:17:19 -07:00
Tom Eastep
dd3c0daa08 Handle inline matches correctly in the mangle file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-29 13:33:47 -07:00
Tom Eastep
4fddfcfba0 More complete fix for inline matches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-29 13:15:01 -07:00
Tom Eastep
421d5f6043 Move Raw matches to last. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-29 09:31:27 -07:00
Tom Eastep
382ab380a2 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-03-29 07:36:49 -07:00
Tuomo Soini
2342c7cd9c Perl/Shorewall/Chains.pm: Fix warning with older perl 2016-03-29 09:58:33 +03:00
Tom Eastep
66ae4975b2 Allow :R with DIVERT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-28 15:52:49 -07:00
Tom Eastep
5b7a9db170 Correct clearing of inline matches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-28 15:48:59 -07:00
Roberto C. Sánchez
899a317c95 Fix typos 2016-03-26 22:25:30 -04:00
Tom Eastep
ad87d94e33 Small efficiency change 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-26 13:12:33 -07:00
Tom Eastep
f86abf9552 Eliminate @columnstack -- simple save the columns array on the call stack. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-22 10:49:40 -07:00
Tom Eastep
9fe1a34412 Tighten up editing of configuration options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-21 12:03:45 -07:00
Tom Eastep
abe533b6e3 Correct the action on ingress filters 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-19 13:45:33 -07:00
Tom Eastep
1c3140789c Add stab to ingress qdiscs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-19 13:25:39 -07:00
Tom Eastep
0399a346d0 Replace a silly line of code. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-19 12:05:45 -07:00
Tom Eastep
6ed3861d76 Correct Mangle Action Handling for second visit to the same action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-18 15:25:52 -07:00
Tom Eastep
7a18847c14 Correct handling of log level in a _DEFAULT setting. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-18 15:25:14 -07:00
Tom Eastep
273c89a753 Implement MARK and CONNMARK in the rules file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-18 11:42:58 -07:00
Tom Eastep
2bebf1c95a Make '&' and '|' work with CONNMARK 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-18 11:30:52 -07:00
Tom Eastep
18573037f9 More 'check -r' fixes around Docker 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-18 11:09:39 -07:00
Tom Eastep
818628138b Add MARK and CONNMARK to the %targets table 
- Also, sort the table entries

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-18 10:21:35 -07:00
Tom Eastep
2adec0eb65 Implement a filename cache for find_file() 
- Don't need to search the CONFIG_PATH for re-open of same file.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-18 09:45:41 -07:00
Tom Eastep
6ae94767b7 Correct a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-18 08:31:52 -07:00
Tom Eastep
9f26c010ac Remove embedded Perl from allowInvalid and dropInvalid 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-17 08:59:29 -07:00
Tom Eastep
9ab2310dc8 Correct an incorrect comment in process_rules() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-17 08:47:33 -07:00
Tom Eastep
c9c5f0174c Remove trailing blank lines from action.TCPFlags 2016-03-16 14:54:05 -07:00
Tom Eastep
da0653cb2f Declare passed() in Shorewall::User rather than importing it from Config 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-15 14:16:15 -07:00
Tom Eastep
65ce6ed226 Update modules to use passed() for parameter testing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-15 12:06:32 -07:00
Tom Eastep
eb9dd3e485 Implement passed() in Config.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-15 12:00:56 -07:00
Tom Eastep
796f191d48 Don't re-stat action files in process_action() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-15 09:03:36 -07:00
Tom Eastep
71c26beab4 Remove dead code (caused by bad test) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 17:56:34 -07:00
Tom Eastep
6f04902963 Make use of 'state=' in actions a fatal error 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 17:55:54 -07:00
Tom Eastep
bd2295c4c3 Avoid embedded Perl in the Broadcast action when ADDRTYPE is available 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 15:57:32 -07:00
Tom Eastep
901c6d34f6 Correct typo in Rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 15:56:57 -07:00
Tom Eastep
741da14789 Ignore 'state' in the actions file with a warning 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 15:46:29 -07:00
Tom Eastep
34c3828b7c Fix action.Related 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 15:44:16 -07:00
Tom Eastep
eed7692952 Document the state action option. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 15:15:32 -07:00
Tom Eastep
3c544b20e6 Convert the state actions to use the 'state' action option 
- Also avoid the CLI having to know about builtin actions

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 14:54:09 -07:00
Tom Eastep
dd547c90a8 Implement the 'state' action option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 14:30:36 -07:00
Tom Eastep
35fac8c2ea Avoid repeated %actions lookup in process_action() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 12:37:45 -07:00
Tom Eastep
513b828788 Pass '$prerule' to process_inline() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 10:56:07 -07:00
Tom Eastep
28e0cb5335 Use filename stored in the actions table 
- Avoid a find_file call on each action invocation

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 10:55:39 -07:00
Tom Eastep
c631173310 Eliminate the %inlines table 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-14 10:47:18 -07:00
Tom Eastep
95da427ea8 Update manpages for 'audit' actions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 15:53:31 -07:00
Tom Eastep
2c14b7c9e3 Rename %actparms to %actparams 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 15:36:38 -07:00
Tom Eastep
8e7af2e95e Additional editing of audit action parameters. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 15:28:49 -07:00
Tom Eastep
6be4fd377f Make RST and NotSyn 'audit' actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 14:40:12 -07:00
Tom Eastep
44c0bffcd3 Add 'audit' option to actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 14:39:46 -07:00
Tom Eastep
2c3644a510 Make Action/Inline binary options into a bitmap 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 14:15:43 -07:00
Tom Eastep
407bc8f8db More prerule fixes in expand_rule() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 12:57:23 -07:00
Tom Eastep
2743a411ae Add a jump to DOCKER from OUTPUT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 12:51:36 -07:00
Tom Eastep
1a23e840d7 Restore NotSyn rule in action.Reject 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 12:21:24 -07:00
Tom Eastep
bed747c20b Restore NotSyn and RST logic using perl_action_tcp_helper() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 10:49:23 -07:00
Tom Eastep
c2fd48c4c6 Include pre-rule matches when the target is a chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 10:08:17 -07:00
Tom Eastep
054637880b Cleanup of Standard Actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-13 10:06:02 -07:00
Tom Eastep
5f01bc75bd Better fix for $current_param in the INLINE block of process_rule() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 18:28:27 -08:00
Tom Eastep
0e59b82503 Handle '+' in inline matches the mangle and masq files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 17:14:15 -08:00
Tom Eastep
33343aaf17 Modify TCP-specific actions to use + in inline_matches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 17:01:52 -08:00
Tom Eastep
90ace544eb Implement '+' to specify inline matches as "early" 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 16:39:46 -08:00
Tom Eastep
c36cee28fb Save/Restore $current_param in process_inline() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 16:39:08 -08:00
Tom Eastep
df5f34951c Correct actions 
- Restore the TCP-related actions
- Correct typo in action.Drop

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 15:09:31 -08:00
Tom Eastep
ec2ebee0e6 Clear inline matches between calls to process_rule() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 15:08:47 -08:00
Tom Eastep
a50c52675b Correct a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 15:08:04 -08:00
Tom Eastep
bb7b3123df Eliminate ?begin perl ... ?end Perl in many actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 12:15:07 -08:00
Tom Eastep
3960fa6e0e Performance tweak to read_a_line() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-12 09:05:30 -08:00
Tom Eastep
a7fda02d88 Print lines copied into the generated script when tracing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-11 15:59:49 -08:00
Tom Eastep
68a324c62c Small tweaks to read_a_line() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-11 13:56:03 -08:00
Tom Eastep
d179615fca 'trace' and 'check -r' uses $PAGER 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-11 13:26:23 -08:00
Tom Eastep
6779c8307f Optimize chain resolution in process_mangle_rule1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-10 15:26:52 -08:00
Tom Eastep
147c7e284f Fix a couple of Mangle Action blunders 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-10 13:59:29 -08:00
Tom Eastep
8d657775af Fix 'check -r' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-10 13:41:59 -08:00
Tom Eastep
b14bf0e779 Remove unused globals from the Rules module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-10 11:14:51 -08:00
Tom Eastep
dc286c472c More tidying up of Mangle Actions 
- Delete an inadvertently-added blank line
- Move $convert declaration back to the Tc module
- Add comments in the Tc module about key moved declarations

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 15:51:54 -08:00
Tom Eastep
87f63b7160 Allow USE_DEFAULT_RT with NetworkManager 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 14:17:40 -08:00
Tom Eastep
617218f8ea Merge branch '5.0.6' 2016-03-09 11:36:46 -08:00
Tom Eastep
09c3be0adb Correct typo that cases restart failure. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 11:18:05 -08:00
Tom Eastep
ec9148637f Inline mangle actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-09 10:28:02 -08:00
Tom Eastep
991d8d2d3f Move convert_tos() back to the Tc module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-08 11:17:14 -08:00
Tom Eastep
301bce5d34 Clean up mangle actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-08 09:27:43 -08:00
Tom Eastep
1add0487f6 Document Mangle Actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-07 14:56:20 -08:00
Tom Eastep
a4aa020a84 Add R chain designator 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-07 13:51:49 -08:00
Tom Eastep
81c16d2d67 More Mangle Action Changes 
- Move open_mangle_for_output() back to the Tc module
- Eliminate global variables in process_mangle_rule1()
- Allow creation of mangle action chains
- Minor (but needed) logic changes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-07 13:51:28 -08:00
Tom Eastep
bbbf54f7c3 Merge branch '5.0.6' 2016-03-07 08:59:17 -08:00
Tom Eastep
c37e41ee9c Avoid duplicate route rules from 'disable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-06 15:48:33 -08:00
Tom Eastep
ba6dc9c5c0 First cut at mangle actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-06 12:42:22 -08:00
Tom Eastep
89b2c2fb55 Move mangle processing into the Rules module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-06 08:59:37 -08:00
Tom Eastep
d4e2508a90 Clarify USE_DEFAULT_RT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 14:26:42 -08:00
Tom Eastep
2bb143b28c Save/restore nat OUTPUT jump to DOCKER 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 12:21:45 -08:00
Tom Eastep
99f83da3ab Avoid duplicate rules after reload 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 11:09:53 -08:00
Tom Eastep
89e3e959dc Revert bad change 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 10:20:55 -08:00
Tom Eastep
9e41264671 Go back to generating docker0 rules when it is defined to Shorewall 
- Avoids issues after 'stop'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 09:27:47 -08:00
Tom Eastep
3fb715740d Avoid duplicated code blocks in save_dynamic_chains() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-04 09:27:04 -08:00
Tom Eastep
ed6ff96aa0 Replace another $VARDIR instance 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-03 14:11:57 -08:00
Tom Eastep
18dac19d86 Remove dead code from save_dynamic_chains() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-03 14:09:55 -08:00
Tom Eastep
d5ea876e93 Replace $VARDIR with ${VARDIR} for consistency 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-03 11:54:14 -08:00
Tom Eastep
f7a6ad1412 Clean up formatting in define_firewall() and stop_firewall() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-03 09:24:43 -08:00
Tom Eastep
b279869629 Fix DOCKER issue 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 20:59:44 -08:00
Tom Eastep
62880bdf1b Don't populate PAGER in the sample config files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 13:04:47 -08:00
Tom Eastep
c56ba534d6 Yet more PAGER fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 12:34:39 -08:00
Tom Eastep
90bc894200 More PAGER fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 08:58:26 -08:00
Tom Eastep
90d254f0c3 Add PAGER option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-02 08:32:49 -08:00
Tom Eastep
a95de8d092 Page the output of verbose commands 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-03-01 15:12:54 -08:00
Tom Eastep
68cce5ff73 Eliminate some sillyness in normalize_action() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-29 11:17:15 -08:00
Tom Eastep
8a02624f05 Update copyrights in the install and uninstall scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-29 11:03:09 -08:00
Tom Eastep
1c1881859f Delete untrue comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-29 08:45:47 -08:00
Tom Eastep
5b163e9bc2 Save/restore docker0 rules when it isn't defined to Shorewall 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-27 14:09:29 -08:00
Tom Eastep
71d64ab380 Add DOCKER network support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-27 13:36:47 -08:00
Tom Eastep
36d8518562 Code compaction 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-26 13:13:56 -08:00
Tom Eastep
6c88eb6916 Add an ECN action to shorewall-mangle(8) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-26 09:33:16 -08:00
Tom Eastep
6e1cc0f1d0 Correct stop/start Docker handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-25 13:37:44 -08:00
Tom Eastep
ee5ef07035 Correct another silly typo -- this time in allowBcast() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-24 14:58:10 -08:00
Tom Eastep
3c8696b91d Correct silly typo in setup_ecn() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-24 09:35:13 -08:00
Tom Eastep
fd4de0c66a Create more compact DOCKER conditional rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-22 14:46:35 -08:00
Tom Eastep
49536562e2 Emit more compact code when conditionally adding DOCKER chains 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-22 13:49:22 -08:00
Tom Eastep
36b6863b02 Update copyright date on lib.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-22 13:48:48 -08:00
Tom Eastep
6a8e280483 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-02-21 12:59:10 -08:00
Tom Eastep
63b501996e Require ADDRTYPE for DOCKER=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-21 12:26:39 -08:00
Tom Eastep
7a9e9ad945 Decommit DOCKER=Yes in IPv6. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-21 12:03:41 -08:00
Tom Eastep
f4312a38b9 Add all Docker rules in the stopped state 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-21 10:33:45 -08:00
Tom Eastep
fc6a1f6d0d Don't create Docker chains/rules if Docker isn't running 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-21 09:54:37 -08:00
Tom Eastep
83b899b030 Save/Restore Docker-generated rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 14:02:54 -08:00
Tom Eastep
61f6cacc30 Infrastructure required by Docker 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 14:01:48 -08:00
Tom Eastep
caba1cd770 DOCKER=Yes requires IPTABLES_S 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 10:03:06 -08:00
Tom Eastep
4306ff1029 Correct 'save_dynamic_chains' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 09:57:11 -08:00
Tom Eastep
663f82c158 Move nat POSTROUTING rules to SHOREWALL if DOCKER=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-20 09:24:06 -08:00
Tuomo Soini
b39639e1f2 macro.SNMPtrap: fix file name to use common naming 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-20 18:45:55 +02:00
Tom Eastep
e66d9f6547 Add DOCKER option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-19 17:42:54 -08:00
Tom Eastep
f33f333937 Make 'default' and 'none' case insensitive in the GATEWAY column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:25:46 -08:00
Tom Eastep
5fc242f760 Use new column names in action.template 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 15:13:42 -08:00
Tom Eastep
94cfe54f92 Allow routing tables with no default route 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-17 11:49:09 -08:00
Tuomo Soini
32cd6eaa8a macro.Web: remove duplicate "This macro" 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 21:12:57 +02:00
Tuomo Soini
4e4f54a6cd macro.MDNS: fix header to show only one line in "shorewall show macros" 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 21:09:25 +02:00
Tuomo Soini
ea71679631 macro.JAP: fix comment text to work properly for "shorewall show macros" 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 21:06:40 +02:00
Tuomo Soini
5c7cba676b macro.Mail: use new MSA macro 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 20:17:24 +02:00
Tuomo Soini
c78e7635c1 macro.Trcrt: Remove extra "." 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 20:16:14 +02:00
Tuomo Soini
74cb2bea83 macro.template: update header for better screen fit 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:36:24 +02:00
Tuomo Soini
2c966d90f1 macro.Tinc: update header 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:31:41 +02:00
Tuomo Soini
6e41bc7e88 Submission: use common format for header 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:28:12 +02:00
Tuomo Soini
a86f895ae6 macro.Zabbix: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
4bfa419d4d macro.Xymon: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
c2e8659ba5 macro.Whois: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
b2fa421933 macro.Webmin: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
4ef0ebabbb macro.Webcache: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
d1d0dac9ce macro.Web: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
6535633fbb macro.VRRP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
d2422a1dea macro.VNCL: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
6dcb1e28b4 macro.VNC: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
f00f03eee3 macro.Trcrt: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
a351431c62 macro.Time: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
a9e354cec8 macro.TFTP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
aee6f9faa2 macro.Teredo: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
c285330f25 macro.template: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
bc57fedac4 macro.Telnets: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
ae7d78d75f macro.Telnet: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:40 +02:00
Tuomo Soini
cdae111c8d macro.Syslog: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
f36e204d4a macro.SVN: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
078dfc38ee macro.Submission: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
4f4ddd4809 macro.SSH: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
864659b96e macro.Squid: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
687cd578eb macro.SPAMD: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
d092044bdd macro.SNMPTrap: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
d72f0a1f41 macro.SNMP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
11cf80ce98 macro.SMTPS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
48efde89cd macro.SMTP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
26710e72a9 macro.SMBswat: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
f8d99a0f22 macro.SMBBI: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
316f07bce9 macro.SMB: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
73aa2c68eb macro.SixXS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
c2b1a0ce04 macro.SIP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
3cec3ce6bc macro.Sieve: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
a1a6352617 macro.SANE: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
a32c0c9901 macro.Rsync: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
38953df7fb macro.RNDC: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
b960256fdb macro.RIPbi: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
cfe2b89e2d macro.Rfc1918: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
9d4eb3eccf macro.Reject: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
8d13653fc2 macro.Redis: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
974e88c038 macro.RDP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
ff449953c6 macro.Rdate: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
e5818fb9d8 macro.Razor: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
29b30f29a0 macro.QUIC: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
feaadcd8f8 macro.Puppet: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
71681d1ccd macro.Printer: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
c9161a3eb2 macro.PPtP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
2c2c4194ce macro.PostgreSQL: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
5cda192731 macro.POP3S: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
9b6f8d2f0c macro.POP3: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
c25ddcea40 macro.Ping: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
5667919b91 macro.PCA: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
4f340e7033 macro.OSPF: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
724f21202c macro.OpenVPN: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
efa019a782 macro.NTPbrd: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
2612e012d6 macro.NTPbi: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
2420f24a62 macro.NTP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
688ba42a57 macro.NNTPS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
9bf7bb73f9 macro.NNTP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
897337acef macro.MySQL: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
f447e5f3ce macro.Munin: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
2208dc85c6 macro.MSSQL: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
bb558baf23 macro.MSNP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
f16a7d6224 macro.MongoDB: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
a4c88ee966 macro.mDNSbi: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
996b629029 macro.mDNS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
d732a8a040 macro.Mail: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
ce6532ebfb macro.LDAPS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
a82e517d05 macro.LDAP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
ccd1f3b9d3 macro.L2TP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
9b45c81dc6 macro.Kerberos: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
d9907e93e8 macro.Jetdirect: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
6222ec1e1a macro.JAP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
9b2bc4f53d macro.JabberSecure: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
e99b23c154 macro.JabberPlain: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
3a9979fb3d macro.Jabberd: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
4ed88eb4ad macro.Jabber: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
d890a840d4 macro.IRC: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
8c9c96c8d7 macro.IPsecnat: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
0718bebf6f macro.IPsecah: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
f7a9d7dc4d macro.IPsec: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
9ce2df55d1 macro.IPPserver: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
42438c817a macro.IPPbrd: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
e08079cc1b macro.IPP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
e49494bbe4 macro.IPMI: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
5496eacfa7 macro.IPIP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
ce2cf9e9f6 macro.IMAPS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
4f36f96163 macro.IMAP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
db62969526 macro.ILO: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
89bf8332be macro.ICQ: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
f516a07f08 macro.ICPV2: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
e4982e6919 macro.HTTPS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:39 +02:00
Tuomo Soini
4289d0a2c0 macro.HTTP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
696996c8de macro.HKP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
336518e24b macro.GRE: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
6a73b5bc87 macro.Goto-Meeting: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
536b5c4cfc macro.Gnutella: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
3b039c0cf0 macro.GNUnet: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
77a1d03435 macro.Git: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
5985ab2f88 macro.FTP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
26d1896d81 macro.Finger: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
2622489f36 macro.Edonkey: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
a12225047c macro.DropUPnP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
c0d1cbd4ca macro.DropDNSrep: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
71df5b5042 macro.Drop: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
8bb0fd93df macro.DNS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
934fa78228 macro.Distcc: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
a881d663be macro.DHCPfwd: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
848cb5954d macro.DCC: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
f09d93a5a6 macro.DAAP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
ff5c3eba5a macro.CVS: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
3ac875a66c macro.Citrix: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
af1d90368e macro.BLACKLIST: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
5075e298dc macro.BitTorrent32: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
231b12b520 macro.BitTorrent: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
016978eab5 macro.BGP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
2cea162713 macro.Auth: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
84caee9a3e macro.AMQP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
6888195ce6 macro.Amanda: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
538600d389 macro.AllowICMPs: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
bc34b49905 macro.A_DropUPnP: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
e4a4fb25f1 macro.A_DropDNSrep: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
a883a0720c macro.ActiveDir: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
4a3e168476 macro.A_AllowICMPs: update macro header and description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:20:38 +02:00
Tuomo Soini
7b4c4fb30d macro.MSA: Add as alias for Submission 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-15 18:19:11 +02:00
Tuomo Soini
daa016d2a3 Shorewall[6]/Makefile: remove extra restore, shorewall does that automatically 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-12 18:17:46 +02:00
Tuomo Soini
b57c02e0ed shorewall/Makefile: fix logics so you get error from reload 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2016-02-12 12:19:25 +02:00
Tom Eastep
a219778aa3 Correct macro indentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-09 18:20:12 -08:00
Tom Eastep
8ac0f96029 Delete blank line 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-09 18:20:00 -08:00
Tom Eastep
894a98f24e Improve optimizer handling of origin during rule merge 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-04 12:00:05 -08:00
Tom Eastep
bd9e8142b9 Ensure that the chain origin is used when there is no rule origin 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-03 10:43:10 -08:00
Tom Eastep
916a392fb0 Improve chain-completion rule tracking 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-02-02 14:57:47 -08:00
Tom Eastep
28983a0194 Add comment describing the origin member of a rule 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-31 09:29:24 -08:00
Tom Eastep
2cd098ba31 Update heading versions and copyrights 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-28 13:46:34 -08:00
Tom Eastep
9188f7efa3 Don't export shortlineinfo2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-28 13:38:26 -08:00
Tom Eastep
95a029316a Improve get_keys*() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-28 12:51:23 -08:00
Tom Eastep
d4bea3d3ec Optimize TRACK_RULES handling in the Chains module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-28 11:38:48 -08:00
Tom Eastep
6085c6092f Add origin comments to command-mode rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-28 10:58:09 -08:00
Tom Eastep
48df3d9627 Add origin member to the providers table 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-28 10:34:36 -08:00
Tom Eastep
94442abfcf Correct check for duplicate interface in providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-28 10:34:16 -08:00
Tom Eastep
86f2e23f33 Invoke add_irule_extended rather than a hack that predated that function 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-27 19:01:23 -08:00
Tom Eastep
6e9d5f45ec Avoid spurious comment in jump to interface option chains. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-27 16:50:03 -08:00
Tom Eastep
039fd6ddd8 Move origin handling into log_[i]rule_limit 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-27 14:24:56 -08:00
Tom Eastep
57288086bf Unify TRACK_RULES handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-27 12:55:21 -08:00
Tom Eastep
f999acda63 Eliminate shortlineinfo1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-27 10:21:08 -08:00
Tom Eastep
b4723da07c Eliminate $globals{TRACK_GLOBALS} 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-26 16:45:47 -08:00
Tom Eastep
3860a1dc72 Ensure that %origin is populated 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-26 16:31:04 -08:00
Tom Eastep
e756820ca1 Revert "Unify TRACK_RULES settings implementation" 
This reverts commit 866cb04cbb.
 2016-01-26 11:49:26 -08:00
Tom Eastep
866cb04cbb Unify TRACK_RULES settings implementation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-25 18:07:46 -08:00
Tom Eastep
6ef136a546 Add origin information for entries in shorewall[6].conf 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-25 15:49:18 -08:00
Tom Eastep
9b3b4579a2 Change TRACK_RULES setting from Internal to File 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-24 16:15:36 -08:00
Tom Eastep
3e404b765f Make .ip[6]tables-restore-input comments conditional 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-23 17:04:52 -08:00
Tom Eastep
2235641c9f Add origin to the ip[6]tables input. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-23 15:13:12 -08:00
Tom Eastep
3fe4619f66 Fix origin in interfaces and hosts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-23 13:49:52 -08:00
Tom Eastep
247698a14d Add origin in some rules from the Misc module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-23 12:31:53 -08:00
Tom Eastep
73b20c832c Add 'origin' member to rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-23 10:45:26 -08:00
Tom Eastep
8ac754caed Add 'origin' member to the interface and hosts tables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-21 17:08:19 -08:00
Matt Darfeuille
c85ced09af Corrected sysconfig files 
Removed unnecessary lines in sysconfig files

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-19 09:25:37 -08:00
Tom Eastep
1abb77d66d Remove restrictions on -m geoip 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-18 22:30:15 -08:00
Tom Eastep
a28f3012d5 Correct $VERSION setting in Raw.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-18 09:38:35 -08:00
Tom Eastep
7d443b5e2e Eliminate return value from process_action() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-18 09:08:35 -08:00
Tom Eastep
a945b3e0dd Tweak the process_action() changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-17 17:03:46 -08:00
Tom Eastep
ec6c233666 Centralize Rules module handling of @CALLER in actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-17 16:29:35 -08:00
Tom Eastep
4059e9de95 Clean up use_policy_action() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-17 12:35:12 -08:00
Tom Eastep
1ee645cd79 Another determinism fix -- red and codel options are now sorted 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-17 09:50:34 -08:00
Tom Eastep
1fedb26f1d Handle @CALLER in policy chains 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-17 09:42:01 -08:00
Tom Eastep
031371f259 Improve maintainability of action-tuple code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-16 17:26:16 -08:00
Tom Eastep
742c15b289 Improve @CALLER fix to create unique chains per caller 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-16 17:12:03 -08:00
Tom Eastep
f95c67ec6b Restore unmodified .pm files after installation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-15 13:55:46 -08:00
matt darfeuille
f1ed963077 Shorewall 5.0.4 Beta 2 
Hi Tom,

Some unnecessary lines need to be removed from the sysconfig files.
I made some more changes to the init.openwrt.sh scripts(lite and
lite6)

Attached as sysconfig-lite.patch!

In order to be able to use the build50 script I had to make a few
changes(attached as build50.patch):

- Adding a variable BASEDIR (to build shorewall  in a subdirectory)
BASEDIR=$PWD
and doing:
$BASEDIR/annotate.pl
and so on ...

- Adding a variable
CYGWINSTYLESHEET
and modifying the script to use this new variable(added cygwin clause
in case statement)

- Adding a variable GITRELEASEDIR and modifying the lines around
624(to specify an other name for the release repo)
from
../release/
to
../$GITRELEASEDIR/

- Added line to remove unnecessary *.bak files

- Added an if statement if a subdirectory is used when patches are
created

question/request:
Would it be possible to use the build50 script without the '-t'
option?
That way only the packages would be built but the tarballs wouldn't
be created.

-Matt

On 12 Jan 2016 at 7:57, Tom Eastep wrote:

> Shorewall 5.0.4 Beta 2 is now available for download.
>
> New Feature since Beta 1:
>
> 1)  The mangle file now supports an DIVERTHA action that provides
>     support for HAProxy.
>
>     To setup the HAProxy transparent configuration described at
>
> http://www.loadbalancer.org/blog/setting-up-haproxy-with-transparent-mode-on-centos-6-x,
>     place this entry in shorewall-providers(5):
>
>
>     #NAME  NUMBER   MARK    DUPLICATE  INTERFACE GATEWAY   OPTIONS
>     TProxy 1        -       -          lo        -         tproxy
>
>     and use this DIVERTHA entry:
>
>     #ACTION         SOURCE          DEST            PROTO  ...
>     DIVERTHA        -               -               tcp
>
> Thank you for testing,
> -Tom
> --
> Tom Eastep        \ When I die, I want to go like my Grandfather who
> Shoreline,         \ died peacefully in his sleep. Not screaming like
> Washington, USA     \ all of the passengers in his car
> http://shorewall.net \________________________________________________
>
>

-------------- Enclosure number 1 ----------------
>From ca4c854433e1c4c5870ea3e71225e5df8da4e255 Mon Sep 17 00:00:00 2001
From: Matt Darfeuille <matdarf@gmail.com>
Date: Wed, 13 Jan 2016 21:28:47 +0100
Subject: [PATCH 1/2] Modified lite and lite6.init.openwrt.sh

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-14 16:36:21 -08:00
Tom Eastep
726d1492cd Correct error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-13 17:08:57 -08:00
Tom Eastep
12513e24a3 Revert "Implement dynamic actions" 
This reverts commit 8075ba719a.
 2016-01-13 11:04:41 -08:00
Tom Eastep
21765d618d Create unique chains when @caller is used 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-13 11:04:23 -08:00
Tom Eastep
de21c59885 Correct hashlimit in logging rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-13 09:49:22 -08:00
Tom Eastep
8075ba719a Implement dynamic actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-13 09:33:38 -08:00
Tom Eastep
3828eb856b Rename HADIVERT to DIVERTHA 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-08 15:36:10 -08:00
Tom Eastep
e29e2d117d Documentation updates 
- update LSM section of the Multi-ISP article
- Correct formatting of HAPROXY examples

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-08 08:33:42 -08:00
Tom Eastep
ad2f20b824 Finish HAProxy support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-06 09:12:33 -08:00
Tom Eastep
4c33c2b957 Add support for HAProxy 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-06 08:27:50 -08:00
Tom Eastep
ee6a1dadbb Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-01-05 10:48:48 -08:00
Tom Eastep
2f59ea5ca3 Implement the WAIT_OPTION capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-05 09:28:24 -08:00
Tuomo Soini
c447ddd03e systemd service: rename pre214 systemd versions to pre214 and remove separeate 214 variants 2016-01-05 12:01:21 +02:00
Tom Eastep
0c66e5f1b2 More Openwrt support in Shorewall-init from Matt Darfeuille 
- Also, various cleanup in install/uninstall scripts

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-04 15:45:21 -08:00
Tom Eastep
e695e08009 A couple of corrections to the IP[6]TABLE transparency change 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-04 14:13:58 -08:00
Tom Eastep
c91b78a875 Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 2016-01-04 13:10:48 -08:00
Tom Eastep
70a9240de6 Make IP[6]TABLES transparent 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-04 13:10:03 -08:00
Tom Eastep
06dd5dc38f Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 2016-01-02 12:37:43 -08:00
Tom Eastep
fad41e262a Support the DROP command in the mangle file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-01-02 12:36:38 -08:00
Tom Eastep
89d91d37a1 Add Shorewall-init installer support for OpenWRT 
- Supply sysconfig files for all products

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-12-27 16:47:31 -08:00
Tom Eastep
c9f57ad9c9 Update manpages for ADD timeout 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-12-24 09:20:42 -08:00
Tom Eastep
694dc64900 Allow comma in disposition when LOGTAGONLY=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-12-23 09:06:43 -08:00
Tom Eastep
54b6488113 Allow a timeout to be specified in ADD rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-12-23 08:24:00 -08:00
Tom Eastep
532d5c7e50 Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 2015-12-08 08:06:39 -08:00
Tom Eastep
8429f68897 Handle MAC addresses in IPv6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-12-07 15:15:28 -08:00
Tom Eastep
3ddc2a8f8b Add parentheses for readability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-12-07 08:02:35 -08:00
Tom Eastep
1d79cbc54e Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 
# Conflicts:
#	Shorewall-init/install.sh
 2015-12-06 11:55:03 -08:00
Tom Eastep
4b893b2fd6 Install/uninstall fixes from Matt Darfeuille 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall-init/install.sh
 2015-12-05 11:56:16 -08:00
Tom Eastep
8e7f001f7e Update manpages for column renaming 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-12-04 14:53:26 -08:00
Tom Eastep
98b4ab5ceb Add missing columns in the masq file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-12-03 19:51:21 -08:00
Tom Eastep
592de3e6fc Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2015-12-03 15:35:35 -08:00
Tom Eastep
2c1786422e Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2015-11-28 09:04:46 -08:00
Tom Eastep
b087cee7f0 Redefine MODULESDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-11-28 08:36:12 -08:00
Tuomo Soini
948175124b accounting: there must be more room for ACTION, SOURCE, and DEST 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-11-27 22:33:03 +02:00
Tom Eastep
178a7f83bc Install/uninstall fixes from Matt Darfeuille 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-11-21 12:53:24 -08:00
Tuomo Soini
b25a8e4b2d shorewall: use real field names in config file headers 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-11-16 18:16:17 +02:00
Tom Eastep
7b54e5e1a6 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2015-11-10 07:50:33 -08:00
Tuomo Soini
9460458fd5 Shorewall: reduce number of lines on config headers 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-11-09 23:04:00 +02:00
Tom Eastep
7fb00e0dfe Remove the routestopped files and their manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-11-09 07:28:46 -08:00
Tuomo Soini
e989fa1d49 configfiles/routestopped: add install path 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-11-09 10:27:07 +02:00
Tuomo Soini
f095e6f31d configfiles: unified configuration file formatting 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-11-09 10:24:20 +02:00
Tom Eastep
e75c88219f Start optional interfaces when there are no providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-11-05 18:07:31 -08:00
Tuomo Soini
85df53841b Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2015-11-02 00:02:56 +02:00
Tom Eastep
1c29240eb9 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2015-11-01 11:31:53 -08:00
Tom Eastep
2b733b610c Return proper exit status from the remote-* commands 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-11-01 07:53:31 -08:00
Tom Eastep
aa680d8472 Avoid double slashes in pathnames within the installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-31 12:57:33 -07:00
Tom Eastep
460f4bc5b7 Correct defect in processing the 'persistent' route option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-31 08:15:10 -07:00
Tom Eastep
f90567abf1 Add support for OpenWRT BB and later 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-31 08:08:17 -07:00
Tuomo Soini
0c481b4c30 shorewall: use consitent headers on config files 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-10-31 08:18:50 +02:00
Tom Eastep
6209616766 Add lib.cli-user support to the full products 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-30 08:47:16 -07:00
Tom Eastep
5a3589b9a6 Add some comments in get_params() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-30 08:18:45 -07:00
Tom Eastep
3973cdf0da Merge branch '5.0.1' 2015-10-28 14:35:27 -07:00
Tom Eastep
e39d405e86 More tweaks to params processing and exporting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-28 14:33:55 -07:00
Tom Eastep
239560be8d Add Cygwin-specific code in get_params() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-28 13:47:40 -07:00
Tom Eastep
3873ebe06a More param handling fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-28 09:37:52 -07:00
Tuomo Soini
e987a11614 Shorewall/configfiles/stoppedrules: use standard description 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-10-28 10:48:27 +02:00
Tom Eastep
081cf30447 Don't export variables with parentheses in their names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-27 17:45:22 -07:00
Tuomo Soini
d614081d55 Shorewall/configfiles: remove empty lines and fix blrules header to common format 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-10-27 22:03:28 +02:00
Tom Eastep
35b90c2709 Update documentation for 'remote-' vs. 'remote_' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-27 08:16:06 -07:00
Tom Eastep
79a145bf83 Correct "remote-" commands 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-27 07:18:54 -07:00
Tom Eastep
6535bb94c5 Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 2015-10-27 07:18:06 -07:00
Tom Eastep
38049fd0df Correct "remote-" commands 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-26 20:06:10 -07:00
Tom Eastep
c2768a2d64 Correct error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-26 13:08:09 -07:00
Tom Eastep
4f4358d4db Correct error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-26 13:07:40 -07:00
Tom Eastep
f822afef99 Issue warning if a persistent provider isn't optional 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-26 13:07:28 -07:00
Tom Eastep
514fe76fa5 Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2015-10-26 07:55:30 -07:00
Tom Eastep
56bf8b1572 Don't configure persistence if the interface has no address 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-26 07:42:47 -07:00
Tuomo Soini
2a064c7b7c macro.MSSQL: allow udp/1434 
Reference: https://technet.microsoft.com/en-us/library/ms181087%28v=sql.105%29.aspx
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-10-26 10:22:37 +02:00
Tuomo Soini
30682e63d8 Shorewall/Macros: remove version number 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-10-26 10:20:11 +02:00
Tom Eastep
69dd7ce0b9 Add 'persistent' provider option - Phase II 
- Also allow the creation of 'persistent' routing rules and routes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-25 16:45:11 -07:00
Tom Eastep
46c3db4f32 Add 'persistent' provider option - Phase I 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-22 06:58:32 -07:00
Tom Eastep
6e59fd5395 Correct permissions on certain files in $CONFDIR/$PRODUCT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-22 06:58:05 -07:00
Tom Eastep
8dc16268a7 Delete main default routes when there are 'load=' or 'fallback=' interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-13 09:34:58 -07:00
Tom Eastep
a8e4671668 Remove version from config files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-12 15:02:50 -07:00
Tom Eastep
7388ff5154 Fix RESTART 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-12 14:08:24 -07:00
Tom Eastep
0dbe756e93 Manpage and Shorewall-5 changes for RESTART 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-12 13:49:24 -07:00
Tom Eastep
72d4637c22 Replace LEGACY_RESTART with RESTART 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-12 11:45:58 -07:00
Tom Eastep
bb538a7c10 Merge branch 'master' into 5.0.0 
Conflicts:
	Shorewall-core/lib.common
	Shorewall-core/shorewallrc.debian.systemd
	Shorewall-lite/shorewall-lite.service.debian
	Shorewall/Perl/Shorewall/Chains.pm
	Shorewall/Perl/Shorewall/Compiler.pm
	Shorewall/Perl/Shorewall/Config.pm
	Shorewall/Perl/Shorewall/Misc.pm
	Shorewall/Perl/Shorewall/Raw.pm
	Shorewall/Perl/Shorewall/Tc.pm
	Shorewall/Perl/compiler.pl
	Shorewall/Perl/prog.footer
	Shorewall/lib.cli-std
	Shorewall/manpages/shorewall-mangle.xml
	Shorewall/manpages/shorewall.conf.xml
	Shorewall/manpages/shorewall.xml
	Shorewall/shorewall.service.debian
	Shorewall6-lite/shorewall6-lite.service.debian
	Shorewall6/manpages/shorewall6-mangle.xml
	Shorewall6/manpages/shorewall6.conf.xml
	Shorewall6/manpages/shorewall6.xml
	Shorewall6/shorewall6.service.debian
	docs/MultiISP.xml
	docs/Shorewall_Squid_Usage.xml
 2015-10-12 10:55:36 -07:00
Tom Eastep
1db3bfb53e Manpage updates 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-10 13:19:41 -07:00
Tom Eastep
97e821d12d Use %e rather than %_d for busybox compatibility 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-08 13:16:32 -07:00
Tom Eastep
af18896851 Remove options from 'update' warning messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-10-05 08:19:09 -07:00
Tom Eastep
7dd9beeeae Remove FORMAT specifications from macros and actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-22 12:39:22 -07:00
Tom Eastep
dfeeb2d5c3 Add GlusterFS action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-19 12:31:54 -07:00
Tom Eastep
85e44c70eb Add the Meta-connection to Tinc 
- Both the macro and the tunnel type are updated

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-17 09:17:35 -07:00
Tom Eastep
888444f210 Add the Meta-connection to Tinc 
- Both the macro and the tunnel type are updated

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-17 09:16:33 -07:00
Tom Eastep
1b2a43e5ea Merge branch '5.0.0' of ssh://git.code.sf.net/p/shorewall/code into 5.0.0 2015-09-12 12:31:45 -07:00
Tom Eastep
03d99de8d5 Correct handling of reset 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-11 15:02:32 -07:00
Tom Eastep
1b571f3d86 Correct the reset command 
- Also allow chain names to be specified a la the refresh command

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-11 14:16:16 -07:00
Tuomo Soini
53dfe442c1 systemd: add reload to unit files 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2015-09-10 14:15:16 +03:00
Tom Eastep
7be4190e4c Man page updates for the PROBABILITY column in the masq files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-08 18:00:53 -07:00
Tom Eastep
ddb325a662 Code changes for a PROBABILITY column in the masq file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-08 17:20:46 -07:00
Tom Eastep
e8ebfb5a11 Correct PSH,FIN check 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-07 15:46:14 -07:00
Tom Eastep
242080c59c Rename SMALL_MASK to SMALL_MAX 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-07 13:10:44 -07:00
Tom Eastep
0aa5cb5086 Allow non-experts to use the user bits in the fw mark 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-07 11:35:47 -07:00
Tom Eastep
4b14924b99 Allow non-experts to use the user bits in the fw mark 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-07 11:29:24 -07:00
Tom Eastep
17d1caf8c5 Allow tags in global LOG_LEVELs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-06 16:08:59 -07:00
Tom Eastep
fcd5b30ca8 Add FIN,RST and PSH,FIN to the tcpflags set 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-06 11:49:29 -07:00
Tom Eastep
e6ec52c711 Move a line of code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-06 10:33:36 -07:00
Tom Eastep
eddd58d459 Move a line of code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-06 10:33:09 -07:00
Tom Eastep
1bf13e5fda Provide default for SHOREWALL_SHELL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-06 10:29:36 -07:00
Tom Eastep
dbf2c89083 Provide default for SHOREWALL_SHELL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-06 10:28:44 -07:00
Tom Eastep
6554f7fe28 Disable bare SECTION in the rules file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-04 11:16:07 -07:00
Tom Eastep
07976556ed More inline match documentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-03 09:45:39 -07:00
Tom Eastep
682a449e7b Correct more Mangle examples 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-02 13:08:05 -07:00
Tom Eastep
8f86e2df19 Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-02 13:07:33 -07:00
Tom Eastep
ba3dba78ff Correct more Mangle examples 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-02 13:07:20 -07:00
Tom Eastep
59aeafba3a Delimit inline matches by ';;' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-02 10:24:31 -07:00
Tom Eastep
9e98d30c92 Correct handling of log levels with default actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-02 08:55:18 -07:00
Tom Eastep
582755edf4 Unconditionally get inline matches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-02 08:03:22 -07:00
Tom Eastep
c6ec9990e7 Unconditionally get inline matches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-02 08:02:02 -07:00
Tom Eastep
dea1f853ea Correct progress messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-01 12:42:01 -07:00
Tom Eastep
a30708519d Correct progress messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-09-01 11:57:28 -07:00
Tom Eastep
f5d9e87c59 Remove anacronistic logic from the Rules module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 16:02:22 -07:00
Tom Eastep
ed90360b4c Remove all of the update-specific options from the update command 
Leave -i and -A

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 14:21:41 -07:00
Tom Eastep
6a374b80e0 Correct INLINE handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 12:36:05 -07:00
Tom Eastep
9638033e24 Cosmetic changes to first_entry() calls 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/Perl/Shorewall/Tc.pm
 2015-08-31 11:33:32 -07:00
Tom Eastep
87ef6f730f Correct a typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 11:21:37 -07:00
Tom Eastep
53223e1440 Uniform mechanism for inserting conversion comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/Perl/Shorewall/Tc.pm
 2015-08-31 11:21:18 -07:00
Tom Eastep
9b886a99af Fix $convert/$tcrules mess 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/Perl/Shorewall/Tc.pm
 2015-08-31 11:19:42 -07:00
Tom Eastep
c77d18965a Place a header in a created mangle file during update -t 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/Perl/Shorewall/Tc.pm
 2015-08-31 11:16:45 -07:00
Tom Eastep
5a6586e06c Don't enforce FASTACCEPT/BLACKLISTNEWONLY on convert 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 11:14:49 -07:00
Tom Eastep
60e08322c5 Update man pages for 'minute' and 'second' in LOGLIMIT specifications 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 11:14:37 -07:00
Tom Eastep
df73f4b925 Assume EXPORTMODULES=No if it doesn't exist in old file during update 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 11:14:26 -07:00
Tom Eastep
be81ace811 Read capabilities file before the .conf file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 11:11:25 -07:00
Tom Eastep
e15a6f452e Cosmetic changes to first_entry() calls 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 10:54:30 -07:00
Tom Eastep
656eaabce9 Correct a typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-31 09:39:40 -07:00
Tom Eastep
f42dc6def1 Uniform mechanism for inserting conversion comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-30 15:35:05 -07:00
Tom Eastep
6e303aef69 Fix $convert/$tcrules mess 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-29 18:52:11 -07:00
Tom Eastep
ab260dc5b1 Place a header in a created mangle file during update -t 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-29 12:52:21 -07:00
Tom Eastep
55ab498291 Don't enforce FASTACCEPT/BLACKLISTNEWONLY on convert 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-29 12:51:52 -07:00
Tom Eastep
10cda4cee7 Update man pages for 'minute' and 'second' in LOGLIMIT specifications 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-27 15:49:59 -07:00
Tom Eastep
de74273dbb Assume EXPORTMODULES=No if it doesn't exist in old file during update 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-27 15:15:03 -07:00
Tom Eastep
af1e2f6c8b Read capabilities file before the .conf file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-27 11:26:26 -07:00
Tom Eastep
dc2406d25b update -t also converts the 'tos' file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-26 13:51:02 -07:00
Tom Eastep
e0734a45ee Allow 'seconds' and 'minutes' in LOGLIMIT specifications 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-26 12:53:36 -07:00
Tom Eastep
28df894add Improve 'update' 
- convert BLACKLISTNEWONLY
- convert LOGRATE and LOGBURST
- default USE_DEFAULT_RT to No

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-26 12:50:56 -07:00
Tom Eastep
b0bf726c7e Let 'update' default USE_DEFAULT_RT to 'No' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-26 12:40:16 -07:00
Tom Eastep
ad06ec3eef Correct IPV6 range parsing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-26 11:52:51 -07:00
Tom Eastep
71611233fb Correct IPV6 range parsing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-26 11:51:29 -07:00
Tom Eastep
7a98c7b9e5 More 'update' fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-25 15:55:49 -07:00
Tom Eastep
dc73832570 Delete unneeded 'my' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-25 14:36:53 -07:00
Tom Eastep
f5d1ec0243 Delete EXPORTPARAMS from %config 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-25 14:36:14 -07:00
Tom Eastep
f9ae28aeea The -t option also converts the 'tos' file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-24 14:56:24 -07:00
Tom Eastep
eae492cef5 Some rules manpage updates 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-22 09:24:47 -07:00
Tom Eastep
2451c14d8c Some rules manpage updates 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-22 08:27:52 -07:00
Tom Eastep
a30fdb356d Update man pages for required '?' in COMMENT, SECTION and FORMAT lines 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-22 08:00:38 -07:00
Tom Eastep
a709395949 Allow 'none' in the log level argument to AutoBL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-21 13:40:12 -07:00
Tom Eastep
98e5d54b92 Allow 'none' in the log level argument to AutoBL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-21 13:39:25 -07:00
Tom Eastep
f4776bf388 Eliminate WIDE_TC_MARKS, HIGH_ROUTE_MARKS and BLACKLISTNEWONLY 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-21 12:42:19 -07:00
Tom Eastep
80acdd2836 Disallow bare COMMENT, SECTION and FORMAT lines 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-21 11:18:40 -07:00
Tom Eastep
40d1d86d2c Drop support for the 'tos' file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 15:35:03 -07:00
Tom Eastep
26fca41e27 Eliminate discontinued files and manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 15:17:48 -07:00
Tom Eastep
5af5c67c75 Update a message to refer to the 'mangle' file rather than 'tcrules' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 14:54:54 -07:00
Tom Eastep
7956c5f6e0 Update a message to refer to the 'mangle' file rather than 'tcrules' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 14:48:29 -07:00
Tom Eastep
5a08f8bf4e Correct shorewall-mangle(5) examples 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 11:09:42 -07:00
Tom Eastep
c59cb1351c Update manpages for new update options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 11:08:10 -07:00
Tom Eastep
82330395e9 Correct grammer in an error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 09:25:32 -07:00
Tom Eastep
9a6f16903b Use NYTProf for profiling. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 09:21:47 -07:00
Tom Eastep
9f2958fd27 Correct wording of an error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-20 09:21:20 -07:00
Tom Eastep
4b003163d6 Use NYTProf for profiling. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-19 14:05:15 -07:00
Tom Eastep
39982c20c4 Restore the text of tcrules warning message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-19 12:34:35 -07:00
Tom Eastep
2b1f33c391 Don't unlink the tcrules file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-19 11:48:23 -07:00
Tom Eastep
1c33717cf5 Reverse the change to delete host routes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-19 11:06:28 -07:00
Tom Eastep
cd8fe38c85 Delete host routes added to the main routing table for providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-19 10:44:37 -07:00
Tom Eastep
d525419c65 Correct wording of an error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-19 10:44:00 -07:00
Tom Eastep
9d3f35a22d Enable new update options in compiler.pl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-16 11:57:36 -07:00
Tom Eastep
6bdf90631c Fix a couple of bugs in 5.0.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-16 10:05:21 -07:00
Tom Eastep
c604823053 Default to FORMAT-2 macros and actions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-14 16:11:41 -07:00
Tom Eastep
12f8cbae29 Correct the test for the existence of the routestopped file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-14 15:29:52 -07:00
Tom Eastep
4de6638385 Correct handling of termination after .conf file not updated 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-14 09:32:27 -07:00
Tom Eastep
0cef7fad35 Add conversion version and date to the converted files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-14 09:32:17 -07:00
Tom Eastep
ea2a35415e Correct convert_blacklist() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-14 09:32:01 -07:00
Tom Eastep
4cc7a1b87d Correct tcrules update 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/Perl/Shorewall/Tc.pm
 2015-08-14 09:31:36 -07:00
Tom Eastep
7c2a969de0 Correct handling of notrack file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-14 09:26:45 -07:00
Tom Eastep
8bdea65325 Update manpages for new update options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-13 16:12:28 -07:00
Tom Eastep
fd46c0ffed Correct handling of termination after .conf file not updated 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-13 15:42:38 -07:00
Tom Eastep
60acddbb37 Add conversion version and date to the converted files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-13 14:37:13 -07:00
Tom Eastep
306dc34b31 Correct convert_blacklist() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-13 13:22:14 -07:00
Tom Eastep
f5c6a6fe82 Correct tcrules update 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-13 13:21:51 -07:00
Tom Eastep
af2b7910bd Port update changes from 5.0.0 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-12 12:33:09 -07:00
Tom Eastep
3b59e46799 Restore Debian-specific service files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-12 10:19:07 -07:00
Tom Eastep
2ab8bd3040 More update fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-09 14:31:47 -07:00
Tom Eastep
0d635632e3 Add conversion of notrack to conntrack 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-08 16:46:58 -07:00
Tom Eastep
fb2d261cdb More Fixes for update 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-08 12:42:32 -07:00
Tom Eastep
88f9a3e255 Allow zero-valued options on multi-zoned interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-07 14:30:21 -07:00
Tom Eastep
4c4c5a436a Allow zero-valued options on multi-zoned interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-07 14:09:08 -07:00
Tom Eastep
73c8b563a1 Add -s option to update to convert the routestopped file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-07 13:46:16 -07:00
Tom Eastep
d949824f94 Correct shorewall-mangle(5) examples 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-06 10:15:57 -07:00
Tom Eastep
2162d79b5f Manual Page Uptates 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-03 15:09:16 -07:00
Tom Eastep
0f61bd34e6 Drop support for the 'blacklist' zone option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-03 14:45:52 -07:00
Tom Eastep
d8d1e96e0d Delete manpages for files no longer supported 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-03 14:37:15 -07:00
Tom Eastep
f4620606b3 Drop support for the 'blacklist' file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-03 14:35:51 -07:00
Tom Eastep
65baa7e3b8 Drop support for the tcrules file 
- The upgrade -t option is still available

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-03 12:34:22 -07:00
Tom Eastep
e5c7ded951 Drop support for the 'notrack' file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-03 11:36:54 -07:00
Tom Eastep
8bed5c9d65 Drop support for the IPSECFILE option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-03 10:11:52 -07:00
Tom Eastep
037e92a60e Eliminate some config options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-01 14:28:12 -07:00
Tom Eastep
2165f746e6 Update .conf documents for 'reload' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-01 12:58:08 -07:00
Tom Eastep
ef9e75753a Restore .214 files 
- Also merge Debian changes from 4.6.12

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-08-01 11:23:35 -07:00
Tom Eastep
85648bded1 Deimplement several .conf options 
- LOGRATE/LOGBURST
- EXPORTPARAMS
- LEGACY_FASTSTART
 2015-08-01 11:11:35 -07:00
Tom Eastep
67589cab69 More version changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-07-28 10:59:11 -07:00
Tom Eastep
f40373d60c Update config file version and copyrights 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-07-28 10:50:19 -07:00
Tom Eastep
fa7248c58c Add the LEGACY_RESTART option. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-07-27 09:19:52 -07:00
Tom Eastep
0a7c65ae0d Allow connlimit by destination 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-07-26 14:26:58 -07:00
Tom Eastep
6e0fb1ab88 Correct syntax error 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-07-26 14:16:12 -07:00
Tom Eastep
34f58bd6ac Correct formatting in the rules file man pages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2015-07-26 11:36:14 -07:00