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