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

4079 Commits

Author SHA1 Message Date
Tom Eastep
6534201284
Fix assertion failure during 'check -r' when DOCKER=Yes 
- avoid unnecessary mode transitions

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-10-31 15:30:03 -07:00
Tom Eastep
282ca14182
Corrections to DOCKER-ISOLATION change 
- Handle DOCKER-USER

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-10-28 09:20:47 -07:00
Tom Eastep
4b7d346911
Merge branch '5.2.1' 2018-10-27 09:11:00 -07:00
Tom Eastep
131a2cd40d
Accommodate Docker version 18.06 
- Optionally replace DOCKER-ISOLATION with DOCKER-ISOLATION-STAGE-1 and -2

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-10-27 09:04:34 -07:00
Tom Eastep
ae90ab1f68
Add version of Jeremie Courreges-Anglas's <jca@tranquil.it> patch 
- Handle case where we are enabling/disabling a balanced/fallback provider
  and another such provider has lost carrier.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-10-11 15:18:47 -07:00
Tom Eastep
5e57c895b3
Avoid emacs issues with compiled code 
- handle embedded spaces in moduledir path names

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-10-09 14:47:36 -07:00
Tom Eastep
aab1df7421
Correct ip[6]tables-restore failure message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-10-06 08:22:46 -07:00
Tom Eastep
9f3cc88cf0
Prevent invalid code generation with SNAT(detect) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-10-02 08:15:20 -07:00
Tom Eastep
1b6de901e0
Merge branch '5.2.0' 2018-08-24 15:33:16 -07:00
Tom Eastep
56780a5d1f
Apply rate limiting in the nat table on nat+accept rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-08-24 15:31:20 -07:00
Tom Eastep
22c1bc2e9c
Apply rate limiting in the nat table on nat+accept rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-08-23 14:07:10 -07:00
Tom Eastep
2d2ded7efc
Merge branch '5.2.0' 2018-08-07 07:46:29 -07:00
Tom Eastep
5e8fd570d1
Prepare for Perl 5.32 
- Escape '{' in REs

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-08-07 07:43:58 -07:00
Tom Eastep
7c31f70dc8
Use '=' rather than '&' to create UNTRACKED rule chains. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-08-01 13:50:20 -07:00
Tom Eastep
f1eafdc314
Use '=' rather than '&' to create UNTRACKED rule chains. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-08-01 13:48:29 -07:00
Tom Eastep
c195bab01d
Correct handling of a provider interface that matches a wildcard. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-29 20:34:02 -07:00
Tom Eastep
0d682fe78b
Disallow optional shared providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-19 09:57:06 -07:00
Tom Eastep
410a20dda3
Make shared interface and 'load=<load-factor' play nice together 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-17 13:25:26 -07:00
Tom Eastep
0685d0edfd
Fix rate limiting 
- Avoid specifying a timeout when the match is '-m limit'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-15 08:57:43 -07:00
Tom Eastep
474604b1fe
Correct source interface exclusion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-04 08:01:27 -07:00
Tom Eastep
93f0183550
Tweak do_ratelimit() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-03 14:22:30 -07:00
Tom Eastep
a42972644c
Allow specification of 'hashlimit' table sizes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-02 14:14:36 -07:00
Tom Eastep
49514e2d58
Allow specification of ht buckets and max entries in RATE columns 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-02 10:23:36 -07:00
Tom Eastep
a265685e20
Allow specification of VLSM in the RATE columns 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-07-02 09:08:45 -07:00
Matt Darfeuille
442e6ac152
Update version to 5.2 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-06-23 09:09:00 -07:00
Tom Eastep
bfb9852eb6
Allow MARK, CONNMARK, SAVE and RESTORE in the nat table 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-06-14 10:01:12 -07:00
Tom Eastep
a8b6a301f2
Revert "MARK and CONNMARK in the snat file" 
This reverts commit e36547f8be.
 2018-06-14 07:58:33 -07:00
Tom Eastep
150f7ab798
Allow specification of the TPROXY mark in CONNMARK and MARK. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-06-14 07:58:06 -07:00
Tom Eastep
e36547f8be
MARK and CONNMARK in the snat file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-06-10 16:34:55 -07:00
Tom Eastep
0632723a6c
Support interface exclusion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-06-10 12:02:19 -07:00
Tom Eastep
ec21b03c5b
Correct handling of dbl=src_dst in interface OPTIONS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-05-18 10:18:09 -07:00
Tom Eastep
25dcf8c5d6
Check for linkdown in interface_is_usable() rather than ..._is_up(). 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-05-18 07:56:06 -07:00
Tom Eastep
c02b71b530
Correct interface_is_up() to look for the 'state' as well as 'UP' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-05-12 08:09:46 -07:00
Tom Eastep
78269d57bc
Handle missing AUTOMAKE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-05-10 11:12:23 -07:00
Tom Eastep
fc91648315
Avoid split_line2 confusion when processing a raw line 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-05-10 09:30:02 -07:00
Tom Eastep
067f435ac5
Update BLACKLIST_DEFAULT if Drop or Reject 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-05-06 13:31:54 -07:00
Tom Eastep
90df607d79
Finish removal of 'refresh command' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-03-30 15:30:34 -07:00
Tom Eastep
5e2f1f573d
Unconditionally convert masq->snat 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-03-27 11:38:47 -07:00
Tom Eastep
011322992e
Revert "Delete masq file processing" 
This reverts commit 609ee8dea2.
 2018-03-27 11:08:33 -07:00
Tom Eastep
609ee8dea2
Delete masq file processing 
- Automatically convert the masq file if it exists

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-03-26 11:40:22 -07:00
Matt Darfeuille
299ea2b41f
Update version to 5.2 
- Remove unneeded punctuation marks

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-03-24 09:53:02 -07:00
Tom Eastep
32f1ae1992
Make &lo work correctly 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-03-19 18:23:19 -07:00
Tom Eastep
3be071ca3d
Up the INCLUDE depth limit to 20 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-03-12 14:39:53 -07:00
Tom Eastep
e08e239c00
Implement AUTOMAKE=recursive 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-03-03 15:50:56 -08:00
Tom Eastep
02ed6f26a9
Allow AUTOMAKE=<depth> to specify search depth 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-03-03 13:04:48 -08:00
Tom Eastep
34c5441768
Apply optimize category 16 again after 8 if 8 did anything 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-27 14:17:21 -08:00
Tom Eastep
c3d8cba042
Reverse the order of optimize 8 and optimize 16 application 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-23 15:01:47 -08:00
Tom Eastep
c1a74b54fc
Implement RENAME_COMBINED 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-22 12:49:55 -08:00
Tom Eastep
88547f5140
Handle two-chain case when LOG_ZONE != 'Both' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-22 11:25:19 -08:00
Tom Eastep
7ad7598d5b
Implement LOG_ZONE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-20 15:31:31 -08:00
Tom Eastep
4dfc6d90b9
Add 'logname' member to chain table entries. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-20 11:04:50 -08:00
Tom Eastep
0cb4a5c202
Correct "Invalid Policy Action" error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-19 10:04:18 -08:00
Tom Eastep
9a83365986
Remove the USEPKTTYPE capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-16 11:20:00 -08:00
Tom Eastep
db4a26cfa9
'update' changes for V5.2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-13 09:21:15 -08:00
Tom Eastep
95e956c913
Complete removal of INLINE_MATCHES 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-13 09:20:31 -08:00
Tom Eastep
5e3795b5a4
Delete support for single semicolon in INLINE and IP[6]TABLES rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-12 19:12:03 -08:00
Tom Eastep
24e21e730e
Correct typo in add_common_rules() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-12 19:10:35 -08:00
Tom Eastep
12bbbbfa2a
Merge branch '5.1.12' 
# Conflicts:
#	Shorewall/Perl/Shorewall/Config.pm
 2018-02-09 17:16:12 -08:00
Tom Eastep
2a12e0950a
Allow pairs in braces to appear with ';;' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-09 12:58:18 -08:00
Tom Eastep
c518e85215
Clarify warning message regarding INLINE_MATCHES 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-08 11:21:38 -08:00
Tom Eastep
91c76f7559
Add INLINE_MATCHES=Yes to deprecated option list 
- Issue a warning for each line requiring change.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-07 19:08:28 -08:00
Tom Eastep
73b39abd62
Remove INLINE_MATCHES 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-07 14:41:49 -08:00
Tom Eastep
3903fe5fd9
Remove the 'refresh' command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-07 12:38:24 -08:00
Tom Eastep
a3e10157de
Merge branch '5.1.12' 2018-02-06 17:35:31 -08:00
Tom Eastep
ebe09a95b8
Lightweight format_rule() for use in digest creation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-02-02 09:27:19 -08:00
Tom Eastep
7bdd69d151
Optimization category 8 tweaks 
- Document cost of the category in shorewall.conf(5)
- Omit DONT_DELETE chains from consideration right off the bat

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-31 14:58:01 -08:00
Tom Eastep
a08f0cfe10 Avoid awkward blank lines 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-30 19:15:10 -08:00
Tom Eastep
09a81ae574 Omit trailing black space from the generated script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-30 14:31:54 -08:00
Tom Eastep
e17c4ac8af Reorganize code around wait/Interface-variable fix 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-30 11:25:37 -08:00
Tom Eastep
a6000ee963 Reorganize code around wait/Interface-variable fix 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-30 11:25:04 -08:00
Tom Eastep
0ab1464f51 Merge branch '5.1.12' 2018-01-28 14:54:23 -08:00
Tom Eastep
789854adce Revert "Correct order of optional interface and address variable handling" 
This reverts commit fbee4a91fd.
 2018-01-28 14:54:06 -08:00
Tom Eastep
37101a2031 Merge branch '5.1.11' into 5.1.12 2018-01-28 13:15:42 -08:00
Tom Eastep
40bcfd15e5 Revert "Correct order of optional interface and address variable handling" 
This reverts commit f4cae55c1e.
 2018-01-28 13:15:13 -08:00
Tom Eastep
230ab06e5d Reverse order of required-interface and address variable processing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-28 13:10:44 -08:00
Tom Eastep
09cda21dd4 Revert "Correct order of optional interface and address variable handling" 
This reverts commit 9253f90ac5.
 2018-01-28 12:29:38 -08:00
Tom Eastep
9253f90ac5 Correct order of optional interface and address variable handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-28 11:39:06 -08:00
Tom Eastep
f4cae55c1e Correct order of optional interface and address variable handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-28 10:54:03 -08:00
Tom Eastep
fbee4a91fd Correct order of optional interface and address variable handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-28 10:53:20 -08:00
Tom Eastep
cdf5ad45d5
Eliminate the MAPOLDACTIONS option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-24 12:59:26 -08:00
Tom Eastep
070a67d665
Deimplement OPTIMIZE_USE_FIRST 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-24 11:56:20 -08:00
Tom Eastep
9796c58eb2
Add OPTIMIZE_MASK constant 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-23 13:15:44 -08:00
Tom Eastep
cabc20957f
Delete an unnecessary variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-23 09:45:50 -08:00
Tom Eastep
a9a379c5a5
Implement INPUT SNAT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-22 16:37:38 -08:00
Tom Eastep
64f704a964
Improve quoting in the route-balancing logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-21 14:46:51 -08:00
Tom Eastep
416224ee05
Correct typos and anachronisms in Chains.pm comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-21 11:53:58 -08:00
Tom Eastep
fb4b362724
Eliminate unnecessary local array 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-20 13:26:10 -08:00
Tom Eastep
97de2be778
Change a fatal_error() call with an assertion in add_policy_rules() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-19 13:39:51 -08:00
Tom Eastep
85cae3c7f8
Add parens to improve readability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-19 12:47:17 -08:00
Tom Eastep
acd425a3c2
Remove superfluous logic from validate_portpari1() 
- Add comments

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-19 12:46:52 -08:00
Tom Eastep
27a0f0f7a0
Make TRACK_PROVIDERS=Yes the default 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-10 08:46:01 -08:00
Tom Eastep
9ac075fd56
Clear the connection mark in tunneled packets from tracked providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-09 17:12:14 -08:00
Tom Eastep
b2604583af
Revert "Clear the connection mark in tunneled packets from tracked providers" 
This reverts commit 62c6411cb0.
 2018-01-09 17:01:51 -08:00
Tom Eastep
62c6411cb0
Clear the connection mark in tunneled packets from tracked providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-09 14:51:57 -08:00
Tom Eastep
1bc90beb01
Update copyrights 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-07 15:01:46 -08:00
Tom Eastep
eaccf033c6
Update copyrights for 2018 
- Update some header versions to 5.1

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-07 14:24:01 -08:00
Tom Eastep
056711d304
Remove anachronistic comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-06 13:58:20 -08:00
Tom Eastep
0aa0bebe07
Reword error message 
- "Invalid action name ..." to "Reserved action name ..."

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-06 13:56:36 -08:00
Tom Eastep
1a68d87c94
Don't enable forwarding in 'clear' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-04 15:39:07 -08:00
Tom Eastep
c518cfaa4a
Allow address variables to work correctly with the 'clear' command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-03 08:58:28 -08:00