holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
14,859 Commits 104 Branches 736 Tags 54 MiB
1301848315
Commit Graph

7462 Commits

Author SHA1 Message Date
Tom Eastep
2bbb5c8c1e
Add hack to distinguish between the BLACKLIST macro and action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-23 09:23:26 -08:00
Tom Eastep
33b4ee4d31
Don't quote variable values in ERROR/WARNING/INFO directives 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-23 09:00:18 -08:00
Tom Eastep
d111e4f186
Handle built-in actions in 'show action' 
- Remove a couple of non-actions from IPv4 actions.std

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-22 15:40:36 -08:00
Tom Eastep
634c8debda
Use ?REQUIRE in several actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-22 14:59:37 -08:00
Tom Eastep
71dd5d016b
Add ?REQUIRE compiler directive 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-22 14:48:18 -08:00
Tom Eastep
6b408869d2
Correct the synopsis in two action files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-22 11:47:12 -08:00
Tom Eastep
edf08bf408
Cosmetic change in compiler() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-21 19:47:50 -08:00
Tom Eastep
9c3a82f628
Add BLACKLIST action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-19 14:08:15 -08:00
Tom Eastep
e6933f4c8d
Add BLACKLIST policy 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-18 10:55:15 -08:00
Tom Eastep
cc3b8793e0
Make BALANCE_PROVIDERS default the setting of USE_DEFAULT_RT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-17 15:02:16 -08:00
Tom Eastep
ac5fd195ec
Correct provider/routefilter check wrt optional interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-17 09:34:13 -08:00
Tom Eastep
45b9ddf188
Add BALANCE_PROVIDERS option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-17 08:58:09 -08:00
Tom Eastep
2d16fac9ed
Revert "Implement USE_DEFAULT_RT=Exact" 
This reverts commit 2ca1ae734a.
 2017-01-17 08:25:33 -08:00
Tom Eastep
f23970b4f7
Include LOG_MARTIANS in test for setting log_martians with routefilter 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-14 13:03:24 -08:00
Tom Eastep
04112647d3
Correct provider/routefilter checking 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-14 12:40:39 -08:00
Tom Eastep
2ca1ae734a
Implement USE_DEFAULT_RT=Exact 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-14 08:14:08 -08:00
Tom Eastep
64c249a174
Set logmartians along with routefilter. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-11 15:53:55 -08:00
Tom Eastep
0019ca53e5
Include ROUTE_FILTER in routefilter/provider checks 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-11 15:39:13 -08:00
Tom Eastep
0d2a5089a9
Merge branch '5.1.0' 2017-01-11 12:29:57 -08:00
Tom Eastep
50d09e76cb
Catch 'routefilter' with provider interfaces. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-11 11:47:10 -08:00
Tom Eastep
73772efb85
Correct typo in shorewall-interfaces(5) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-11 11:20:07 -08:00
Tom Eastep
568f461763
Propogate PAGER to -lite systems 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-11 11:18:57 -08:00
Tom Eastep
cb150f9c09
Allow compact IPv6 addresses in IP6TABLES() rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-07 10:01:03 -08:00
Tom Eastep
19ce2093d8
Correct splitting of IP(6)TABLES options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-07 10:00:37 -08:00
Tom Eastep
b8c322a05f
Ignore SUBSYSLOCK when $SERVICEDIR is non-empty 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-06 15:50:26 -08:00
Tom Eastep
f68d3fd9fa
Revert "Remove SUBSYSLOCK" 
This reverts commit 386b137e9b.
 2017-01-06 09:49:40 -08:00
Tom Eastep
386b137e9b
Remove SUBSYSLOCK 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-05 10:03:03 -08:00
Tom Eastep
ce68f84d9d
Remove Makefile from Shorewall[6][-lite] 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-05 08:22:02 -08:00
Tom Eastep
5aed31d37a
Restore SUBSYSLOCK setting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-04 19:39:08 -08:00
Tom Eastep
0b3d1b1d36
Revert code that assumed no CLI symlinks 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-04 17:12:20 -08:00
Tom Eastep
2f9ef4dda7
Update kernel module files 
- Include additional nat modules

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-30 10:56:16 -08:00
Tom Eastep
5174fe0161
Avoid echo options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-28 11:09:08 -08:00
Tom Eastep
65bf33bcf3
Correct handling of safe-restart with SAVE_IPSETS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-27 16:29:01 -08:00
Tom Eastep
638c7c5bca
Implement NETMAP_TARGET capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-27 08:26:51 -08:00
Tom Eastep
c4bbb46e3f
Eliminate rawpost table support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-26 14:20:08 -08:00
Tom Eastep
c9f45277b8
Move the action files to their own directory 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-23 09:05:37 -08:00
Tom Eastep
541291b729
Add do_condition() call in process_mangle_rule1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-21 08:46:16 -08:00
Tom Eastep
9dcac6012b
Remove redundent test 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-20 14:41:29 -08:00
Tom Eastep
4af278338f
Correct intra-zone handling in policies 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-19 09:11:41 -08:00
Matt Darfeuille
b33d853703
shorewall: Don't set the 'file' var needlessly 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-19 08:14:48 -08:00
Matt Darfeuille
30331fecda
shorewall: Don't set the 'file' var needlessly 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-19 08:14:48 -08:00
Tom Eastep
a9583aaf3a
Correct merge compatibility change 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-18 19:00:37 -08:00
Tom Eastep
c2c2dc0b22
Exercise care when merging rules including -m multiport 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-18 18:39:19 -08:00
Tom Eastep
e3951cb5a3
Re-add volume 8 manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-18 16:16:50 -08:00
Matt Darfeuille
bac6848362
shorewall: Correct the filepath of .shorewallrc 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-18 12:14:25 -08:00
Matt Darfeuille
fa8e92cbd3
shorewall: Correct the filepath of .shorewallrc 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-18 12:14:24 -08:00
Matt Darfeuille
f502e5b2e3
shorewall: Correct displaying of shorewall version 
Add the Product name variable to properly display the product name
when the '-v' option is passed to the script.

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-18 12:14:24 -08:00
Tom Eastep
154395c20f
Create symbolic links for the CLI programs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-18 11:48:05 -08:00
Tom Eastep
095c9212f4
Fatal error for empty action file 
- Issue error if a file with the name of the action exists on the
  CONFIG_PATH

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-12 16:31:46 -08:00
Tom Eastep
08c6b80e1e
Correct typo in the snat manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-11 14:32:27 -08:00
Tom Eastep
cb7ab3908a
SOURCE/DEST changes in the mangle manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-11 14:06:59 -08:00
Tom Eastep
b756c63b1e
More SOURCE/DEST manpage updates 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-10 14:41:08 -08:00
Tom Eastep
eea9882953
Implement CPU Fanout for NFQUEUE. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-09 10:46:39 -08:00
Tom Eastep
cc937ffaba
NFQUEUE should be non-terminating 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-09 09:49:23 -08:00
Tom Eastep
5ea3334a66
Support a richer SOURCE and DEST syntax 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-09 09:43:10 -08:00
Tom Eastep
a2e040998b
Move shorewall(8) to shorewall.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-04 18:03:18 -08:00
Tom Eastep
53adfbe863
Normalize parameters by removing trailing omitted args 
- Avoids needless duplicate action chains
 2016-12-03 11:34:02 -08:00
Tom Eastep
4a0a906510
Correct progress message in optimize_level4() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-03 08:28:14 -08:00
Tom Eastep
7ceb0228e9
Merge branch 'master' into 5.1.0 2016-12-02 15:27:16 -08:00
Tom Eastep
f537e3e15c
Fix optimization bug in merge_rules() 
- Reset the simple member if a unique option is merged

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-02 14:47:03 -08:00
Tom Eastep
5ae062317f
Merge branch 'master' into 5.1.0 2016-12-01 19:35:14 -08:00
Tom Eastep
a1981823f4
Correct typo (syntax error!) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-12-01 15:21:25 -08:00
Tom Eastep
77e83f0afd
Eliminate the CHAIN_SCRIPTS option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-29 16:33:23 -08:00
Tom Eastep
a45fe692cc
Add a SWITCH column to the mangle files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-29 16:13:44 -08:00
Tom Eastep
799b17210c
Enhanced syntax for SOURCE and DEST columns in the rules file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-25 15:10:14 -08:00
Tom Eastep
01306e1230
Try another approach to the RCP_/RSH_COMMAND formatting issue 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-23 14:48:28 -08:00
Tom Eastep
963dea54c5
Modify update defaults for LOGPREFIX and LOGLIMIT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-23 14:30:07 -08:00
Tom Eastep
fbbcc812a1
Remove archaic LAST LINE comments from sample .conf files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-23 14:17:28 -08:00
Tom Eastep
87870ac46e
Clean up formatting of the RCP_/RSH_COMMAND manpage descriptions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-23 14:08:13 -08:00
Tom Eastep
d895a5d67c
Correct version in IPv4 universal shorewall.conf 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-22 09:28:44 -08:00
Tom Eastep
c561f8eb03
Default shorewall.conf changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-22 08:57:47 -08:00
Tom Eastep
38c9165c39
More shorewall(8) documentation updates 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-21 13:57:06 -08:00
Tom Eastep
bd2df4836d
Break lib.base into two libraries 
- Allows separation of default product determination and
  establishment of the product environment

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-21 13:25:57 -08:00
Tom Eastep
875c352473
Unify the CLI 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-21 10:00:55 -08:00
Tom Eastep
dae060bbb4
Update shorewall(8) for single CLI 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-20 13:03:13 -08:00
Tom Eastep
ccab75e69a
Avoid unnecessary change in the generated script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-20 09:17:39 -08:00
Tom Eastep
de553e7b18
Add the -l option 
- Update shorewall(8)

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-20 09:16:16 -08:00
Tom Eastep
36517cdb1e
Rename setup_environment to setup_product_environment 
- Default to first detected product
- Verify that specified product is installed

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-20 08:48:18 -08:00
Tom Eastep
bb5c3a50f5
Avoid unnecessary change in the generated script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-19 21:39:49 -08:00
Tom Eastep
8b99fe20b5
Pave the way for unifying the CLI 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-19 21:17:35 -08:00
Tom Eastep
137b051e52
Centralize setting of product-dependent g_* variables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-19 17:17:03 -08:00
Tom Eastep
9eb390403b
Implement -p option to disable PAGER 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-17 10:58:10 -08:00
Tom Eastep
88284ed568
Delete version from the heading of compiler.pl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-16 13:03:00 -08:00
Tom Eastep
481afef2c3
Don't insist that route deletion succeeds 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-12 08:38:09 -08:00
Tom Eastep
6b38b3a515
Revert "More IPv6 routing cleanup" 
This reverts commit 1e7f63834c.
 2016-11-12 08:25:38 -08:00
Tom Eastep
80951d23c2
add/delete multi-nexthop IPv6 routes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-12 08:24:46 -08:00
Tom Eastep
1e7f63834c
More IPv6 routing cleanup 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-09 10:34:19 -08:00
Tom Eastep
74b94f71f8
Always return $omitting from process_compiler_directive() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-09 08:07:17 -08:00
Tom Eastep
ef4ab62dd3
Disable directive callbacks after file conversion. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-09 07:47:19 -08:00
Tom Eastep
42c1c2a205
Don't copy link-level address routes into provider tables. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-08 14:42:44 -08:00
Tom Eastep
6095d05af9
Update manpages for 'update' improvements 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-07 13:50:11 -08:00
Tom Eastep
d989241712
Retain shell variables during routestopped and blacklist conversions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-07 11:26:17 -08:00
Tom Eastep
652bc75448
Omit Shorewall version from converted files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-07 11:12:36 -08:00
Tom Eastep
d105da3964
Preserve shell variables when converting tos->mangle 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-06 17:25:35 -08:00
Tom Eastep
c5b393a074
Preserve shell variables when converting tcrules->mangle 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-06 17:25:01 -08:00
Tom Eastep
1b82dedb77
Preserve shell variables when converting masq -> snat 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-06 13:53:05 -08:00
Tom Eastep
6398756647
Add a routine to split the raw current line image 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-06 08:44:24 -08:00
Tom Eastep
daa2440d9a
Ensure that $directive_callback->() gets an unaltered image 
- pass omitted lines to that function as well

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-06 08:03:31 -08:00
Tom Eastep
ffe1e1d335
Fix typo in the two-interface sample snat file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-04 08:36:24 -07:00
Tom Eastep
8441ac5c5f
Handle another issue with ADD_SNAT_ALIASES=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-03 15:06:38 -07:00
Tom Eastep
01a6881f4f
Catch total lack of address/port in SNAT argument 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-02 19:30:55 -07:00
Tom Eastep
f917670fbd
Tighten editing of SNAT/MASQ port ranges. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-02 19:30:18 -07:00
Tom Eastep
c376740329
Detect degenerate addr:port[-range] in SNAT rules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-02 15:28:00 -07:00
Tom Eastep
4169520d63
Handle exceptionrule correctly with MASQUERADE. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-02 14:36:51 -07:00
Tom Eastep
53d97bbcc8
Correct handling of masquerade port range when ADD_SNAT_ALIASES=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-02 12:28:00 -07:00
Tom Eastep
9ae36e1989
Correct error message when multiple SNAT addresses are present. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-02 12:27:32 -07:00
Tom Eastep
60619fb3cb
Correct part of a recent patch to Nat.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-02 09:00:19 -07:00
Tom Eastep
41ecee356b
Correct earlier faulty patch to Nat.pm. 
- Similar Rules.pm patch was okay.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-01 19:39:52 -07:00
Tom Eastep
e188bde6c4
Fix additional masq/snat issues. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-01 18:42:16 -07:00
Tom Eastep
6e08717089
Formatting changes to snat files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-01 17:11:43 -07:00
Tom Eastep
d37967f32f
Replace --to-ports <ports> with --to-source :<ports> 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-01 16:52:08 -07:00
Tom Eastep
10c1ad245a
Handle omitted port[-range] in SNAT correctly. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-01 12:59:44 -07:00
Tom Eastep
032a16eb43
Detect incorrect port-range separator in SNAT(...) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-01 11:28:19 -07:00
Tom Eastep
a89d8b3af4
Fix Shorewall installer re: snat file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-31 16:13:48 -07:00
Tom Eastep
3f68814a38
Disallow more than one address[-range] in SNAT rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-31 15:15:35 -07:00
Tom Eastep
95a1e65016
Clear target modifiers in interface loop 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-30 16:25:17 -07:00
Tom Eastep
282253022e
Correct handling of address variables out of the Providers module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-29 14:59:34 -07:00
Tom Eastep
4d77d673e8
Be sure NAT is enabled before processing an snat file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-28 09:30:17 -07:00
Tom Eastep
e4e424bbdc
Disallow '+' in inline SNAT action bodies 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-28 08:58:47 -07:00
Tom Eastep
71fb1a8cbd
Correct error message ( s/\*/+/ ) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-27 14:32:43 -07:00
Tom Eastep
46c8147521
Deprecate INLINE_MATCHES=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-27 13:55:11 -07:00
Tom Eastep
de3b05ea41
Correctly translate +INLINE(...) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-27 12:21:07 -07:00
Tom Eastep
ae9b57d854
Correct NONAT translation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-26 16:06:28 -07:00
Tom Eastep
579910fdb8
Fix MASQUERADE+ Handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-26 14:40:16 -07:00
Tom Eastep
21877d5fcb
Force a reload when enabling an interface whose IP address has changed 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-26 13:39:50 -07:00
Tom Eastep
0b9387f09c
Force address Detection on optional interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-25 14:42:03 -07:00
Tom Eastep
fdfd8b919b
Merge branch '5.0.13' 2016-10-24 12:52:01 -07:00
Tom Eastep
3d3ae81bce
Restore old wording for Version 4 ipset creation message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-24 12:51:43 -07:00
Tom Eastep
3b6b89336e
Eliminate superfluous test 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-24 11:57:56 -07:00
Tom Eastep
fc0ad7cd2e
Be sure that the 'restriction' member exists for the FORWARD chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-24 11:37:40 -07:00
Tom Eastep
c9b1b7684c
Correct handling of dest IPSET. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-24 09:06:05 -07:00
Tom Eastep
b8ec460a1a
Correct grammar in the ipset creation message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-24 08:49:51 -07:00
Tom Eastep
46b8e2e957
Avoid exception when validating 'occurs' in TC 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-24 08:14:12 -07:00
Tom Eastep
0ed813972b
Auto-create ipsets used in tcfilters 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-23 16:44:07 -07:00
Tom Eastep
f9cfde91e5
Correctly handle ipset in tcfilter DEST 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-23 16:43:49 -07:00
Tom Eastep
3df488e710
Correct handling of ipsets in tcfilters 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-23 16:28:36 -07:00
Tom Eastep
0efc7a4899
Correct restriction and chain number handling in the mangle files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-23 15:36:04 -07:00
Tom Eastep
d241421630
Merge branch '5.0.13' 2016-10-23 08:34:47 -07:00
Tom Eastep
e0203bca87
Correct nill address check in handling of 'origdest=detect' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-23 08:34:24 -07:00
Tom Eastep
3874bb9fa6
Delete duplicate line of code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-22 15:41:26 -07:00
Tom Eastep
13a321726c
Fix typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-21 09:22:30 -07:00
Tom Eastep
b160845713
Avoid compiler crash when LOAD_HELPERS_ONLY=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-20 15:22:43 -07:00
Tom Eastep
71566f0ab0
Avoid compiler crash when LOAD_HELPERS_ONLY=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-20 14:54:01 -07:00
Tom Eastep
e4169ede4a
Merge branch '5.0.13' 2016-10-20 13:29:05 -07:00
Tom Eastep
b44628ddc8
Only specify 'counters' to ipset of IPSET_MATCH_COUNTERS is present 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-20 09:07:36 -07:00
Tom Eastep
0e7d5f3972
Support '+' in SNAT action invocation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-18 16:00:36 -07:00
Tom Eastep
5b5f91f75f
SNAT option documentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-18 15:32:22 -07:00
Tom Eastep
ab496987e0
Prevent 'nat' and 'mangle' being specified together 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-18 15:32:05 -07:00
Tom Eastep
c92ebc3908
Make merge_inline_source_dest() a little safer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-18 14:32:56 -07:00
Tom Eastep
bc3573fcbc
Correct handling of interface lists in masq->snat conversion 
- Also restore logic for ADD_SNAT_ALIASES
- Correct some interface-list errors in snat processing
- Restore whitespace after '--to-source'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-18 14:19:09 -07:00
Tom Eastep
6b7beaadaf
Merge branch '5.0.13' 2016-10-18 10:16:58 -07:00
Tom Eastep
31b6e9e299
Fix another DEST bug in mangle inline action handling :-( 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-18 10:15:43 -07:00
Tom Eastep
d52a4b1c9d
Implement SNAT actions and inlines 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-18 10:09:07 -07:00
Tom Eastep
9796af5d80
Merge branch '5.0.13' 2016-10-17 10:16:30 -07:00
Tom Eastep
9fc56bb896
Correct typo in process_mangle_inline() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-17 09:29:32 -07:00
Tom Eastep
f3dd77a3f1
Merge branch '5.0.13' 2016-10-16 16:36:08 -07:00
Tom Eastep
2c191bf595
Correct .conf manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-16 15:07:34 -07:00
Tom Eastep
4bb942f1f9
Restrict hypen as range separator to use with integers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-16 13:29:00 -07:00
Tom Eastep
05dbfbb988
Restrict hypen as range separator to use with integers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-16 13:26:44 -07:00
Tom Eastep
69a7c78179
Merge branch '5.0.13' 2016-10-16 12:28:01 -07:00
Tom Eastep
04051454bf
Reverse bad ECN handling patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-16 12:27:45 -07:00
Tom Eastep
2ca86d9abd
Merge branch '5.0.13' 2016-10-16 10:22:12 -07:00
Tom Eastep
e6f3d429a1
Renew timeout on matched dbl entries 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-16 09:42:45 -07:00
Tom Eastep
1ca91d7ddc
Correct handling of ECN file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-16 08:41:19 -07:00
Tom Eastep
fad9dce3e6
Correct handling of ECN file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-16 08:33:01 -07:00
Tom Eastep
342f4ee0f2
Add the --exits option to ADD with timeout 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-15 16:43:44 -07:00
Tom Eastep
047b5ca6d5
Add the --exits option to ADD with timeout 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-15 16:43:04 -07:00
Tom Eastep
86c4333f8f
Correct the shorewall-snat(5) examples 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-15 14:58:49 -07:00
Tom Eastep
e1de1f0527
Convert Sample masq files to equivalent snat files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-15 12:43:42 -07:00
Tom Eastep
43fdddb438
Add 'snat' config file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-15 11:38:52 -07:00
Tom Eastep
44477d97ac
Move Masq file processing to the Rules module 
- This will enable supporting actions in the new snat file

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-14 12:42:58 -07:00
Tom Eastep
b5906812a2
Accept '-' as the separator in a port range. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-14 10:10:03 -07:00
Tom Eastep
b80d4c2320
Don't allow shell meta characters in interface names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-11 17:01:45 -07:00
Tom Eastep
d5aaa66e0b
Detect bad characters in interface names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-11 10:56:41 -07:00
Tom Eastep
49fae96b09
Update the manpages for 'blacklist' verbosity 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-10 19:45:42 -07:00
Tom Eastep
8c522a5c4d
Correct typo in lib.private 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-09 10:58:29 -07:00
Tom Eastep
abf57a4d1f
Correct indentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-09 09:29:04 -07:00
Tom Eastep
3058f2fb84
Delete code supporting old kernel/iproute2 IPv6 restrictions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-07 11:02:36 -07:00
Tom Eastep
b5e7e41708
Correct NFQUEUE! manpage description 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-07 05:50:24 -07:00
Tom Eastep
eb6ae5e186
Correct handling of DYNAMIC_BLACKLIST options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-05 16:56:29 -07:00
Tom Eastep
941604ad01
Correct issue with updating DBL timeout 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-05 15:41:40 -07:00
Tom Eastep
14e8568d9e
Add the FIREWALL .conf option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-05 15:03:54 -07:00
Tom Eastep
ca7ca4bdfe
Add a 'timeout' option to DYNAMIC_BLACKLIST 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-05 12:56:47 -07:00
Tom Eastep
8d731c81e4
Add 'disconnect' option to ipset-based dynamic blacklisting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-04 09:09:45 -07:00
Tom Eastep
6ad7d47eb6
Correct DYNAMIC_BLACKLISTING documentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-03 08:19:19 -07:00
Tom Eastep
ed48eed0c6
Change order of options in .conf files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-10-02 15:14:31 -07:00
Tom Eastep
97186e5402
Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2016-10-02 14:04:02 -07:00
Roberto C. Sánchez
64ab43f14f
Fix typos 2016-10-02 17:01:46 -04:00
Tom Eastep
72dbb4c3c3
Handle persistent provider enable/disable correctly 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-30 16:01:04 -07:00
Tom Eastep
bc591ccee4
Don't assume that statistically balanced providers are optional 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-30 14:01:16 -07:00
Tom Eastep
f989c2f5f6
Document 'persistent' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-30 11:34:57 -07:00
Tom Eastep
156313edd2
Correctly handle down persistent interface during 'disable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-27 11:47:37 -07:00
Tom Eastep
35bd1db7fb
Handle Down or missing interfaces in 'delete_gateway()' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-27 11:43:26 -07:00
Tom Eastep
792b3b696c
Add ZERO_MARKS option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-26 16:04:26 -07:00
Tom Eastep
3f8ddb11ab
Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 2016-09-25 08:00:43 -07:00
Tom Eastep
fa9ee6d69e
Clear packet marks in PREROUTING and OUTPUT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-24 15:46:04 -07:00
Tom Eastep
ef4b1c2030
Add a TIME Columns section to the config file basics doc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-22 15:45:18 -07:00
Tom Eastep
8065e62f12
Support for the 'contiguous' option in TIME columns 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-22 14:22:11 -07:00
Tom Eastep
e81a4788c6
Implement DEFAULT_PAGER in shorewallrc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-09-21 10:20:48 -07:00
Tom Eastep
d854185c56
Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 2016-09-20 08:47:07 -07:00