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

4075 Commits

Author SHA1 Message Date
Tom Eastep
9e3cb27d0a
Use the synchain name in log messages rather than the base chain name 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-28 14:13:50 -08:00
Tom Eastep
b1d1fa862a
Add comment noting that the 'physwild' interface member is currently unused 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-23 10:58:16 -08:00
Tom Eastep
24acf25451
Delete unused find_interfaces_by_option1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-23 10:53:16 -08:00
Tom Eastep
229c47ac6c
Don't delete options that are to be ignored from %options 
- specifying some options can have side-effects that cause
  $interfaceref->{options}{$option} to be accessed

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-23 10:47:22 -08:00
Tom Eastep
38de9c1732
Make wildcard/option checks order-independent WRT the options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-23 10:24:08 -08:00
Tom Eastep
17f4fd7cd2
Initialize $physwild to $wildcard 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-22 15:42:16 -08:00
Tom Eastep
cfd02c1bb6
More $minroot changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-22 13:58:38 -08:00
Tom Eastep
19b7601c72
Improve handling of wildcard interfaces and options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-22 13:43:45 -08:00
Tom Eastep
5a8e9cd0a3
Correct $minroot logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-22 09:08:27 -08:00
Tom Eastep
45468af2d2
Correct ingress policing for later releases of iproute2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-18 11:52:19 -08:00
Tom Eastep
821d72093a
Rename DEFAULTACTION_SECTION to POLICYACTION_SECTION. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 16:25:15 -08:00
Tom Eastep
42d5d13780
Retain proto setting when switching inline <-> noinline 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 13:40:41 -08:00
Tom Eastep
7121a0f1b1
Disallow a protocol on the Reject Action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 12:58:05 -08:00
Tom Eastep
ab12d63a4f
Change 'default action' to 'policy action' in comments and messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 12:55:17 -08:00
Tom Eastep
6ba1d5413b
Allow a protocol to be associated with an action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 11:24:08 -08:00
Tom Eastep
b04b65cac8
Clear counters in all tables during 'reset' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-30 14:31:59 -08:00
Tom Eastep
5dcb684efc
Don't be specific when deleting IPv6 balanced/fallback default routes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-28 15:26:17 -08:00
Tom Eastep
7289175070
Chop first config dir if non-root or if compiling for export. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-23 09:57:12 -08:00
Tom Eastep
528b473f6b
Add some additional documentation to the Config module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-22 08:41:37 -08:00
Tom Eastep
2a9272ccd1
Clean up RAs involving "|" 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-14 08:26:17 -08:00
Tom Eastep
130ddff9de
Correct a typo in an error message 
- Includes cosmetic changes to Providers.pm

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-10 11:25:52 -08:00
Tom Eastep
9cf298482d
Merge branch '5.1.8' 2017-11-09 12:59:59 -08:00
Tom Eastep
c5a586aa37
Allow [...] around gateway address in the providers file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-09 12:20:01 -08:00
Tom Eastep
832418585a
Don't make persistent routes and rules dependent on autosrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-08 09:46:25 -08:00
Tom Eastep
605f61fb3c
Don't make persistent routes and rules dependent on autosrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-08 09:45:59 -08:00
Tom Eastep
ef8b85fc3e
Implement support for logging in the SNAT file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-02 12:44:42 -07:00
Tom Eastep
b35f1112f4
Allow 'noinline' in /etc/shorewall[6]/actions to override 'inline' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-20 09:19:50 -07:00
Tom Eastep
77d9eeb915
Eliminate extra parameter editing of TPROXY parameter list. 
- Clarify syntax for actions with multiple parameters

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-19 13:08:12 -07:00
Tom Eastep
17838c1443
Add TCPMSS to the allowed mangle actions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-19 12:58:38 -07:00
Tom Eastep
5867ce6c3b
CLAMPMSS now done in the mangle table. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-18 15:55:07 -07:00
Tom Eastep
8ea96098bf
Warning when 'persistent' used with RESTORE_DEFAULT_ROUTE=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 15:22:07 -07:00
Tom Eastep
02ed36332a
Revert "Warn when RESTORE_DEFAULT_ROUTE=Yes and a persistent provider is defined" 
This reverts commit 39a3c72057.
 2017-10-11 11:24:54 -07:00
Tom Eastep
cb4f9e7261
Don't restore default routes when there is an enabled fallback provider 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 11:24:13 -07:00
Tom Eastep
ddb12fcad9
Add/correct comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 11:00:46 -07:00
Tom Eastep
42ce754961
Don't restore default routes when a fallback= provider is enabled 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 11:00:05 -07:00
Tom Eastep
5cd4d63bc5
Delete main default routes when a fallback provider is enabled 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 10:59:31 -07:00
Tom Eastep
5b567f2d8b
Correct delete_default_routes() in tables other than main 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 10:58:48 -07:00
Tom Eastep
39a3c72057
Warn when RESTORE_DEFAULT_ROUTE=Yes and a persistent provider is defined 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 10:58:09 -07:00
Tom Eastep
b47e633c38
Use 'route replace' rather than 'route add' to avoid persistence issues 
Previous failure case was:

- disable interface
- reload
- enable interface

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-09 08:58:10 -07:00
Tom Eastep
1b55a37a28
Ensure that 'rule add' commands don't fail with persistent interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-08 08:53:53 -07:00
Tom Eastep
a97dcd23d0
Allow merging of rules that specify an IPSEC policy 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-07 13:17:43 -07:00
Tom Eastep
108b169d8d
Treat LOG_TARGET like all other capabilities 
- Previous implementation could generate unworkable script when
  LOAD_HELPERS_ONLY=Yes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-06 08:01:52 -07:00
Tom Eastep
8469f983d8
Merge branch '5.1.7' 
# Conflicts:
#	Shorewall/Perl/prog.footer
 2017-09-29 15:25:37 -07:00
Tom Eastep
f54acb665a
Correct handling of mark range in MARK target. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-29 14:44:33 -07:00
Tom Eastep
3d2e9eb93e
Improve the fix for SELinux "getattr" denials 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-28 15:16:50 -07:00
Tom Eastep
c6a939301f
Improve the fix for SELinux "getattr" denials 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-28 15:16:00 -07:00
Tom Eastep
1cb98254cc
Handle SELinux getattr denials in open() processing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-26 16:42:54 -07:00
Tom Eastep
baa791a1e3
Handle SELinux getattr denials in open() processing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-26 16:41:50 -07:00
Tom Eastep
8b4b965f63
Remove unnecessary disable/enable of script generation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-21 14:36:30 -07:00
Tom Eastep
8ee2d6246c
Update a comment in the compiler 
- get_configuration() also processes the shorewallrc file(s)

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-21 12:32:34 -07:00
Tom Eastep
a7be3dfece
Align progress messages produced by 'reenable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 13:29:13 -07:00
Tom Eastep
846e8c4ece
Correct reenable logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 13:29:08 -07:00
Tom Eastep
e2bf7e6584
Align progress messages produced by 'reenable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 13:28:09 -07:00
Tom Eastep
ff3994f6a1
Correct reenable logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 13:17:50 -07:00
Tom Eastep
494ec9c59c
Avoid extra comparison in reload_command() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 10:49:11 -07:00
Tom Eastep
1cde92e8f3
Initialize g_dockeringress 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 10:43:44 -07:00
Tom Eastep
721a1e3b33
Initialize g_dockeringress 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 10:39:52 -07:00
Tom Eastep
84fa774cb7
Change copyright dates in lib.runtime 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 09:03:00 -07:00
Tom Eastep
be5aabcbfb
Correct typo in Chains.pm 
&g_dockeringress -> $g_dockeringress

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-18 10:14:22 -07:00
Tom Eastep
a8937e6bc8
Correct harmless typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-18 10:06:41 -07:00
Tom Eastep
5e1cf17ebc
DOCKER-INGRESS support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-17 10:57:29 -07:00
Tom Eastep
85a7ec6fe5
Correct module loading in the compiler 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-14 15:08:38 -07:00
Tom Eastep
2ed11c7e15
Default ADD_IP_ALIASES to 'No' in Shorewall6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-12 11:55:53 -07:00
Tom Eastep
4f79d2e82b
Move and simplify handling of nat columns 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-12 10:53:04 -07:00
Tom Eastep
e6a2ba78a4
Correct handling of DEST column during action invocation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-08 10:05:37 -07:00
Tom Eastep
1065c2951b
Allow NAT targets to be passed to the Event actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-08 09:46:03 -07:00
Tom Eastep
3b373f3f21
Correct handling of ipsets in the DEST column of the snat file 
- Also corrected handling of exclusion

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-06 11:30:42 -07:00
Tom Eastep
b54a691110
Improve dynamic gateway detection 
- Use provider's routing table, if any

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-23 15:04:47 -07:00
Tom Eastep
90f33dd436
Eliminate MODULE_SUFFIX 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-23 12:48:14 -07:00
Tom Eastep
34e4fffd7d
Module suffix changes 
- Re-order default list in the compiler to match lib.common
- MODULE_SUFFIX="ko ko.xz" in standard .conf files.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-21 12:44:23 -07:00
Tom Eastep
419ff8903b
Invert logic in Shorewall::Chains::delete_reference() - better readability 
- similar change in Shorewall::Chains::adjust_reference_counts()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-19 12:25:27 -07:00
Tom Eastep
390ac30be8
Remove a superfluous line of code from Shorewall::Chains::format_rule() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-19 12:12:54 -07:00
Tom Eastep
8cb98f16ea
Add a comment in Shorewall::Chains::optimize_level8() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-19 08:08:24 -07:00
Tom Eastep
5a9f179e25
Allow port variables as the server port in DNAT rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-16 15:36:18 -07:00
Tom Eastep
8641d53bd1
Use MUTEX_TIMEOUT for ip[6]tables --wait interval 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-15 14:02:08 -07:00
Tom Eastep
7e3521e221
RESTORE_WAIT_OPTION 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-13 18:56:40 -07:00
Tom Eastep
ddefde2d10
Correct handling of address variables in DNAT rule. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-13 08:30:11 -07:00
Tom Eastep
1a2647618e
Allow runtime address variables as the server IP in DNAT rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-12 12:18:16 -07:00
Tom Eastep
72293883dd
Tabify the Zones module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-12 11:28:14 -07:00
Tom Eastep
c31397532c
Verify that parent and child zones have a common interface 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-12 09:24:05 -07:00
Tom Eastep
d0861e813b
Make Shorewall's handling of '+' consistent with that of iptables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-12 08:22:57 -07:00
Tom Eastep
da62bd2b32
Use a hash slice in recently-added code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-11 13:38:34 -07:00
Tom Eastep
a504820d19
Correct optimize level 8 handling of policy and policychain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-07 16:56:30 -07:00
Tom Eastep
4c2c1bcdf1
Export CONFDIR and SHAREDIR to the generated script. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-06 13:42:01 -07:00
Tom Eastep
5589ab76d9
Add arguments to the enabled and disabled user exits 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-03 12:44:15 -07:00
Tom Eastep
6425e5ae5d
Remove superfluous white space in the generated script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-08-02 14:09:05 -07:00
Tom Eastep
8521c6f750
Merge branch '5.1.5' 2017-08-02 14:02:03 -07:00
Tom Eastep
80e6cd8a2f
Add enabled and disabled user exits 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-07-29 15:15:57 -07:00
Tom Eastep
69a0061d0f
Correct handling of MAC addresses in the accounting file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-07-27 14:55:19 -07:00
Tom Eastep
eea3cca90c
Correct handling of USER/GROUP in the OUTPUT accounting section 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-07-27 09:01:46 -07:00
Tom Eastep
a420ef04d9
Correct tcfilter source port handling when BASIC_FILTERS=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-07-26 16:48:53 -07:00
Tom Eastep
2d0cb5c2d8
Process the snat file if the masq file is empty 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-07-06 09:09:52 -07:00
Tom Eastep
9d160d4342
Add RESTORE_DEFAULT_ROUTE to shorewall6.conf samples 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-27 15:50:56 -07:00
Tom Eastep
f050fc6e05
Avoid issues with Perl 5.30 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-25 20:57:48 -07:00
Tom Eastep
aee8c14ea6
Correct update setting of USE_NFLOG_SIZE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-25 17:10:44 -07:00
Tom Eastep
ff2323b249
Add the USE_NFLOG_SIZE option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-25 16:54:14 -07:00
Tom Eastep
b4a06e9656
NFLOG_SIZE capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-25 13:44:26 -07:00
Tom Eastep
4122021344
Improve editing of port numbers/service names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-25 07:44:23 -07:00
Tom Eastep
71d50e0217
Use --nflog-size rather than --nflog-range 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-25 07:43:39 -07:00
Tom Eastep
1b6f15d577
Correct multiple fallback providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-23 07:41:23 -07:00
Tom Eastep
2f5687c65a
Don't generate multihop routes unnecessarily 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-18 09:37:41 -07:00
Tom Eastep
62a60ad995
Add comments around functions moved from IPAddrs.pm to Chains.pm. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-14 12:26:22 -07:00
Tom Eastep
b1ba05db2b
Correct handling of port ranges and port variables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-12 17:07:55 -07:00
Tom Eastep
57f7cb4f3c
Runtime Port Variables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-12 11:55:56 -07:00
Tom Eastep
4cf60258af
Correct a runtime error with NFQUEUE. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-06-12 11:07:54 -07:00
Tom Eastep
965a8e8f68
Minor cleanup of the Config module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-05-15 09:29:12 -07:00
Tom Eastep
eb26a467e9
Add snat and mangle to %config_files 
- Tabify initialization of %config_files

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-05-12 08:37:54 -07:00
Tom Eastep
bb70a3637b
Add PERL_HASH_SEED option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-05-02 07:51:37 -07:00
Tom Eastep
d4e05f6163
Correct handling of IPv6 tunnel-src and tunnel-dst 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-04-23 08:36:22 -07:00
Tom Eastep
6201f37913
Clarify <filename> in the generated script's header 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-04-18 16:45:17 -07:00
Tom Eastep
7ee44d6b4b
Correct a typo in the generated script's header syntax description 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-04-18 16:31:51 -07:00
Tom Eastep
363b8f9802
Correct validation of string interface options. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-04-13 06:48:14 -07:00
Tom Eastep
00d4724fd8
Some cleanup of the Chains module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-04-05 20:14:13 -07:00
Tom Eastep
d2392c3a9b
Add IPv6 UPnP Support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-24 09:54:36 -07:00
Tom Eastep
0763b27b0b
Correct a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-22 15:59:55 -07:00
Tom Eastep
8b90827611
Minor cleanup of split_columns() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-22 10:18:07 -07:00
Tom Eastep
8507c97b5a
Clean up column/value pair editing. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-22 09:46:52 -07:00
Tom Eastep
a6306f2c08
?reset action param now sets parmsmodified. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-18 12:53:05 -07:00
Tom Eastep
bdcf93f92c
Report the call site when issuing messages from an action. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-17 17:08:19 -07:00
Tom Eastep
6b84727886
Delete useless blank line 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-17 13:26:07 -07:00
Tom Eastep
55cf06d0a8
Correct all+ handling in the policy file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-15 10:09:53 -07:00
Tom Eastep
5b85627fb8
Merge branch '5.1.3' 
Conflicts:
	Shorewall/Perl/Shorewall/Config.pm
	Shorewall6/Actions/action.Multicast
 2017-03-14 14:16:47 -07:00
Tom Eastep
a447d726fa
Revert change which screwed up ?begin perl ... ?end perl line numbering 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-14 12:44:33 -07:00
Tom Eastep
fe29adbd66
Correct use of $family in combined actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 16:52:16 -07:00
Tom Eastep
0b8945da8e
Correctly handle expansion of option names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 10:20:15 -07:00
Tom Eastep
da363880a9
Always quote the LEVEL and DEFAULT settings when updating 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 09:51:58 -07:00
Tom Eastep
037fe490f3
Process config options in file order during update. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-12 17:09:41 -07:00
Tom Eastep
b13014c9ab
Expand variables in .conf except when upgrading 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-11 11:21:07 -08:00
Tom Eastep
76aef6cb04
Correct generation of '! --syn' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-11 08:43:04 -08:00
Tom Eastep
4c72b3ee58
Make sure that $LOG_LEVEL is defined 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-10 11:06:23 -08:00
Tom Eastep
d9071c5308
Correct $LOG_LEVEL expansion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-10 10:24:24 -08:00
Tom Eastep
49811d24fa
Correct convertion of tcrules->mangle when a writable mangle exists 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 15:21:45 -08:00
Tom Eastep
0ec7bc846e
Correct logging in inline policy actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 13:58:14 -08:00
Tom Eastep
8e000b158e
Correct the handling of tcp-reset 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 10:33:51 -08:00
Tom Eastep
f1d1ab6411
Implement tcp:!syn in PROTO column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 10:33:20 -08:00
Tom Eastep
5f1370f1b4
Clear the firewall on Debian systemd 'stop' command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-06 11:22:55 -08:00
Tom Eastep
dc53fa2665
Correct file/line from ?error 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-06 11:02:06 -08:00
Tom Eastep
356d3fa2dd
Correct new directives with respect to omitting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-05 12:09:54 -08:00
Tom Eastep
80d93235b5
Eliminate builtin actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-05 12:09:33 -08:00
Tom Eastep
c1e7fce1c5
Report the file/line where action invoked 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-05 09:29:00 -08:00
Tom Eastep
63ec936f21
Remove determinism sorts 2017-03-04 19:05:33 -08:00
Tom Eastep
63cf7dd699
Revert "Move $test to the config module." 
This reverts commit 876d76b294.
 2017-03-04 18:45:40 -08:00
Tom Eastep
876d76b294
Move $test to the config module. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-02 11:42:07 -08:00
Tom Eastep
9075a6dd7a
Copy libs and footer when compiling for test 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-02 10:49:49 -08:00
Tom Eastep
118e4f73c9
Correct validation of LOG_LEVEL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-19 10:25:44 -08:00
Tom Eastep
10b39f3855
Correct typo (allowMast -> allowMcast) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-19 10:25:27 -08:00
Tom Eastep
944888c04f
Handle broadcast and muticast separately 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-15 10:16:20 -08:00
Tom Eastep
48d301b2cf
Rename the policy LIMIT column to RATE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-12 10:17:43 -08:00
Tom Eastep
735919d8d3
Add LOG_LEVEL option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-12 09:52:55 -08:00
Tom Eastep
977fa81d46
Make 'none' case-insensitive in policy action specifications 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-10 11:43:51 -08:00
Tom Eastep
7e984af094
Some cleanup of policy actions 
- Allow '+' in policy file action list

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-07 13:19:53 -08:00
Tom Eastep
dab9e1d7c4
Assume no default actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 14:45:43 -08:00
Tom Eastep
b9471a2499
Correct parsing of the POLICY column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 14:15:24 -08:00
Tom Eastep
b2553fb008
Another change to allow builtin actions as default actions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 13:25:10 -08:00
Tom Eastep
92133e5a6b
Default-action lists 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 10:11:48 -08:00
Tom Eastep
686ca9d3a3
Allow builtin actions in xxx_DEFAULT settings. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-05 15:21:57 -08:00
Tom Eastep
70a395892f
Make BLACKLIST work correctly in the blrules file 
- Add the 'section' action option

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-23 15:03:02 -08:00
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
71dd5d016b
Add ?REQUIRE compiler directive 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-01-22 14:48:18 -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
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
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
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
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
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
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
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
963dea54c5
Modify update defaults for LOGPREFIX and LOGLIMIT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2016-11-23 14:30:07 -08:00