7811 Commits

Author	SHA1	Message	Date
Tom Eastep	b756c63b1e	More SOURCE/DEST manpage updates ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-12-10 14:41:08 -08:00
Tom Eastep	eea9882953	Implement CPU Fanout for NFQUEUE. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-12-09 10:46:39 -08:00
Tom Eastep	cc937ffaba	NFQUEUE should be non-terminating ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-12-09 09:49:23 -08:00
Tom Eastep	5ea3334a66	Support a richer SOURCE and DEST syntax ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-12-09 09:43:10 -08:00
Tom Eastep	a2e040998b	Move shorewall(8) to shorewall.core ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-12-04 18:03:18 -08:00
Tom Eastep	53adfbe863	Normalize parameters by removing trailing omitted args ... - Avoids needless duplicate action chains	2016-12-03 11:34:02 -08:00
Tom Eastep	4a0a906510	Correct progress message in optimize_level4() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-12-03 08:28:14 -08:00
Tom Eastep	7ceb0228e9	Merge branch 'master' into 5.1.0	2016-12-02 15:27:16 -08:00
Tom Eastep	f537e3e15c	Fix optimization bug in merge_rules() ... - Reset the simple member if a unique option is merged Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-12-02 14:47:03 -08:00
Tom Eastep	5ae062317f	Merge branch 'master' into 5.1.0	2016-12-01 19:35:14 -08:00
Tom Eastep	a1981823f4	Correct typo (syntax error!) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-12-01 15:21:25 -08:00
Tom Eastep	77e83f0afd	Eliminate the CHAIN_SCRIPTS option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-29 16:33:23 -08:00
Tom Eastep	a45fe692cc	Add a SWITCH column to the mangle files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-29 16:13:44 -08:00
Tom Eastep	799b17210c	Enhanced syntax for SOURCE and DEST columns in the rules file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-25 15:10:14 -08:00
Tom Eastep	01306e1230	Try another approach to the RCP_/RSH_COMMAND formatting issue ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-23 14:48:28 -08:00
Tom Eastep	963dea54c5	Modify update defaults for LOGPREFIX and LOGLIMIT ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-23 14:30:07 -08:00
Tom Eastep	fbbcc812a1	Remove archaic LAST LINE comments from sample .conf files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-23 14:17:28 -08:00
Tom Eastep	87870ac46e	Clean up formatting of the RCP_/RSH_COMMAND manpage descriptions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-23 14:08:13 -08:00
Tom Eastep	d895a5d67c	Correct version in IPv4 universal shorewall.conf ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-22 09:28:44 -08:00
Tom Eastep	c561f8eb03	Default shorewall.conf changes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-22 08:57:47 -08:00
Tom Eastep	38c9165c39	More shorewall(8) documentation updates ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-21 13:57:06 -08:00
Tom Eastep	bd2df4836d	Break lib.base into two libraries ... - Allows separation of default product determination and establishment of the product environment Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-21 13:25:57 -08:00
Tom Eastep	875c352473	Unify the CLI ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-21 10:00:55 -08:00
Tom Eastep	dae060bbb4	Update shorewall(8) for single CLI ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-20 13:03:13 -08:00
Tom Eastep	ccab75e69a	Avoid unnecessary change in the generated script ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-20 09:17:39 -08:00
Tom Eastep	de553e7b18	Add the -l option ... - Update shorewall(8) Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-20 09:16:16 -08:00
Tom Eastep	36517cdb1e	Rename setup_environment to setup_product_environment ... - Default to first detected product - Verify that specified product is installed Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-20 08:48:18 -08:00
Tom Eastep	bb5c3a50f5	Avoid unnecessary change in the generated script ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-19 21:39:49 -08:00
Tom Eastep	8b99fe20b5	Pave the way for unifying the CLI ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-19 21:17:35 -08:00
Tom Eastep	137b051e52	Centralize setting of product-dependent g_* variables ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-19 17:17:03 -08:00
Tom Eastep	9eb390403b	Implement -p option to disable PAGER ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-17 10:58:10 -08:00
Tom Eastep	88284ed568	Delete version from the heading of compiler.pl ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-16 13:03:00 -08:00
Tom Eastep	481afef2c3	Don't insist that route deletion succeeds ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-12 08:38:09 -08:00
Tom Eastep	6b38b3a515	Revert "More IPv6 routing cleanup" ... This reverts commit 1e7f63834c.	2016-11-12 08:25:38 -08:00
Tom Eastep	80951d23c2	add/delete multi-nexthop IPv6 routes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-12 08:24:46 -08:00
Tom Eastep	1e7f63834c	More IPv6 routing cleanup ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-09 10:34:19 -08:00
Tom Eastep	74b94f71f8	Always return $omitting from process_compiler_directive() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-09 08:07:17 -08:00
Tom Eastep	ef4ab62dd3	Disable directive callbacks after file conversion. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-09 07:47:19 -08:00
Tom Eastep	42c1c2a205	Don't copy link-level address routes into provider tables. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-08 14:42:44 -08:00
Tom Eastep	6095d05af9	Update manpages for 'update' improvements ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-07 13:50:11 -08:00
Tom Eastep	d989241712	Retain shell variables during routestopped and blacklist conversions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-07 11:26:17 -08:00
Tom Eastep	652bc75448	Omit Shorewall version from converted files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-07 11:12:36 -08:00
Tom Eastep	d105da3964	Preserve shell variables when converting tos->mangle ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-06 17:25:35 -08:00
Tom Eastep	c5b393a074	Preserve shell variables when converting tcrules->mangle ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-06 17:25:01 -08:00
Tom Eastep	1b82dedb77	Preserve shell variables when converting masq -> snat ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-06 13:53:05 -08:00
Tom Eastep	6398756647	Add a routine to split the raw current line image ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-06 08:44:24 -08:00
Tom Eastep	daa2440d9a	Ensure that $directive_callback->() gets an unaltered image ... - pass omitted lines to that function as well Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-06 08:03:31 -08:00
Tom Eastep	ffe1e1d335	Fix typo in the two-interface sample snat file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-04 08:36:24 -07:00
Tom Eastep	8441ac5c5f	Handle another issue with ADD_SNAT_ALIASES=Yes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-03 15:06:38 -07:00
Tom Eastep	01a6881f4f	Catch total lack of address/port in SNAT argument ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-02 19:30:55 -07:00
Tom Eastep	f917670fbd	Tighten editing of SNAT/MASQ port ranges. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-02 19:30:18 -07:00
Tom Eastep	c376740329	Detect degenerate addr:port[-range] in SNAT rules. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-02 15:28:00 -07:00
Tom Eastep	4169520d63	Handle exceptionrule correctly with MASQUERADE. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-02 14:36:51 -07:00
Tom Eastep	53d97bbcc8	Correct handling of masquerade port range when ADD_SNAT_ALIASES=Yes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-02 12:28:00 -07:00
Tom Eastep	9ae36e1989	Correct error message when multiple SNAT addresses are present. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-02 12:27:32 -07:00
Tom Eastep	60619fb3cb	Correct part of a recent patch to Nat.pm ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-02 09:00:19 -07:00
Tom Eastep	41ecee356b	Correct earlier faulty patch to Nat.pm. ... - Similar Rules.pm patch was okay. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-01 19:39:52 -07:00
Tom Eastep	e188bde6c4	Fix additional masq/snat issues. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-01 18:42:16 -07:00
Tom Eastep	6e08717089	Formatting changes to snat files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-01 17:11:43 -07:00
Tom Eastep	d37967f32f	Replace --to-ports <ports> with --to-source :<ports> ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-01 16:52:08 -07:00
Tom Eastep	10c1ad245a	Handle omitted port[-range] in SNAT correctly. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-01 12:59:44 -07:00
Tom Eastep	032a16eb43	Detect incorrect port-range separator in SNAT(...) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-01 11:28:19 -07:00
Tom Eastep	a89d8b3af4	Fix Shorewall installer re: snat file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-31 16:13:48 -07:00
Tom Eastep	3f68814a38	Disallow more than one address[-range] in SNAT rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-31 15:15:35 -07:00
Tom Eastep	95a1e65016	Clear target modifiers in interface loop ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-30 16:25:17 -07:00
Tom Eastep	282253022e	Correct handling of address variables out of the Providers module ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-29 14:59:34 -07:00
Tom Eastep	4d77d673e8	Be sure NAT is enabled before processing an snat file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-28 09:30:17 -07:00
Tom Eastep	e4e424bbdc	Disallow '+' in inline SNAT action bodies ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-28 08:58:47 -07:00
Tom Eastep	71fb1a8cbd	Correct error message ( s/\*/+/ ) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-27 14:32:43 -07:00
Tom Eastep	46c8147521	Deprecate INLINE_MATCHES=Yes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-27 13:55:11 -07:00
Tom Eastep	de3b05ea41	Correctly translate +INLINE(...) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-27 12:21:07 -07:00
Tom Eastep	ae9b57d854	Correct NONAT translation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-26 16:06:28 -07:00
Tom Eastep	579910fdb8	Fix MASQUERADE+ Handling ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-26 14:40:16 -07:00
Tom Eastep	21877d5fcb	Force a reload when enabling an interface whose IP address has changed ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-26 13:39:50 -07:00
Tom Eastep	0b9387f09c	Force address Detection on optional interfaces ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-25 14:42:03 -07:00
Tom Eastep	fdfd8b919b	Merge branch '5.0.13'	2016-10-24 12:52:01 -07:00
Tom Eastep	3d3ae81bce	Restore old wording for Version 4 ipset creation message ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-24 12:51:43 -07:00
Tom Eastep	3b6b89336e	Eliminate superfluous test ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-24 11:57:56 -07:00
Tom Eastep	fc0ad7cd2e	Be sure that the 'restriction' member exists for the FORWARD chain ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-24 11:37:40 -07:00
Tom Eastep	c9b1b7684c	Correct handling of dest IPSET. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-24 09:06:05 -07:00
Tom Eastep	b8ec460a1a	Correct grammar in the ipset creation message ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-24 08:49:51 -07:00
Tom Eastep	46b8e2e957	Avoid exception when validating 'occurs' in TC ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-24 08:14:12 -07:00
Tom Eastep	0ed813972b	Auto-create ipsets used in tcfilters ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-23 16:44:07 -07:00
Tom Eastep	f9cfde91e5	Correctly handle ipset in tcfilter DEST ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-23 16:43:49 -07:00
Tom Eastep	3df488e710	Correct handling of ipsets in tcfilters ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-23 16:28:36 -07:00
Tom Eastep	0efc7a4899	Correct restriction and chain number handling in the mangle files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-23 15:36:04 -07:00
Tom Eastep	d241421630	Merge branch '5.0.13'	2016-10-23 08:34:47 -07:00
Tom Eastep	e0203bca87	Correct nill address check in handling of 'origdest=detect' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-23 08:34:24 -07:00
Tom Eastep	3874bb9fa6	Delete duplicate line of code ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-22 15:41:26 -07:00
Tom Eastep	13a321726c	Fix typo ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-21 09:22:30 -07:00
Tom Eastep	b160845713	Avoid compiler crash when LOAD_HELPERS_ONLY=Yes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-20 15:22:43 -07:00
Tom Eastep	71566f0ab0	Avoid compiler crash when LOAD_HELPERS_ONLY=Yes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-20 14:54:01 -07:00
Tom Eastep	e4169ede4a	Merge branch '5.0.13'	2016-10-20 13:29:05 -07:00
Tom Eastep	b44628ddc8	Only specify 'counters' to ipset of IPSET_MATCH_COUNTERS is present ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-20 09:07:36 -07:00
Tom Eastep	0e7d5f3972	Support '+' in SNAT action invocation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-18 16:00:36 -07:00
Tom Eastep	5b5f91f75f	SNAT option documentation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-18 15:32:22 -07:00
Tom Eastep	ab496987e0	Prevent 'nat' and 'mangle' being specified together ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-18 15:32:05 -07:00
Tom Eastep	c92ebc3908	Make merge_inline_source_dest() a little safer ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-18 14:32:56 -07:00
Tom Eastep	bc3573fcbc	Correct handling of interface lists in masq->snat conversion ... - Also restore logic for ADD_SNAT_ALIASES - Correct some interface-list errors in snat processing - Restore whitespace after '--to-source' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-18 14:19:09 -07:00
Tom Eastep	6b7beaadaf	Merge branch '5.0.13'	2016-10-18 10:16:58 -07:00
Tom Eastep	31b6e9e299	Fix another DEST bug in mangle inline action handling :-( ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-18 10:15:43 -07:00
Tom Eastep	d52a4b1c9d	Implement SNAT actions and inlines ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-18 10:09:07 -07:00
Tom Eastep	9796af5d80	Merge branch '5.0.13'	2016-10-17 10:16:30 -07:00
Tom Eastep	9fc56bb896	Correct typo in process_mangle_inline() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-17 09:29:32 -07:00
Tom Eastep	f3dd77a3f1	Merge branch '5.0.13'	2016-10-16 16:36:08 -07:00
Tom Eastep	2c191bf595	Correct .conf manpages ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-16 15:07:34 -07:00
Tom Eastep	4bb942f1f9	Restrict hypen as range separator to use with integers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-16 13:29:00 -07:00
Tom Eastep	05dbfbb988	Restrict hypen as range separator to use with integers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-16 13:26:44 -07:00
Tom Eastep	69a7c78179	Merge branch '5.0.13'	2016-10-16 12:28:01 -07:00
Tom Eastep	04051454bf	Reverse bad ECN handling patch ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-16 12:27:45 -07:00
Tom Eastep	2ca86d9abd	Merge branch '5.0.13'	2016-10-16 10:22:12 -07:00
Tom Eastep	e6f3d429a1	Renew timeout on matched dbl entries ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-16 09:42:45 -07:00
Tom Eastep	1ca91d7ddc	Correct handling of ECN file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-16 08:41:19 -07:00
Tom Eastep	fad9dce3e6	Correct handling of ECN file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-16 08:33:01 -07:00
Tom Eastep	342f4ee0f2	Add the --exits option to ADD with timeout ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-15 16:43:44 -07:00
Tom Eastep	047b5ca6d5	Add the --exits option to ADD with timeout ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-15 16:43:04 -07:00
Tom Eastep	86c4333f8f	Correct the shorewall-snat(5) examples ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-15 14:58:49 -07:00
Tom Eastep	e1de1f0527	Convert Sample masq files to equivalent snat files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-15 12:43:42 -07:00
Tom Eastep	43fdddb438	Add 'snat' config file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-15 11:38:52 -07:00
Tom Eastep	44477d97ac	Move Masq file processing to the Rules module ... - This will enable supporting actions in the new snat file Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-14 12:42:58 -07:00
Tom Eastep	b5906812a2	Accept '-' as the separator in a port range. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-14 10:10:03 -07:00
Tom Eastep	b80d4c2320	Don't allow shell meta characters in interface names ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-11 17:01:45 -07:00
Tom Eastep	d5aaa66e0b	Detect bad characters in interface names ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-11 10:56:41 -07:00
Tom Eastep	49fae96b09	Update the manpages for 'blacklist' verbosity ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-10 19:45:42 -07:00
Tom Eastep	8c522a5c4d	Correct typo in lib.private ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-09 10:58:29 -07:00
Tom Eastep	abf57a4d1f	Correct indentation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-09 09:29:04 -07:00
Tom Eastep	3058f2fb84	Delete code supporting old kernel/iproute2 IPv6 restrictions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-07 11:02:36 -07:00
Tom Eastep	b5e7e41708	Correct NFQUEUE! manpage description ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-07 05:50:24 -07:00
Tom Eastep	eb6ae5e186	Correct handling of DYNAMIC_BLACKLIST options ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-05 16:56:29 -07:00
Tom Eastep	941604ad01	Correct issue with updating DBL timeout ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-05 15:41:40 -07:00
Tom Eastep	14e8568d9e	Add the FIREWALL .conf option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-05 15:03:54 -07:00
Tom Eastep	ca7ca4bdfe	Add a 'timeout' option to DYNAMIC_BLACKLIST ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-05 12:56:47 -07:00
Tom Eastep	8d731c81e4	Add 'disconnect' option to ipset-based dynamic blacklisting ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-04 09:09:45 -07:00
Tom Eastep	6ad7d47eb6	Correct DYNAMIC_BLACKLISTING documentation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-03 08:19:19 -07:00
Tom Eastep	ed48eed0c6	Change order of options in .conf files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-10-02 15:14:31 -07:00
Tom Eastep	97186e5402	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2016-10-02 14:04:02 -07:00
Roberto C. Sánchez	64ab43f14f	Fix typos	2016-10-02 17:01:46 -04:00
Tom Eastep	72dbb4c3c3	Handle persistent provider enable/disable correctly ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-30 16:01:04 -07:00
Tom Eastep	bc591ccee4	Don't assume that statistically balanced providers are optional ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-30 14:01:16 -07:00
Tom Eastep	f989c2f5f6	Document 'persistent' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-30 11:34:57 -07:00
Tom Eastep	156313edd2	Correctly handle down persistent interface during 'disable' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-27 11:47:37 -07:00
Tom Eastep	35bd1db7fb	Handle Down or missing interfaces in 'delete_gateway()' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-27 11:43:26 -07:00
Tom Eastep	792b3b696c	Add ZERO_MARKS option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-26 16:04:26 -07:00
Tom Eastep	3f8ddb11ab	Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code	2016-09-25 08:00:43 -07:00
Tom Eastep	fa9ee6d69e	Clear packet marks in PREROUTING and OUTPUT ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-24 15:46:04 -07:00
Tom Eastep	ef4b1c2030	Add a TIME Columns section to the config file basics doc ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-22 15:45:18 -07:00
Tom Eastep	8065e62f12	Support for the 'contiguous' option in TIME columns ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-22 14:22:11 -07:00
Tom Eastep	e81a4788c6	Implement DEFAULT_PAGER in shorewallrc ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-21 10:20:48 -07:00
Tom Eastep	d854185c56	Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code	2016-09-20 08:47:07 -07:00
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	7e32a10176	Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code	2016-09-10 08:48:48 -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	5ea91f21f4	Correct the mangle manpage ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-09-05 19:20:25 -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	a05b957498	Corrections in the shorewall[6].conf manpages ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-08-15 10:24:23 -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	4a6338d857	Correct/complete Scott Sumate's LOGFILE enhancement ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-07-15 14:25:02 -07:00
Roberto C. Sánchez	76b2b0de78	Debian init script: fix name of force-reload target (Closes: #830110)	2016-07-06 08:43:21 -04:00
Roberto C. Sánchez	7c9876241c	Debian init scripts: add run-level 1 to Default-Stop specification	2016-07-04 17:37:00 -04:00
Roberto C. Sánchez	8b36c2c1cf	Debian init scripts: more accurately describe what action is being taken	2016-07-04 13:34:33 -04: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	f979ccb16d	Merge branch '5.0.9'	2016-06-09 14:47:44 -07:00
Tom Eastep	24b396bc67	Avoid run-time Perl diagnostic when validating a null log level ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-09 09:12:13 -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	4869f61a25	'allow' now works with ipset-based dynamic blacklisting ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-09 08:44:25 -07:00
Matt Darfeuille	cd4e9654d8	(Fwd) [Shorewall-users] Shorewall-lite on OpenWRT ... ------- Forwarded message follows ------- From: istvan@istvan.org To: shorewall-users@lists.sourceforge.net Date sent: Thu, 19 May 2016 09:10:21 +0200 Subject: [Shorewall-users] Shorewall-lite on OpenWRT Send reply to: Shorewall Users <shorewall-users@lists.sourceforge.net> <mailto:shorewall-users-request@lists.sourceforge.net?subject=unsubscribe> <mailto:shorewall-users-request@lists.sourceforge.net?subject=subscribe> Hi there, I use Shorewall on an OpenWRT distribution and I experience 2 problems. I have solved them myself and report them here to help others with it. Shorewall version: shorewall[6]-lite 5.0.4 OpenWRT version: Chaos Calmer 15.05, r46767 Problem 1: Shorewall uses the lock utility from openwrt. I believe it is used in the wrong way. File lib.common line 775 First it passes arguments which the utility doesn't use/know. The util accepts them dumbly and continues to create a lockfile. It has no time-out functionality. I do not know the meaning of the r1 argument. Second the mutex_off simply deletes the lockfile by using the utility rm. This way a stale lock process keeps running. After a while the router is running a high number of stale processes which has impact on the load of the router. The correct way is to use "lock -u /lib/shorewall-lite/lock". This way the lockfile will be removed and the process will be terminated accordingly. To make it work for me, I no more let shorewall use the lock utility by using an ugly hack. Problem 2: An fgrep on the output of the type utility is wrongly coded. The output of the type command probably has been changed. File lib.cli line 4343 It is coded: "if type $1 2> /dev/null | fgrep -q 'is a function'; then" To make it work for me, it should be coded: "if type $1 2> /dev/null | fgrep -q 'is a shell function'; then" With regards, Stefan ------- End of forwarded message ------- Tom, attached as code.patch, are the patches that I believe will correct those issues In addition to those patches I've also added 3 patches: - Patch 1 will emulate the -p flag of the ps utility which is not available on openwrt. - The last two patches will add "file" to the progress message of SYSCONFFILE to make it more consistent among the installers. In shorewall-init/install.sh the else clause between the line 586 and 597 will only work for a sysvinit script. Should I make it also work for a systemd service script or can't we simply remove that else clause? In the compiled firewall script the comments before and after the functions imported from lib.common have two slashes in the path: $ grep -H lib.common firewall firewall:# Functions imported from /usr/share/shorewall//lib.common firewall:# End of imports from /usr/share/shorewall//lib.common -Matt -------------- Enclosure number 1 ---------------- >From 6ff651108df33ab8be4562caef03a8582e9eac5e Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <matdarf@gmail.com> Date: Tue, 24 May 2016 13:10:28 +0200 Subject: [PATCH 1/8] Emulate 'ps -p' using grep to work on openwrt Signed-off-by: Matt Darfeuille <matdarf@gmail.com> Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-06-08 15:40:36 -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	d4df67966d	Turn on AUTOMAKE in the sample configurations ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-05-06 08:46:11 -07:00
Tom Eastep	f16bb887f3	Report versions as Shorewall's rather than Shorewall6's ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-05-05 15:41:46 -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	b7de785396	Correct typo in manpages ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-30 08:34:43 -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
Matt Darfeuille	05a15c6f8b	patches and request ... Tom, Some patches for the trunk repo(fixes.patch): Patch1: Fix a typo in the path being printed for the standard actions file. Patch2: Will only install the shorewall's manpages if the variable MANDIR is none-empty(I did it only for the sake of completeness)! Patch3: Will only install the shorewall-lite's manpages if the variable MANDIR is none-empty. Patch4: Correct multiple product name's typos in shorewall-init/install.sh. Patch5: Remove ~/.shorewallrc when shorewall-core is uninstalled. And two other patches for the release repo(changelog-1.patch): Patch1: Changed restart to reload for the line: 'Update DHCP article(refresh -> restart). Patch2: Rephrased the line for the newly added ?WARNING and ?INFO directives. Request: Could the date of the compiled firewall script also be displayed when 'shorewall status' is executed? -Matt -------------- Enclosure number 2 ---------------- >From a5ae24bbe9b25aefdbcc4d7c8e5d013a36b03078 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <matdarf@gmail.com> Date: Sat, 23 Apr 2016 14:44:19 +0200 Subject: [PATCH 1/5] Fix typo in printed path for standard actions file Signed-off-by: Matt Darfeuille <matdarf@gmail.com> Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-27 15:07:44 -07:00
Tom Eastep	a92d10f19c	Merge branch '5.0.8'	2016-04-27 10:23:51 -07:00
Tom Eastep	47edfaf093	Create standard error messages in the CLI ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-27 10:13:24 -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	71bd7a4647	Update the STARTUP_LOG description in shorewall[6].conf ... - Update list of commands Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-19 07:49:37 -07:00
Tom Eastep	f9bbca8b05	Expand the list of commands that write to STARTUP_LOG ... - add the safe-* commands Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-18 14:16:13 -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	2b7ef0fe32	Update the tcclasses manpage to discuss fw mark filter priority ... - Also correct default priorities for tos= and tcp-ack Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-18 09:18:48 -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
Matt Darfeuille	365ffaf645	questions ... On 17 Apr 2016 at 7:45, Tom Eastep wrote: > On 04/17/2016 06:23 AM, Matt Darfeuille wrote: > > >> Tom, I neglected the git part of that request!(sorry): > >> > >> Could changes be also made in the git code repo that take for account > >> case insensitive system?: > >> > >> What I suggest doing is using the deprecated extension when the case > >> of a file is changed in the code so git wouldn't show 'Modified: ...' > >> and simply modifying shorewall/install.sh to strip the file from the > >> deprecated extension and then copying it to the deprecated directory. > >> > >> In other words: when changing the case of a file tracked by git could > >> case-insensitivity platform be taken in to account? > >> > >> -Matt > >> > >> P.S. I'll test SW_LOGGERTAG tomorrow!!!:) > > > > Or do you have a better solution, if no, I could do the changes to > > shorewall/install.sh!? > > Sure -- go ahead. We'll do it in the master branch, though, since I've > now created a 5.0.8 branch for the upcoming release. > > > > > You might want to apply the attached patch to changelog.txt in the > > release repo! > > > > Applied -- thanks! > > -Tom > -- > Tom Eastep \ When I die, I want to go like my Grandfather who > Shoreline, \ died peacefully in his sleep. Not screaming like > Washington, USA \ all of the passengers in his car > http://shorewall.net \________________________________________________ > > Attached as case.patch are 3 patches: 1 and 2 simply rename the deprecated files(adding .deprecated) Patch 3 will modify Shorewall/install.sh to reflect the new naming scheme! I didn't have the time to test SW_LOGGERTAG but will do so in the coming days!!!:) -Matt -------------- Enclosure number 1 ---------------- From 2ecd761b414af61c5854d6427fb9ec8ab1365c7b Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <matdarf@gmail.com> Date: Sun, 17 Apr 2016 18:34:40 +0200 Subject: [PATCH 1/3] Rename macro.SNMPTrap to macro.SNMPTrap.deprecated Signed-off-by: Matt Darfeuille <matdarf@gmail.com> Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-17 13:50:17 -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	eb95532248	Enable compiler logging on reload and restart ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-16 09:52:17 -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	62a14aab28	Enable compiler logging on reload and restart ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-16 09:37:42 -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	32f888a7d4	Add an ENVIRONMENT section to the CLI manpages ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-15 15:41:55 -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	074655d1bd	Fix AUTOMAKE and the start command ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-14 09:43:21 -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
Tuomo Soini	772f88b1fd	action.A_Reject: improve comment text ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-12 13:17:56 +03:00
Tuomo Soini	3e0b8c60a2	Reverse the order of ICMP and Broadcast checking in the default actions ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-12 10:12:29 +03:00
Tom Eastep	16afd880b2	Reverse the order of ICMP and Broadcast checking in the default actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-11 11:16:46 -07:00
Tom Eastep	76a5841fcd	Reverse the order of Broadcast and ICMP checking in the default actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-11 10:47:11 -07:00
Tom Eastep	9758e8cdc5	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2016-04-11 10:41:44 -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
Tuomo Soini	54a5748395	macros: RedisCluster and RedisSentinel ... http://redis.io/topics/sentinel Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-11 14:39:21 +03: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	ef10515a42	Correct FASTACCEPT description ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-10 07:20:45 -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	76c8917aa7	Add a sixth parameter to Drop and Reject ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-08 09:10:45 -07:00
Tom Eastep	be58d530c4	Document 'logjump' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-08 09:09:59 -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
Tom Eastep	4fdf54eca1	Tweak process_reject_action() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-07 10:02:48 -07:00
Tom Eastep	70bbd21b35	Ensure that the REJECT_ACTION is terminating ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-07 09:34:38 -07:00
Tom Eastep	87a9b95f73	Catch case where a transformed rule jumps to its own chain ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-07 08:58:50 -07:00
Tom Eastep	ecd7261365	Use -g when target is a terminating chain ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-07 08:48:36 -07:00
Tom Eastep	293cd1d66a	Always go to the reject chain rather than jump to it ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-06 09:14:06 -07:00
Tom Eastep	436b5d89ce	Correct comment ... - The chain will only exist if logging wasn't specified for the same disposition. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-06 08:50:29 -07:00
Tom Eastep	26795cf082	Correct setup of $usedactions{A_REJECT} ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-06 08:18:36 -07:00
Tom Eastep	95e4071f34	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2016-04-06 07:42:46 -07:00
Tuomo Soini	20179a5c9d	remove completely false README.txt ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-06 10:23:58 +03:00
Tom Eastep	b7e6893f7d	Restore DropUPnP behavior in Reject ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-05 20:00:15 -07:00
Tom Eastep	3ac3ae279f	Add A_REJECT action ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-05 16:38:39 -07:00
Tom Eastep	54843c617d	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2016-04-05 11:46:42 -07:00
Tom Eastep	e9467326f3	Allow allow REJECT to take a parameter ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-05 11:20:44 -07:00
Tuomo Soini	80bf77e8a8	modules.xtables: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:31:36 +03:00
Tuomo Soini	1e5ebee799	modules.tc: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:31:36 +03:00
Tuomo Soini	74fe7b302e	modules.ipset: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:31:36 +03:00
Tuomo Soini	d70e18535b	modules.extensions: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:31:36 +03:00
Tuomo Soini	64a6b36918	modules.essential: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:31:36 +03:00
Tuomo Soini	2962809243	action.Untracked: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	23a91d7c26	action.template: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	30b2b2dcb4	action.TCPFlags: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	46a86cfa58	action.SetEvent: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	ad2dfd9eaf	action.RST: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	001aabf72c	action.ResetEvent: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	7052819a9c	action.Related: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	2b1244c110	action.Reject: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	94803b63b1	action.NotSyn: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	5f33cb5d0a	action.New: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	deda26c790	action.mangletemplate: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	f9f349a148	action.Invalid: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	2842e897c9	action.IfEvent: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	de44a16094	action.GlusterFS: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	6560e74c2c	action.Established: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	f7ddf3008d	action.DropSmurfs: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	cb608172d3	action.dropInvalid: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	f806010521	action.Drop: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	205254e043	action.DNSAmp: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	a7efa12fff	action.Broadcast: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	95c4f2d7f6	action.AutoBLL: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	89189f7836	action.AutoBL: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	c2e3156e5c	action.A_Reject: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	ffe9f88c07	action.allowInvalid: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tuomo Soini	e4c9c83e2b	action.A_Drop: reformat to new header style ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-04-05 20:13:55 +03:00
Tom Eastep	77a93d10a4	Don't pass an argument to DropUPnP out of Drop and Reject ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-04 15:55:48 -07:00
Tom Eastep	75df718865	Reword comment in push_action_params() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-04 09:41:28 -07:00
Tom Eastep	ae8e2f70ea	Efficiency change to known_interface() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-03 17:34:02 -07:00
Tom Eastep	39f5b77e5f	Fix known_interface() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-03 16:31:45 -07:00
Tom Eastep	cb5a2519f3	Keep hyphens in @chain ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-03 16:30:31 -07:00
Tom Eastep	4151f7c504	Revert change to log_[i]rule_limit ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-03 16:29:52 -07:00
Tom Eastep	054837aeea	Use the real chain name in log messages ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-03 13:04:25 -07:00
Tom Eastep	b637d303b9	Correct use of a physical interface name in the hosts file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-02 17:27:20 -07:00
Tom Eastep	0dbf42424d	Make physical name a synonym for the correcponding logical name. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-02 10:04:05 -07:00
Tom Eastep	f22e8d6d55	Allow physical interface to work in the ecn file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-01 15:10:49 -07:00
Tom Eastep	d98305c6f4	Correct default for MINIUPNOD ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-01 12:20:42 -07:00
Tom Eastep	3cbfdadb32	Merge branch '5.0.7'	2016-04-01 09:46:53 -07:00
Tom Eastep	81d76e3817	Document + in the MODULESDIR setting. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-01 09:43:06 -07:00
Tom Eastep	df1b1f6768	Add MINIUPNPD option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-04-01 08:57:08 -07:00
Tom Eastep	3881b38e02	Fix similar INTERFACE column issue in the nat and netmap files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-31 14:16:43 -07:00
Tom Eastep	8a8f3b6f59	Merge branch '5.0.7'	2016-03-31 12:55:16 -07:00
Tom Eastep	b9bed00123	Correct handling of a physical name in a masq rule ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-31 12:52:30 -07:00
Tom Eastep	38aa7797c4	Allow protocol and user lists in actions and macros ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-30 08:34:42 -07:00
Tom Eastep	404540ffe1	Merge branch '5.0.7'	2016-03-30 08:17:19 -07:00
Tom Eastep	dd3c0daa08	Handle inline matches correctly in the mangle file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-29 13:33:47 -07:00
Tom Eastep	4fddfcfba0	More complete fix for inline matches ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-29 13:15:01 -07:00
Tom Eastep	421d5f6043	Move Raw matches to last. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-29 09:31:27 -07:00
Tom Eastep	382ab380a2	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2016-03-29 07:36:49 -07:00
Tuomo Soini	2342c7cd9c	Perl/Shorewall/Chains.pm: Fix warning with older perl	2016-03-29 09:58:33 +03:00
Tom Eastep	66ae4975b2	Allow :R with DIVERT ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-28 15:52:49 -07:00
Tom Eastep	5b7a9db170	Correct clearing of inline matches ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-28 15:48:59 -07:00
Roberto C. Sánchez	899a317c95	Fix typos	2016-03-26 22:25:30 -04:00
Tom Eastep	ad87d94e33	Small efficiency change ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-26 13:12:33 -07:00
Tom Eastep	f86abf9552	Eliminate @columnstack -- simple save the columns array on the call stack. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-22 10:49:40 -07:00
Tom Eastep	9fe1a34412	Tighten up editing of configuration options ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-21 12:03:45 -07:00
Tom Eastep	abe533b6e3	Correct the action on ingress filters ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-19 13:45:33 -07:00
Tom Eastep	1c3140789c	Add stab to ingress qdiscs ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-19 13:25:39 -07:00
Tom Eastep	0399a346d0	Replace a silly line of code. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-19 12:05:45 -07:00
Tom Eastep	6ed3861d76	Correct Mangle Action Handling for second visit to the same action ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-18 15:25:52 -07:00
Tom Eastep	7a18847c14	Correct handling of log level in a _DEFAULT setting. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-18 15:25:14 -07:00
Tom Eastep	273c89a753	Implement MARK and CONNMARK in the rules file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-18 11:42:58 -07:00
Tom Eastep	2bebf1c95a	Make '&' and '|' work with CONNMARK ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-18 11:30:52 -07:00
Tom Eastep	18573037f9	More 'check -r' fixes around Docker ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-18 11:09:39 -07:00
Tom Eastep	818628138b	Add MARK and CONNMARK to the %targets table ... - Also, sort the table entries Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-18 10:21:35 -07:00
Tom Eastep	2adec0eb65	Implement a filename cache for find_file() ... - Don't need to search the CONFIG_PATH for re-open of same file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-18 09:45:41 -07:00
Tom Eastep	6ae94767b7	Correct a comment ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-18 08:31:52 -07:00
Tom Eastep	9f26c010ac	Remove embedded Perl from allowInvalid and dropInvalid ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-17 08:59:29 -07:00
Tom Eastep	9ab2310dc8	Correct an incorrect comment in process_rules() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-17 08:47:33 -07:00
Tom Eastep	c9c5f0174c	Remove trailing blank lines from action.TCPFlags	2016-03-16 14:54:05 -07:00
Tom Eastep	da0653cb2f	Declare passed() in Shorewall::User rather than importing it from Config ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-15 14:16:15 -07:00
Tom Eastep	65ce6ed226	Update modules to use passed() for parameter testing ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-15 12:06:32 -07:00
Tom Eastep	eb9dd3e485	Implement passed() in Config.pm ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-15 12:00:56 -07:00
Tom Eastep	796f191d48	Don't re-stat action files in process_action() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-15 09:03:36 -07:00
Tom Eastep	71c26beab4	Remove dead code (caused by bad test) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 17:56:34 -07:00
Tom Eastep	6f04902963	Make use of 'state=' in actions a fatal error ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 17:55:54 -07:00
Tom Eastep	bd2295c4c3	Avoid embedded Perl in the Broadcast action when ADDRTYPE is available ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 15:57:32 -07:00
Tom Eastep	901c6d34f6	Correct typo in Rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 15:56:57 -07:00
Tom Eastep	741da14789	Ignore 'state' in the actions file with a warning ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 15:46:29 -07:00
Tom Eastep	34c3828b7c	Fix action.Related ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 15:44:16 -07:00
Tom Eastep	eed7692952	Document the state action option. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 15:15:32 -07:00
Tom Eastep	3c544b20e6	Convert the state actions to use the 'state' action option ... - Also avoid the CLI having to know about builtin actions Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 14:54:09 -07:00
Tom Eastep	dd547c90a8	Implement the 'state' action option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 14:30:36 -07:00
Tom Eastep	35fac8c2ea	Avoid repeated %actions lookup in process_action() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 12:37:45 -07:00
Tom Eastep	513b828788	Pass '$prerule' to process_inline() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 10:56:07 -07:00
Tom Eastep	28e0cb5335	Use filename stored in the actions table ... - Avoid a find_file call on each action invocation Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 10:55:39 -07:00
Tom Eastep	c631173310	Eliminate the %inlines table ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-14 10:47:18 -07:00
Tom Eastep	95da427ea8	Update manpages for 'audit' actions. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 15:53:31 -07:00
Tom Eastep	2c14b7c9e3	Rename %actparms to %actparams ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 15:36:38 -07:00
Tom Eastep	8e7af2e95e	Additional editing of audit action parameters. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 15:28:49 -07:00
Tom Eastep	6be4fd377f	Make RST and NotSyn 'audit' actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 14:40:12 -07:00
Tom Eastep	44c0bffcd3	Add 'audit' option to actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 14:39:46 -07:00
Tom Eastep	2c3644a510	Make Action/Inline binary options into a bitmap ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 14:15:43 -07:00
Tom Eastep	407bc8f8db	More prerule fixes in expand_rule() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 12:57:23 -07:00
Tom Eastep	2743a411ae	Add a jump to DOCKER from OUTPUT ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 12:51:36 -07:00
Tom Eastep	1a23e840d7	Restore NotSyn rule in action.Reject ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 12:21:24 -07:00
Tom Eastep	bed747c20b	Restore NotSyn and RST logic using perl_action_tcp_helper() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 10:49:23 -07:00
Tom Eastep	c2fd48c4c6	Include pre-rule matches when the target is a chain ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 10:08:17 -07:00
Tom Eastep	054637880b	Cleanup of Standard Actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-13 10:06:02 -07:00
Tom Eastep	5f01bc75bd	Better fix for $current_param in the INLINE block of process_rule() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 18:28:27 -08:00
Tom Eastep	0e59b82503	Handle '+' in inline matches the mangle and masq files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 17:14:15 -08:00
Tom Eastep	33343aaf17	Modify TCP-specific actions to use + in inline_matches ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 17:01:52 -08:00
Tom Eastep	90ace544eb	Implement '+' to specify inline matches as "early" ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 16:39:46 -08:00
Tom Eastep	c36cee28fb	Save/Restore $current_param in process_inline() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 16:39:08 -08:00
Tom Eastep	df5f34951c	Correct actions ... - Restore the TCP-related actions - Correct typo in action.Drop Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 15:09:31 -08:00
Tom Eastep	ec2ebee0e6	Clear inline matches between calls to process_rule() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 15:08:47 -08:00
Tom Eastep	a50c52675b	Correct a comment ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 15:08:04 -08:00
Tom Eastep	bb7b3123df	Eliminate ?begin perl ... ?end Perl in many actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 12:15:07 -08:00
Tom Eastep	3960fa6e0e	Performance tweak to read_a_line() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-12 09:05:30 -08:00
Tom Eastep	a7fda02d88	Print lines copied into the generated script when tracing ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-11 15:59:49 -08:00
Tom Eastep	68a324c62c	Small tweaks to read_a_line() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-11 13:56:03 -08:00
Tom Eastep	d179615fca	'trace' and 'check -r' uses $PAGER ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-11 13:26:23 -08:00
Tom Eastep	6779c8307f	Optimize chain resolution in process_mangle_rule1() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-10 15:26:52 -08:00
Tom Eastep	147c7e284f	Fix a couple of Mangle Action blunders ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-10 13:59:29 -08:00
Tom Eastep	8d657775af	Fix 'check -r' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-10 13:41:59 -08:00
Tom Eastep	b14bf0e779	Remove unused globals from the Rules module ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-10 11:14:51 -08:00
Tom Eastep	dc286c472c	More tidying up of Mangle Actions ... - Delete an inadvertently-added blank line - Move $convert declaration back to the Tc module - Add comments in the Tc module about key moved declarations Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-09 15:51:54 -08:00
Tom Eastep	87f63b7160	Allow USE_DEFAULT_RT with NetworkManager ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-09 14:17:40 -08:00
Tom Eastep	617218f8ea	Merge branch '5.0.6'	2016-03-09 11:36:46 -08:00
Tom Eastep	09c3be0adb	Correct typo that cases restart failure. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-09 11:18:05 -08:00
Tom Eastep	ec9148637f	Inline mangle actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-09 10:28:02 -08:00
Tom Eastep	991d8d2d3f	Move convert_tos() back to the Tc module ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-08 11:17:14 -08:00
Tom Eastep	301bce5d34	Clean up mangle actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-08 09:27:43 -08:00
Tom Eastep	1add0487f6	Document Mangle Actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-07 14:56:20 -08:00
Tom Eastep	a4aa020a84	Add R chain designator ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-07 13:51:49 -08:00
Tom Eastep	81c16d2d67	More Mangle Action Changes ... - Move open_mangle_for_output() back to the Tc module - Eliminate global variables in process_mangle_rule1() - Allow creation of mangle action chains - Minor (but needed) logic changes Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-07 13:51:28 -08:00
Tom Eastep	bbbf54f7c3	Merge branch '5.0.6'	2016-03-07 08:59:17 -08:00
Tom Eastep	c37e41ee9c	Avoid duplicate route rules from 'disable' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-06 15:48:33 -08:00
Tom Eastep	ba6dc9c5c0	First cut at mangle actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-06 12:42:22 -08:00
Tom Eastep	89b2c2fb55	Move mangle processing into the Rules module ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-06 08:59:37 -08:00
Tom Eastep	d4e2508a90	Clarify USE_DEFAULT_RT ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-04 14:26:42 -08:00
Tom Eastep	2bb143b28c	Save/restore nat OUTPUT jump to DOCKER ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-04 12:21:45 -08:00
Tom Eastep	99f83da3ab	Avoid duplicate rules after reload ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-04 11:09:53 -08:00
Tom Eastep	89e3e959dc	Revert bad change ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-04 10:20:55 -08:00
Tom Eastep	9e41264671	Go back to generating docker0 rules when it is defined to Shorewall ... - Avoids issues after 'stop' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-04 09:27:47 -08:00
Tom Eastep	3fb715740d	Avoid duplicated code blocks in save_dynamic_chains() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-04 09:27:04 -08:00
Tom Eastep	ed6ff96aa0	Replace another $VARDIR instance ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-03 14:11:57 -08:00
Tom Eastep	18dac19d86	Remove dead code from save_dynamic_chains() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-03 14:09:55 -08:00
Tom Eastep	d5ea876e93	Replace $VARDIR with ${VARDIR} for consistency ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-03 11:54:14 -08:00
Tom Eastep	f7a6ad1412	Clean up formatting in define_firewall() and stop_firewall() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-03 09:24:43 -08:00
Tom Eastep	b279869629	Fix DOCKER issue ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-02 20:59:44 -08:00
Tom Eastep	62880bdf1b	Don't populate PAGER in the sample config files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-02 13:04:47 -08:00
Tom Eastep	c56ba534d6	Yet more PAGER fixes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-02 12:34:39 -08:00
Tom Eastep	90bc894200	More PAGER fixes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-02 08:58:26 -08:00
Tom Eastep	90d254f0c3	Add PAGER option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-02 08:32:49 -08:00
Tom Eastep	a95de8d092	Page the output of verbose commands ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-03-01 15:12:54 -08:00
Tom Eastep	68cce5ff73	Eliminate some sillyness in normalize_action() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-29 11:17:15 -08:00
Tom Eastep	8a02624f05	Update copyrights in the install and uninstall scripts ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-29 11:03:09 -08:00
Tom Eastep	1c1881859f	Delete untrue comment ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-29 08:45:47 -08:00
Tom Eastep	5b163e9bc2	Save/restore docker0 rules when it isn't defined to Shorewall ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-27 14:09:29 -08:00
Tom Eastep	71d64ab380	Add DOCKER network support ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-27 13:36:47 -08:00
Tom Eastep	36d8518562	Code compaction ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-26 13:13:56 -08:00
Tom Eastep	6c88eb6916	Add an ECN action to shorewall-mangle(8) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-26 09:33:16 -08:00
Tom Eastep	6e1cc0f1d0	Correct stop/start Docker handling ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-25 13:37:44 -08:00
Tom Eastep	ee5ef07035	Correct another silly typo -- this time in allowBcast() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-24 14:58:10 -08:00
Tom Eastep	3c8696b91d	Correct silly typo in setup_ecn() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-24 09:35:13 -08:00
Tom Eastep	fd4de0c66a	Create more compact DOCKER conditional rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-22 14:46:35 -08:00
Tom Eastep	49536562e2	Emit more compact code when conditionally adding DOCKER chains ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-22 13:49:22 -08:00
Tom Eastep	36b6863b02	Update copyright date on lib.core ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-22 13:48:48 -08:00
Tom Eastep	6a8e280483	Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code	2016-02-21 12:59:10 -08:00
Tom Eastep	63b501996e	Require ADDRTYPE for DOCKER=Yes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-21 12:26:39 -08:00
Tom Eastep	7a9e9ad945	Decommit DOCKER=Yes in IPv6. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-21 12:03:41 -08:00
Tom Eastep	f4312a38b9	Add all Docker rules in the stopped state ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-21 10:33:45 -08:00
Tom Eastep	fc6a1f6d0d	Don't create Docker chains/rules if Docker isn't running ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-21 09:54:37 -08:00
Tom Eastep	83b899b030	Save/Restore Docker-generated rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-20 14:02:54 -08:00
Tom Eastep	61f6cacc30	Infrastructure required by Docker ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-20 14:01:48 -08:00
Tom Eastep	caba1cd770	DOCKER=Yes requires IPTABLES_S ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-20 10:03:06 -08:00
Tom Eastep	4306ff1029	Correct 'save_dynamic_chains' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-20 09:57:11 -08:00
Tom Eastep	663f82c158	Move nat POSTROUTING rules to SHOREWALL if DOCKER=Yes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-20 09:24:06 -08:00
Tuomo Soini	b39639e1f2	macro.SNMPtrap: fix file name to use common naming ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-20 18:45:55 +02:00
Tom Eastep	e66d9f6547	Add DOCKER option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-19 17:42:54 -08:00
Tom Eastep	f33f333937	Make 'default' and 'none' case insensitive in the GATEWAY column ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-17 15:25:46 -08:00
Tom Eastep	5fc242f760	Use new column names in action.template ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-17 15:13:42 -08:00
Tom Eastep	94cfe54f92	Allow routing tables with no default route ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-17 11:49:09 -08:00
Tuomo Soini	32cd6eaa8a	macro.Web: remove duplicate "This macro" ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 21:12:57 +02:00
Tuomo Soini	4e4f54a6cd	macro.MDNS: fix header to show only one line in "shorewall show macros" ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 21:09:25 +02:00
Tuomo Soini	ea71679631	macro.JAP: fix comment text to work properly for "shorewall show macros" ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 21:06:40 +02:00
Tuomo Soini	5c7cba676b	macro.Mail: use new MSA macro ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 20:17:24 +02:00
Tuomo Soini	c78e7635c1	macro.Trcrt: Remove extra "." ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 20:16:14 +02:00
Tuomo Soini	74cb2bea83	macro.template: update header for better screen fit ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:36:24 +02:00
Tuomo Soini	2c966d90f1	macro.Tinc: update header ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:31:41 +02:00
Tuomo Soini	6e41bc7e88	Submission: use common format for header ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:28:12 +02:00
Tuomo Soini	a86f895ae6	macro.Zabbix: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	4bfa419d4d	macro.Xymon: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	c2e8659ba5	macro.Whois: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	b2fa421933	macro.Webmin: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	4ef0ebabbb	macro.Webcache: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	d1d0dac9ce	macro.Web: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	6535633fbb	macro.VRRP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	d2422a1dea	macro.VNCL: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	6dcb1e28b4	macro.VNC: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	f00f03eee3	macro.Trcrt: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	a351431c62	macro.Time: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	a9e354cec8	macro.TFTP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	aee6f9faa2	macro.Teredo: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	c285330f25	macro.template: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	bc57fedac4	macro.Telnets: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	ae7d78d75f	macro.Telnet: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:40 +02:00
Tuomo Soini	cdae111c8d	macro.Syslog: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	f36e204d4a	macro.SVN: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	078dfc38ee	macro.Submission: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	4f4ddd4809	macro.SSH: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	864659b96e	macro.Squid: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	687cd578eb	macro.SPAMD: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	d092044bdd	macro.SNMPTrap: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	d72f0a1f41	macro.SNMP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	11cf80ce98	macro.SMTPS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	48efde89cd	macro.SMTP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	26710e72a9	macro.SMBswat: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	f8d99a0f22	macro.SMBBI: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	316f07bce9	macro.SMB: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	73aa2c68eb	macro.SixXS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	c2b1a0ce04	macro.SIP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	3cec3ce6bc	macro.Sieve: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	a1a6352617	macro.SANE: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	a32c0c9901	macro.Rsync: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	38953df7fb	macro.RNDC: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	b960256fdb	macro.RIPbi: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	cfe2b89e2d	macro.Rfc1918: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	9d4eb3eccf	macro.Reject: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	8d13653fc2	macro.Redis: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	974e88c038	macro.RDP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	ff449953c6	macro.Rdate: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	e5818fb9d8	macro.Razor: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	29b30f29a0	macro.QUIC: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	feaadcd8f8	macro.Puppet: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	71681d1ccd	macro.Printer: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	c9161a3eb2	macro.PPtP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	2c2c4194ce	macro.PostgreSQL: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	5cda192731	macro.POP3S: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	9b6f8d2f0c	macro.POP3: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	c25ddcea40	macro.Ping: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	5667919b91	macro.PCA: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	4f340e7033	macro.OSPF: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	724f21202c	macro.OpenVPN: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	efa019a782	macro.NTPbrd: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	2612e012d6	macro.NTPbi: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	2420f24a62	macro.NTP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	688ba42a57	macro.NNTPS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	9bf7bb73f9	macro.NNTP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	897337acef	macro.MySQL: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	f447e5f3ce	macro.Munin: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	2208dc85c6	macro.MSSQL: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	bb558baf23	macro.MSNP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	f16a7d6224	macro.MongoDB: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	a4c88ee966	macro.mDNSbi: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	996b629029	macro.mDNS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	d732a8a040	macro.Mail: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	ce6532ebfb	macro.LDAPS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	a82e517d05	macro.LDAP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	ccd1f3b9d3	macro.L2TP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	9b45c81dc6	macro.Kerberos: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	d9907e93e8	macro.Jetdirect: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	6222ec1e1a	macro.JAP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	9b2bc4f53d	macro.JabberSecure: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	e99b23c154	macro.JabberPlain: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	3a9979fb3d	macro.Jabberd: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	4ed88eb4ad	macro.Jabber: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	d890a840d4	macro.IRC: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	8c9c96c8d7	macro.IPsecnat: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	0718bebf6f	macro.IPsecah: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	f7a9d7dc4d	macro.IPsec: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	9ce2df55d1	macro.IPPserver: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	42438c817a	macro.IPPbrd: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	e08079cc1b	macro.IPP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	e49494bbe4	macro.IPMI: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	5496eacfa7	macro.IPIP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	ce2cf9e9f6	macro.IMAPS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	4f36f96163	macro.IMAP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	db62969526	macro.ILO: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	89bf8332be	macro.ICQ: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	f516a07f08	macro.ICPV2: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	e4982e6919	macro.HTTPS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:39 +02:00
Tuomo Soini	4289d0a2c0	macro.HTTP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	696996c8de	macro.HKP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	336518e24b	macro.GRE: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	6a73b5bc87	macro.Goto-Meeting: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	536b5c4cfc	macro.Gnutella: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	3b039c0cf0	macro.GNUnet: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	77a1d03435	macro.Git: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	5985ab2f88	macro.FTP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	26d1896d81	macro.Finger: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	2622489f36	macro.Edonkey: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	a12225047c	macro.DropUPnP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	c0d1cbd4ca	macro.DropDNSrep: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	71df5b5042	macro.Drop: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	8bb0fd93df	macro.DNS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	934fa78228	macro.Distcc: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	a881d663be	macro.DHCPfwd: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	848cb5954d	macro.DCC: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	f09d93a5a6	macro.DAAP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	ff5c3eba5a	macro.CVS: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	3ac875a66c	macro.Citrix: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	af1d90368e	macro.BLACKLIST: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	5075e298dc	macro.BitTorrent32: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	231b12b520	macro.BitTorrent: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	016978eab5	macro.BGP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	2cea162713	macro.Auth: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	84caee9a3e	macro.AMQP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	6888195ce6	macro.Amanda: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	538600d389	macro.AllowICMPs: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	bc34b49905	macro.A_DropUPnP: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	e4a4fb25f1	macro.A_DropDNSrep: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	a883a0720c	macro.ActiveDir: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	4a3e168476	macro.A_AllowICMPs: update macro header and description ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:20:38 +02:00
Tuomo Soini	7b4c4fb30d	macro.MSA: Add as alias for Submission ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-15 18:19:11 +02:00
Tuomo Soini	daa016d2a3	Shorewall[6]/Makefile: remove extra restore, shorewall does that automatically ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-12 18:17:46 +02:00
Tuomo Soini	b57c02e0ed	shorewall/Makefile: fix logics so you get error from reload ... Signed-off-by: Tuomo Soini <tis@foobar.fi>	2016-02-12 12:19:25 +02:00
Tom Eastep	a219778aa3	Correct macro indentation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-09 18:20:12 -08:00
Tom Eastep	8ac0f96029	Delete blank line ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-09 18:20:00 -08:00
Tom Eastep	894a98f24e	Improve optimizer handling of origin during rule merge ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-04 12:00:05 -08:00
Tom Eastep	bd9e8142b9	Ensure that the chain origin is used when there is no rule origin ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-03 10:43:10 -08:00
Tom Eastep	916a392fb0	Improve chain-completion rule tracking ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-02-02 14:57:47 -08:00
Tom Eastep	28983a0194	Add comment describing the origin member of a rule ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-31 09:29:24 -08:00
Tom Eastep	2cd098ba31	Update heading versions and copyrights ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-28 13:46:34 -08:00
Tom Eastep	9188f7efa3	Don't export shortlineinfo2 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-28 13:38:26 -08:00
Tom Eastep	95a029316a	Improve get_keys*() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-28 12:51:23 -08:00
Tom Eastep	d4bea3d3ec	Optimize TRACK_RULES handling in the Chains module ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-28 11:38:48 -08:00
Tom Eastep	6085c6092f	Add origin comments to command-mode rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-28 10:58:09 -08:00
Tom Eastep	48df3d9627	Add origin member to the providers table ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-28 10:34:36 -08:00
Tom Eastep	94442abfcf	Correct check for duplicate interface in providers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-28 10:34:16 -08:00
Tom Eastep	86f2e23f33	Invoke add_irule_extended rather than a hack that predated that function ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-27 19:01:23 -08:00
Tom Eastep	6e9d5f45ec	Avoid spurious comment in jump to interface option chains. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-27 16:50:03 -08:00
Tom Eastep	039fd6ddd8	Move origin handling into log_[i]rule_limit ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-27 14:24:56 -08:00
Tom Eastep	57288086bf	Unify TRACK_RULES handling ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-27 12:55:21 -08:00
Tom Eastep	f999acda63	Eliminate shortlineinfo1() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-27 10:21:08 -08:00
Tom Eastep	b4723da07c	Eliminate $globals{TRACK_GLOBALS} ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-26 16:45:47 -08:00
Tom Eastep	3860a1dc72	Ensure that %origin is populated ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-26 16:31:04 -08:00
Tom Eastep	e756820ca1	Revert "Unify TRACK_RULES settings implementation" ... This reverts commit 866cb04cbb.	2016-01-26 11:49:26 -08:00
Tom Eastep	866cb04cbb	Unify TRACK_RULES settings implementation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-25 18:07:46 -08:00
Tom Eastep	6ef136a546	Add origin information for entries in shorewall[6].conf ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-25 15:49:18 -08:00
Tom Eastep	9b3b4579a2	Change TRACK_RULES setting from Internal to File ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-24 16:15:36 -08:00
Tom Eastep	3e404b765f	Make .ip[6]tables-restore-input comments conditional ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-23 17:04:52 -08:00
Tom Eastep	2235641c9f	Add origin to the ip[6]tables input. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-01-23 15:13:12 -08:00