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

7335 Commits

Author SHA1 Message Date
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