4006 Commits

Author	SHA1	Message	Date
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
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	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	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	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	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	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	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	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	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	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	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	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	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	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	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	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	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	afc212495f	Make POSTROUTING the default chain for CHECKSUM ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-18 08:57:49 -07:00
Tom Eastep	059b1c6c8c	Remove superfluous logic ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-13 11:13:19 -07:00
Tom Eastep	2f75901068	Restore 'use Shorewall::Config(shorewall)' in embedded Perl handling ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-13 09:29:51 -07:00
Tom Eastep	8bb7c2363b	Support '+' after a zone list in the policy files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-10 10:06:38 -07:00
Tom Eastep	2c90a8bfb5	Allow zone lists in the SOURCE and DEST columns of the policy files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-10 08:47:48 -07:00
Tom Eastep	bb8af36d3f	Minor cleanup in the Rules module ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-31 13:01:49 -07:00
Tom Eastep	4ec2c2087d	Delete obsolete comments ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-29 12:40:28 -07:00
Tom Eastep	31d35e0cbd	Minor cleanup of the Chains module ... - Correct typos - Correct 'P' trace entries - Add parens and comments to calls Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-15 09:22:11 -07:00
Tom Eastep	bcacce7ed0	Rename a variable to avoid confusion ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-14 15:45:24 -07:00
Tom Eastep	646c20491a	Fix indentation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-14 15:45:00 -07:00
Tom Eastep	fa1173baaa	Correct typo in a comment ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-14 10:24:29 -07:00
Tom Eastep	72e21be89d	Add a handle back to the flow classifier ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-04 11:03:36 -07:00
Tom Eastep	1b1e2c58f9	Allow optional provider interfaces to match a wildcard ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-02 15:44:19 -07:00
Tom Eastep	decf9d3b3e	Correct comment formatting in 'trace' output ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-07-30 09:03:19 -07:00
Tom Eastep	a05623f49e	Don't delete duplicate COUNT rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-07-30 08:24:53 -07:00
Tom Eastep	0b9cd93769	Default DSCP rules to the POSTROUTING chain ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-07-27 13:59:15 -07:00
Tom Eastep	372359839b	Add 'comment' to alternative input ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-07-24 15:08:55 -07:00
Tom Eastep	a02c745a83	Avoid silly duplicate rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-30 17:49:43 -07:00
Tom Eastep	47557aa4f7	Correct additional issues with 'update' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-18 10:24:52 -07:00
Tom Eastep	93ee4432de	Allow <user>: in USER columns ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-18 09:44:35 -07:00
Tom Eastep	8c543ca6f8	Transfer permissions during file updates ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-16 16:04:32 -07:00
Tom Eastep	e71fb3249a	Add 'dbl' interface option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-15 16:35:41 -07:00
Tom Eastep	ea56d4ed19	Make ipset-based dynamic blacklisting work in the FORWARD chain ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-13 15:02:12 -07:00
Tom Eastep	c65721a139	Correct a warning message ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-13 12:21:16 -07:00
Tom Eastep	cd0837beb5	Avoid run-time Perl diagnostic when validating a null log level ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-09 09:00:12 -07:00
Tom Eastep	cd01df4200	Allow more than 9 interfaces with Simple TC ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-07 14:43:37 -07:00
Tom Eastep	7798c52a19	Fix DOCKER=Yes when docker0 is defined and Docker isn't started. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-05-22 17:50:51 -07:00
Tom Eastep	82169a0bfd	Use 'date' format for compiletime rather than localtime format ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-05-07 13:48:16 -07:00
Tom Eastep	64fb662bb1	Verify Shorewall6 version when compiling for IPv6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-05-05 15:22:47 -07:00
Tom Eastep	ce20e5592b	Cross-check core and standard versions during compilation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-05-05 13:53:26 -07:00
Tom Eastep	590243a787	Add NFLOG as a supported mangle action ... - Also document nflog-parameters - Correct range of nflog groups Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-05-03 11:27:34 -07:00
Tom Eastep	9dd0346987	Apply Paul Gear's patch for Ubuntu 16.04 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-05-02 07:25:37 -07:00
Tom Eastep	ccfa181a6d	Tweak compile_info_command() ... - Fix comment - use $globals{VERSION} for the version number Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-30 14:12:34 -07:00
Tom Eastep	24d40f4cc2	Add VERBOSE_MESSAGES option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-30 08:00:56 -07:00
Tom Eastep	244f2cefe5	Update comment describing info_command() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-29 15:42:48 -07:00
Tom Eastep	41923cb80e	Improve compile time/date implementation ... - Rename the command from 'date' to 'info' - Return the complete date/time/version string in the command Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-29 12:31:17 -07:00
Tom Eastep	2a40012fc4	Include compile time and date in the output of 'shorewall status' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-27 16:25:21 -07:00
Tom Eastep	a92d10f19c	Merge branch '5.0.8'	2016-04-27 10:23:51 -07:00
Tom Eastep	f6b7eb4ea0	Correct handling of persistent provider with no IP address ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-25 12:27:00 -07:00
Tom Eastep	800c06e8c9	Rename lib.core to lib.runtime ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-21 08:12:41 -07:00
Tom Eastep	f16e3f1fbe	Issue warning when enable/disable won't work correctly ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-19 10:42:50 -07:00
Tom Eastep	0faf3b6db1	Send INFO messages to STDERR rather than STDOUT	2016-04-18 13:59:29 -07:00
Tom Eastep	3253c882e9	Merge branch '5.0.8'	2016-04-18 12:36:28 -07:00
Tom Eastep	5212dba7cb	Add an ESTABLISHED,RELATED rule for docker0 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-18 10:13:05 -07:00
Tom Eastep	35a22eedac	Reword error message when tcclass MARK is too large ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-18 10:06:04 -07:00
Tom Eastep	b53de922d1	Catch 0 in the MARK column of the tcclasses file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-18 08:50:10 -07:00
Tom Eastep	ae852b513d	Correct indentation issue ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-17 10:23:18 -07:00
Tom Eastep	9611b588e3	Use a uniform format for log timestamps ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-16 09:52:35 -07:00
Tom Eastep	fb8dbcf44b	Use a uniform format for log timestamps ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-16 09:49:38 -07:00
Tom Eastep	335f2968f8	Implement ?INFO and ?WARNING ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-16 09:20:09 -07:00
Tom Eastep	c725372639	Correct logging of 'reloaded' message ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-15 14:46:21 -07:00
Tom Eastep	524838ae47	Implement $SW_LOGGERTAG ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-15 14:29:51 -07:00
Tom Eastep	6aa0ecae4f	Re-factor the code for saving/loading ipsets ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-14 15:15:47 -07:00
Tom Eastep	434e042494	Add the deprecated/ directories to the CONFIG_PATH ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-14 14:17:06 -07:00
Tom Eastep	9fa0df2fd1	Move the code that generates zap_ipsets() to after save_ipsets() generation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-14 09:56:48 -07:00
Tom Eastep	216bc715e8	Clean up V4/V5 ipset enforcement ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-14 09:00:38 -07:00
Tom Eastep	dbd42e1d5d	More ipset fixes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-12 16:29:13 -07:00
Tom Eastep	2cf3706864	Correct handling of a zone with two interfaces ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-11 10:32:26 -07:00
Tom Eastep	3028dafbac	Correct DBL 'src-dst' handling ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-11 09:13:17 -07:00
Tom Eastep	16a31c3d29	Make MINIUPNPD work with DOCKER ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-11 09:02:44 -07:00
Tom Eastep	d3f377e915	Don't double-save the dynamic blacklisting ipset ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-11 08:37:39 -07:00
Tom Eastep	6c00f72f44	Create ipsets with the 'counters' option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-10 18:09:41 -07:00
Tom Eastep	deaaecdf1c	Add 'nodbl' interface option. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-10 16:09:39 -07:00
Tom Eastep	05e4049174	Ipset-based blacklisting ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-10 16:07:56 -07:00
Tom Eastep	5db6cb1b7d	Correct load_ipsets() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-09 16:07:10 -07:00
Tom Eastep	321476fd51	Tweak terminating() implementation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-08 08:24:57 -07:00
Tom Eastep	bd6b32eb25	Add a progress message for REJECT_ACTION processing ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-07 10:30:54 -07:00