5301 Commits

Author	SHA1	Message	Date
Tom Eastep	2545322163	Cleanup of read_a_line() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-09 16:00:26 -07:00
Tom Eastep	7b511f449f	Don't strip comments until after embedded Perl or Shell have been handled. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-09 15:12:13 -07:00
Tom Eastep	94097e2561	Add newlines to embedded multi-line shell and perl ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-08 12:17:00 -07:00
Tom Eastep	50405f57ba	Don't suppress whitespace in embedded Perl and Shell ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-08 07:54:03 -07:00
Tom Eastep	860141127a	Re-enable '#' in quoted strings within embedded shell and perl ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-08 07:30:46 -07:00
Tom Eastep	f8f599c1db	Restore progress message that was inadvertently deleted. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-07 09:34:32 -07:00
Tom Eastep	a2abad3f68	Modify getparams to use the installed shorewallrc file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-07 09:07:07 -07:00
Tom Eastep	c5f44d8737	Move read_a_line() prototype before first use. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-07 07:42:27 -07:00
Tom Eastep	25bca70ff2	Merge branch 'master' into 4.5.2	2012-04-07 07:39:14 -07:00
Tom Eastep	7204220991	Some more fixes to conditional inclusion. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-07 07:16:17 -07:00
Tom Eastep	97cc4930cf	Deimplement option leading ? in embedded directives ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-06 16:26:05 -07:00
Tom Eastep	5688dc77a3	Make ?BEGIN PERL end ?END PERL work. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-06 15:58:21 -07:00
Tom Eastep	9dd6f86c55	Use read_a_line() in the embedded_shell() and embedded_perl() functions. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-06 15:46:01 -07:00
Tom Eastep	53395e788d	Add a comment ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-06 11:49:59 -07:00
Tom Eastep	2de64d5820	Remove find_echo() from lib.core ... - Also correct a couple of typos in comments Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-06 08:01:07 -07:00
Tom Eastep	24e115d0f9	Move a comment ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-06 08:00:20 -07:00
Tom Eastep	29a820b2f2	Make handling of remote configuration data consistent. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-04 11:47:45 -07:00
Tom Eastep	bff3473279	Fix preceding commit -- it missed to cases of absolute pathnames. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-04 09:43:39 -07:00
Tom Eastep	319d07b1d3	Remove more absolute path names ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-04 09:24:48 -07:00
Tom Eastep	38b6dca223	Correct a number of issues with Shorewall-lite ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-04 07:08:02 -07:00
Tom Eastep	24d30275fa	Correct syntax errors in the generated script ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-03 17:08:14 -07:00
Tom Eastep	fb428bf564	Don't modify CONFDIR and SHAREDIR in the shell code ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-02 12:39:49 -07:00
Tom Eastep	348c99c7d0	Compiler changes for Shorewall[6]-lite relocation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-02 07:46:38 -07:00
Tom Eastep	a11e2dd452	Correct uninstall scripts ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-02 06:48:23 -07:00
Tom Eastep	85fce606dc	Give all config files access to shorewallrc variables. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-01 13:19:38 -07:00
Tom Eastep	bb6e17fd3e	Many changes involved in getting a relocated installations to work ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-04-01 10:47:24 -07:00
Tom Eastep	e48e13012c	Fix up lib.base during installation ... - Shorewall-core installer creates all necessary directories.	2012-04-01 08:16:07 -07:00
Tom Eastep	02a68aa436	Look for ./shorewallrc first ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-31 17:40:18 -07:00
Tom Eastep	766370e22a	More work on installers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-31 14:42:01 -07:00
Tom Eastep	75b57b926a	Revert "Replace lib.base with symbolic link" ... This reverts commit 98f4a1c545.	2012-03-31 12:57:38 -07:00
Tom Eastep	cf176474ac	Merge branch '4.5.2' ... Conflicts: Shorewall/Perl/Shorewall/Chains.pm	2012-03-31 09:44:36 -07:00
Tom Eastep	6ed207aba0	Fix 'dhcp' with 'nets' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-31 09:30:29 -07:00
Tom Eastep	924ec49d09	Add OWNER_NAME_MATCH to do_user ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-30 16:58:38 -07:00
Tom Eastep	a4097b7a02	Correct Typo in setup_null_routing() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-30 16:57:26 -07:00
Tom Eastep	e38fcb2bfc	Correct ipset creation and add a WARNING when creating an ipset ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-30 16:56:43 -07:00
Tom Eastep	c3b56d4123	Add BLACKLIST Macro ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-30 16:53:02 -07:00
Tom Eastep	fead683f18	Modify init scripts if ${SHAREDIR} is non-standard ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-30 16:21:37 -07:00
Tom Eastep	98f4a1c545	Replace lib.base with symbolic link ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-30 15:30:04 -07:00
Tom Eastep	f5414d0fd1	Create ${SYSTEMD} if needed. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-30 13:56:59 -07:00
Tom Eastep	15335f8615	Modify CLIs and libs to know where shorewallrc is. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-30 12:02:25 -07:00
Tom Eastep	0d19c99699	Correct default setting of CONFDIR when .shorewallrc is not found ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-28 06:28:53 -07:00
Tom Eastep	c2fa5ae78f	Correct typo in install.sh files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-27 20:19:06 -07:00
Tom Eastep	e1e4855211	Rename USR to PREFIX ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-27 07:47:22 -07:00
Tom Eastep	e09457cdf9	Correct Typo in setup_null_routing() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-27 07:46:53 -07:00
Tom Eastep	f2311f1987	Update install scripts to look for .shorewallrc in many places ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-26 17:01:55 -07:00
Tom Eastep	b31f656d63	Update uninstall scripts for multiple .shorewallrc locations. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-26 16:19:40 -07:00
Tom Eastep	e641bf7ac2	Correct typo ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-26 16:01:35 -07:00
Tom Eastep	8a164adf98	Export TMPDIR if it exists in the .shorewallrc file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-26 15:43:04 -07:00
Tom Eastep	7b9c1d43cd	Look in additional places for .shorewallrc ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-26 15:00:43 -07:00
Tom Eastep	fd82877312	Another fix for init.sh ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-26 07:49:49 -07:00
Tom Eastep	2518c653af	Modify RedHat/Fedora init scripts for shorewallrc. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-26 07:20:31 -07:00
Tom Eastep	c23deed3a7	Correct syntax error in init.sh ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-26 07:04:21 -07:00
Tom Eastep	dee20c8d74	Add OWNER_NAME_MATCH to do_user ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-25 20:18:20 -07:00
Tom Eastep	ee15baf98c	Correct typo in Chains.pm ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-25 12:48:57 -07:00
Tom Eastep	25e7555e80	Correct typo in the compiler	2012-03-25 12:36:25 -07:00
Tom Eastep	9dd9ee614b	Correct ipset creation and add a WARNING when creating an ipset ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-25 08:27:28 -07:00
Tom Eastep	8a18dac870	Installer tweaks ... - Give instructions when Shorewall-core installer finds no rc file - Update help Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-25 07:49:52 -07:00
Tom Eastep	5aed14ffdc	Set PRODUCT before processing rc file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-25 07:25:15 -07:00
Tom Eastep	59aab485c3	Handle 'PRODUCT' more gracefully ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-24 22:21:42 -07:00
Tom Eastep	173d29969d	Improve shorewallrc variable expansion ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-24 21:34:24 -07:00
Tom Eastep	7390789b5e	Add BLACKLIST Macro ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-24 21:33:57 -07:00
Tom Eastep	fc4aaa97c6	Expand variables in shorewallrc ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-24 21:26:20 -07:00
Tom Eastep	217d5e636c	Add BLACKLIST Macro ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-24 19:29:27 -07:00
Tom Eastep	eb118e4443	Add shorewallrc files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-24 13:05:39 -07:00
Tom Eastep	f4ed4109c6	Fix LENGTH handling (again) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-23 15:40:48 -07:00
Tom Eastep	398c843643	Concatenate match options when not KLUDGEFREE ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-23 15:40:25 -07:00
Tom Eastep	01d07f55a9	Only include user exit basename in exported progress messages ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-20 07:33:32 -07:00
Tom Eastep	a7b10c99da	Add some comments to lib.core ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-20 07:17:19 -07:00
Tom Eastep	bdc8cb66bd	Correct load_kernel_modules() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-20 07:15:47 -07:00
Tom Eastep	7bc823fb8b	Support 'kerneltz' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 15:57:38 -07:00
Tom Eastep	48b7594b64	Delete prog.header* ... - Move functions into lib.core with ?IF ... ?ELSE ... ?END Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 15:56:02 -07:00
Tom Eastep	88b1180817	Support ?IF in copied files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 13:38:24 -07:00
Tom Eastep	8803cd8d3b	?IF improvements ... - Pass line number to make process_conditional more general - Add debugging output - Do first_line processing prior to looking for ? Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 12:51:22 -07:00
Tom Eastep	0063de1564	Add capabilities to conditionals ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 11:57:33 -07:00
Tom Eastep	f104596b39	Merge branch '4.5.1'	2012-03-19 10:13:08 -07:00
Tom Eastep	146d66f0aa	Don't complain about SHOREWALL_INIT_SCRIPT ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 09:52:55 -07:00
Tom Eastep	0ccb398cec	Merge branch '4.5.1'	2012-03-19 09:22:44 -07:00
Tom Eastep	287a44be52	Allow TOS to work on RHEL5 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 09:22:21 -07:00
Tom Eastep	86f3667b82	Correct nested ?IF ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 08:19:32 -07:00
Tom Eastep	962b1cca1f	Remove Perl diagnostic ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 07:46:45 -07:00
Tom Eastep	2026fdab6a	Correct IPSET_WARNINGS ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 07:44:52 -07:00
Tom Eastep	722e888043	Fix ?IF ... - Allow nested ?IFs to work correctly - Correct push logic for $ifstack Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 07:38:52 -07:00
Tom Eastep	e3997abfb9	Merge branch '4.5.2' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-19 07:27:53 -07:00
Tom Eastep	710687bbd6	Revert "Move conditional processing to it's own function" ... This reverts commit 8262cff71a.	2012-03-19 07:23:57 -07:00
Tom Eastep	d4a1e7dba9	Revert "Allow ?IF, ?ELSE and ?ENDIF in copied files" ... This reverts commit 29dd342118.	2012-03-19 07:23:24 -07:00
Tom Eastep	c7237e5c8e	Revert "Move all functions from prog.header* to lib.core" ... This reverts commit f9f557e1c6.	2012-03-19 07:22:51 -07:00
Tom Eastep	c299c6d61a	Revert "Correct spelling" ... This reverts commit 1d021e3701.	2012-03-19 07:22:29 -07:00
Tom Eastep	6769acc7a7	Revert "Some corrections to conditional inclusion" ... This reverts commit 164d2f5d1b.	2012-03-19 07:22:07 -07:00
Tom Eastep	df33587395	Revert "Clean up of conditional inclusion." ... This reverts commit 5f3ba4eb40.	2012-03-19 07:21:36 -07:00
Tom Eastep	508f33a183	Revert "Eliminate prog.header6" ... This reverts commit 60f1004339.	2012-03-19 07:21:12 -07:00
Tom Eastep	11f970d1c2	Revert "Eliminate prog.header" ... This reverts commit 13bf383ce8.	2012-03-19 07:20:57 -07:00
Tom Eastep	72e6330ff4	Revert "Add capabilities to ?IF conditionals" ... This reverts commit 0d71c590e4.	2012-03-19 07:20:31 -07:00
Tom Eastep	5caf68bc31	Remove .project ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 19:31:40 -07:00
Tom Eastep	78306e9f5b	Don't issue missing SHOREWALL_SHELL warning when compiling for export ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 19:30:32 -07:00
Tom Eastep	15ca0fd1f0	Add IPSET_WARNINGS option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 19:30:04 -07:00
Tom Eastep	955a9f0051	Correct Steven's issues ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 19:10:46 -07:00
Tom Eastep	bd56caf74f	Don't issue missing SHOREWALL_SHELL warning when compiling for export ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 12:54:53 -07:00
Tom Eastep	5bfd2cc2c9	Remove some WARNINGs ... - Mr Dash4 has decided he doesn't want them after all.	2012-03-18 12:42:32 -07:00
Tom Eastep	e47ae4f26e	Don't issue missing SHOREWALL_SHELL warning when compiling for export ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 12:28:26 -07:00
Tom Eastep	56f66bd966	Require the correct PROTO to use a port range in the ADDRESS column of masq ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 11:22:37 -07:00
Tom Eastep	6e089fb0e2	Require the correct PROTO to use a port range in the ADDRESS column of masq ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 11:21:53 -07:00
Tom Eastep	0d71c590e4	Add capabilities to ?IF conditionals ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-18 08:48:26 -07:00
Tom Eastep	d1661c95d5	Remove .project ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 18:29:32 -07:00
Tom Eastep	13bf383ce8	Eliminate prog.header ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 18:07:36 -07:00
Tom Eastep	60f1004339	Eliminate prog.header6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 17:51:56 -07:00
Tom Eastep	5f3ba4eb40	Clean up of conditional inclusion. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 12:12:32 -07:00
Tom Eastep	164d2f5d1b	Some corrections to conditional inclusion ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 10:26:36 -07:00
Tom Eastep	1d021e3701	Correct spelling ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 09:42:15 -07:00
Tom Eastep	f9f557e1c6	Move all functions from prog.header* to lib.core ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 09:35:35 -07:00
Tom Eastep	29dd342118	Allow ?IF, ?ELSE and ?ENDIF in copied files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 09:33:40 -07:00
Tom Eastep	8262cff71a	Move conditional processing to it's own function ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-17 09:32:56 -07:00
Tom Eastep	b7465262ca	Rename MARK/CLASSIFY column to ACTION ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-16 10:09:13 -07:00
Tom Eastep	ab13fbe95e	Allow conditional compilation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-16 08:16:12 -07:00
Tom Eastep	f7a2cd4ef1	Correct typos in accounting manpages. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-14 15:34:19 -07:00
Tom Eastep	95e4f8dd91	Fix TOS(tos/mask) in tcrules. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-14 15:34:11 -07:00
Tom Eastep	8e413a7bf0	Fix TOS(tos/mask) in tcrules. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-14 15:33:31 -07:00
Tom Eastep	3e9edcb7e8	Correct typos in accounting manpages. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-14 14:50:25 -07:00
Tom Eastep	4ba88d2e9c	Merge branch '4.5.1'	2012-03-14 11:00:56 -07:00
Tom Eastep	aa503e7211	Apply Tuomo Soini's Makefile patch ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-14 10:57:41 -07:00
Tom Eastep	2a67a202b0	Merge branch '4.5.1'	2012-03-13 20:16:01 -07:00
Tom Eastep	7e14777b8f	Fix typo ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-13 19:54:58 -07:00
Tom Eastep	c1d0681e17	Correct LENGTH column validation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-13 17:58:18 -07:00
Tom Eastep	98f8edbde5	Apply two patches from Tuomo Soini ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-13 13:27:20 -07:00
Tom Eastep	1dd6a8b291	Document use of chain designators with DSCP and TOS ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-13 13:26:29 -07:00
Tom Eastep	feb5cc0093	Document use of chain designators with DSCP and TOS ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-13 13:25:37 -07:00
Tom Eastep	e3f2c49c7e	Remove level of indirection for the 'super' property ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-13 12:23:33 -07:00
Tom Eastep	fecd091078	Remove %zones{option}{nested} ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-13 11:31:13 -07:00
Tom Eastep	e0b360513c	Remove a level of indirection for 'complex' zone flag. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-13 09:47:31 -07:00
Tom Eastep	01d99d4873	Move zone mss handling to the Rules File ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-12 15:59:35 -07:00
Tom Eastep	acb2e2a8ab	Implement mss= in hosts file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-12 15:14:35 -07:00
Tom Eastep	0223439e2b	Don't compile if ${DESTDIR} ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-12 14:02:44 -07:00
Tom Eastep	fa9f8329b5	Apply two patches from Tuomo Soini ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-12 13:57:37 -07:00
Tom Eastep	4ffcd80b02	Don't test compilation if $DESTDIR ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-11 09:49:26 -07:00
Tom Eastep	48570227ba	Big cleanup of TOS handling ... - Validate settings/matches - Allow setting in the tcrules file. - Deprecate /etc/shorewall[6]/tos	2012-03-09 16:16:25 -08:00
Tom Eastep	c112f20e17	Tighten editing of LENGTH column(s) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-07 14:07:04 -08:00
Tom Eastep	05f025e422	Don't install isusable script by default ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-07 07:46:53 -08:00
Tom Eastep	3ee9150deb	Fix syntax error in the generated script ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-06 09:15:34 -08:00
Tom Eastep	b2842ae8d4	Don't allow reserved variables to be set in params ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-05 15:42:53 -08:00
Tom Eastep	dff5136134	Correct issues with debugging the generated script ... a) Rename DEBUG to g_debug_iptablesb b) Clear all of the tables prior to handling iptables-restore input.	2012-03-05 15:21:10 -08:00
Tom Eastep	a84e131115	Fix bug in DSCP implementation. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-03-05 09:50:15 -08:00
Tom Eastep	aab6e67e70	Omit non-default geometry settings from updated shorewall.conf. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-29 12:34:06 -08:00
Tom Eastep	61bf2d5bfd	Fix installer ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-25 16:02:20 -08:00
Tom Eastep	016fe4bcf1	Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall ... Conflicts: Shorewall-core/install.sh Shorewall/install.sh Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-25 07:30:07 -08:00
Roberto C. Sanchez	87381a0f65	FIx typos	2012-02-24 23:02:30 -05:00
Tom Eastep	47453a20f7	Tweak to Run-time gateway variables ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-24 09:02:04 -08:00
Tom Eastep	b78d4ca41f	Correct typo ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-23 13:54:50 -08:00
Tom Eastep	7273f4d8d4	Implement run-time gateway variables. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-23 13:36:00 -08:00
Tom Eastep	37a3dbb6f6	Don't install SysV init script if systemd is specified. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-23 10:59:10 -08:00
Tom Eastep	c252005e25	Add support for packager's config file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-23 10:07:02 -08:00
Tom Eastep	c975cddfda	Correct init script installation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-22 14:51:41 -08:00
Tom Eastep	a6afac0f3c	Use standard rpm macros ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-22 13:32:10 -08:00
Tom Eastep	ef850e4537	Use standard rpm macros ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-22 12:40:16 -08:00
Tom Eastep	2624005fa8	Fix FORMAT-2 interfaces ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-21 16:41:56 -08:00
Tom Eastep	20f990f2eb	Fix install on SuSE ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-21 14:24:50 -08:00
Tom Eastep	7de961ebfe	Fix broken init scripts. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-21 13:16:12 -08:00
Tom Eastep	f6cc44eb6b	Rename HOST -> TARGET and BUILD -> HOST ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-21 13:00:09 -08:00
Tom Eastep	3acd01a44d	Rename some variables: ... HOST -> TARGET %initdir -> %shorewall_initdir Also add %shorewall_target Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-21 12:34:41 -08:00
Tom Eastep	d5af9c360d	Implement FORMAT-2 interfaces file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-21 11:23:58 -08:00
Tom Eastep	2137840fec	Fix bug in DSCP support ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-20 16:40:11 -08:00
Tom Eastep	ed9e03b095	Correct FEDORA/REDHAT fiasco ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-20 16:11:28 -08:00
Tom Eastep	3180e13719	Require LIBEXEC and LIBPERL to be absolute path names ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-20 12:04:00 -08:00
Tom Eastep	9869b4c068	Rename environmental variables: ... INSTALLSYS => BUILD TARGET => HOST Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-20 10:12:52 -08:00
Tom Eastep	8c981e0464	Cleanup of install scripts based on feedback from Mr. Dash4 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-20 10:08:42 -08:00
Tom Eastep	a1ec1dc178	Add DSCP match support ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-20 08:47:48 -08:00
Tom Eastep	e2f4af6e48	Create a Perl-style switch statement to handle irregular entries in ... the tcrules file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-19 17:28:49 -08:00
Tom Eastep	b1272e8835	Add DSCP target support. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-19 17:04:16 -08:00
Tom Eastep	75d5957020	Unify 'dont_' chain flags ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-19 14:20:09 -08:00
Tom Eastep	1896e56894	Rework some newbie code in add_group_to_zone() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-19 08:39:17 -08:00
Tom Eastep	7cd7f1ebbe	Make zone-option hashes and constants global ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-19 08:30:39 -08:00
Tom Eastep	7fef97d92d	Fix compiler crash from unknown interface ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-18 10:02:39 -08:00
Tom Eastep	cd3a9854f8	Change ipset flags error to a warning ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-18 08:22:16 -08:00
Tom Eastep	f8057fed88	Correct typo in the modified install scripts. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-18 08:21:50 -08:00
Tom Eastep	6d13069ffb	Correct usage text for 'update'. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-18 08:17:52 -08:00
Tom Eastep	59fea1a05d	Add a SWITCH column to /etc/shorewall/masq ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-18 08:17:14 -08:00
Tom Eastep	1c7476fe61	Validate SOURCE/DEST fit for ipset flags ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-17 15:46:28 -08:00
Tom Eastep	58f0425d4a	Correct a typo in the blrules manpages ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-17 15:33:45 -08:00
Tom Eastep	ee7ea4adb9	Unify the supported install script os/distro set. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-17 15:26:02 -08:00
Tom Eastep	8a3f1f7111	Merge branch '4.5.0'	2012-02-17 13:39:22 -08:00
Tom Eastep	33b0821f8d	Separate install system from target system in the install.sh scripts ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-17 13:22:06 -08:00
Tom Eastep	29fcb9b08f	Apply Simon Mater's patch for LIBEXEC/PERLLIB ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-13 12:57:07 -08:00
Tom Eastep	460efbac77	Merge branch '4.5.0'	2012-02-11 11:36:38 -08:00
Tom Eastep	09078cf6ad	Add comments to add_interface_options() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-07 14:20:11 -08:00
Tom Eastep	f5c09a9e2e	Restore 'update -b' functionality ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-07 07:40:35 -08:00
Tom Eastep	f4be778b86	Restore 'update -b' functionality ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-07 07:38:07 -08:00
Tom Eastep	bd959884cc	Don't require a MARK value on the default class. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-06 14:40:22 -08:00
Tom Eastep	a87a981a2e	Merge branch '4.5.0'	2012-02-05 13:19:54 -08:00
Tom Eastep	e8875ae50b	Sort emitted param settings in export_params() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-05 10:03:47 -08:00
Tom Eastep	8561bb77ee	Delete the BLACKLIST entry in %sections	2012-02-05 09:40:02 -08:00
Tom Eastep	b462503527	Merge branch '4.5.0'	2012-02-05 07:26:39 -08:00
Tom Eastep	7887def6ad	Move manpages directories to their respective product directories ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-05 07:09:27 -08:00
Tom Eastep	6cf7a98eeb	Move Samples into the corresponding product directory ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-04 17:18:55 -08:00
Tom Eastep	6fb45b159d	Merge branch '4.5.0'	2012-02-04 10:52:52 -08:00
Tom Eastep	0b0ab57b66	Correct mask generation in get_routed_networks() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-04 10:30:34 -08:00
Tom Eastep	a25075d3c5	Minor cleanup of Rules file ... - Correct comments - Delete stale comments - Simplify a statement in process_rules1() Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-03 10:34:53 -08:00
Tom Eastep	63aaeb37c4	Remove redundant prototype. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-03 10:34:37 -08:00
Tom Eastep	99e0a340b1	Cosmetic changes to Zones.pm source ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-03 10:34:30 -08:00
Tom Eastep	b5e3a41e13	Remove redundant logic ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-03 10:34:20 -08:00
Tom Eastep	5c30c236a3	Minor cleanup of Rules file ... - Correct comments - Delete stale comments - Simplify a statement in process_rules1() Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-03 09:53:43 -08:00
Tom Eastep	cdf284a4ee	Remove redundant prototype. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-03 09:06:20 -08:00
Tom Eastep	57d1b29d1e	Cosmetic changes to Zones.pm source ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-03 07:29:13 -08:00
Tom Eastep	25031c3a42	Remove redundant logic ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-03 07:21:28 -08:00
Tom Eastep	0c1beb50ae	Add 'IMQ Target' capability to tcrules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-02 12:54:00 -08:00
Tom Eastep	ab04a7fb46	Fix comments -- reflect changes done during the irule implementation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-01 13:53:12 -08:00
Tom Eastep	45a1f9df4f	Streamline exclusion of the %vserver% pseudo-interface. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-02-01 10:25:26 -08:00
Tom Eastep	3f42b6d76f	Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall	2012-01-25 20:41:50 -08:00
Tom Eastep	df3bded324	Simply getparams as a result of the new lib.cli variable-setting ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-25 20:41:08 -08:00
Tom Eastep	7cd05fd874	Correct routing commands in proxy NDP ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-21 19:58:47 -08:00
Tom Eastep	aeac7cacb0	Make shorewall-init work again. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-20 09:10:13 -08:00
Tom Eastep	7d1bb30175	Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall	2012-01-17 13:12:01 -08:00
Tom Eastep	d1c162e2e8	Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall	2012-01-17 13:02:49 -08:00
Tom Eastep	fc5f439b4b	Generate prio 999 rule when USE_DEFAULT_RT=Yes, even when there are no balance providers. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-17 13:00:34 -08:00
Tom Eastep	ed3a623184	Cosmetic and maintainability improvements: ... 1. Export optimization masks from Shorewall::Chains for use in Shorewall::Compiler. 2. Move capability reporting and checkint from Shorewall::Compiler to Shorewall::Config. 3. Eliminate some gratuitous black lines. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-17 07:24:12 -08:00
Tom Eastep	3120bb37d1	Reload load distribution chains during 'refresh' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-16 10:07:18 -08:00
Tom Eastep	25d45dedfc	Add STARTOPTIONS and RESTARTOPTIONS ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-16 10:03:13 -08:00
Tom Eastep	41e68b59dc	Add STARTOPTIONS and RESTARTOPTIONS ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-15 20:35:55 -08:00
Tom Eastep	58bf562747	Generate load rules at runtime rather than at compile time. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-15 19:23:44 -08:00
Tom Eastep	364420c4eb	Don't derive base in load_chain() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-15 07:54:30 -08:00
Tom Eastep	b0f7c08844	Save load and status of each interface. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-14 17:43:25 -08:00
Tom Eastep	93bd0b59a8	Load lib.base from lib.cli ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-14 14:17:06 -08:00
Tom Eastep	7316a2c51a	Implement 'load=<load-factor>' in providers file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-13 16:37:05 -08:00
Tom Eastep	531474592c	Correct handling of '-p' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-13 15:42:20 -08:00
Tom Eastep	3920cef17e	Update copyright on Shorewall::Providers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-12 07:14:04 -08:00
Tom Eastep	ec8491caf8	Issue a warning message when both 'route_rules' and 'rtrules' exist. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-12 07:10:16 -08:00
Tom Eastep	057ea718cd	Remove 'stat' provider option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-12 07:09:53 -08:00
Tom Eastep	58a0b9b5c1	Rename route_rules to rtrules -- phase 2 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-09 07:19:10 -08:00
Tom Eastep	4c2df6fea7	Rename route_rules to rtrules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-09 06:38:55 -08:00
Tom Eastep	048d380c28	Issue warning if there is a deprecated option setting in the .conf file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-07 19:58:45 -08:00
Tom Eastep	ce73bb3d22	Unify prog.footer and prog.footer6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-07 13:53:41 -08:00
Tom Eastep	6f5ab698b4	Add a PROBABILITY column to the tcrules file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-06 12:54:37 -08:00
Tom Eastep	c4768d4a4a	Allow run-time address variable in the SOURCE column of route_rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-06 11:59:22 -08:00
Tom Eastep	afbc561b91	Shorewall install shouldn't remove /usr/share/shorewall/wait4ifup ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-06 11:40:04 -08:00
Tom Eastep	f003c0644b	Fix MARK_IN_FORWARD_CHAIN=Yes with fw source ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-06 09:26:43 -08:00
Tom Eastep	5ddb197680	Make '0' equivalent to '-' in the IN_BANDWIDTH column ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-06 09:14:07 -08:00
Tom Eastep	cda4c6ed11	Implement 'stat' provider option -- phase 1 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-05 16:49:26 -08:00
Tom Eastep	252bba215e	Move lib.core from Shorewall-core to Shorewall ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-05 11:30:36 -08:00
Tom Eastep	46d8adcfe9	Add STATISTIC_MATCH capability ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-04 15:46:01 -08:00
Tom Eastep	9251eca31a	Don't delete lib.common and lib.cli when installing Shorewall ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-04 10:32:17 -08:00
Tom Eastep	9353788285	Correct uninstall scripts for Shorewall and Shorewall6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-04 08:07:27 -08:00
Tom Eastep	e545bf4f04	Unify install files between Shorewall and Shorewall6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-03 16:35:41 -08:00
Tom Eastep	84dc26b82c	Create lib.core ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-03 13:06:00 -08:00
Tom Eastep	7d756f51ac	More unification of prog.header and prog.header6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-03 08:39:18 -08:00
Tom Eastep	4216d80c12	Allow Provider name in 'disable' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-02 15:25:43 -08:00
Tom Eastep	018ba394e3	Move common code from prog.header[6] to lib.common	2012-01-02 14:13:19 -08:00
Tom Eastep	a39f4699dc	Update versions and copyrights ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-02 07:43:13 -08:00
Tom Eastep	48a59e032e	Add Shorewall-common ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-01 20:30:09 -08:00
Tom Eastep	72699a6af6	4.4.28->4.5.0 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-01-01 07:36:46 -08:00
Tom Eastep	288c7b06dc	Place sfilter jumps in the option chains ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-31 14:47:36 -08:00
Tom Eastep	4b8fb130ba	Update copyright dates. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-31 14:15:25 -08:00
Tom Eastep	c2293f3d64	Eliminate the $blrules global in Shorewall::Rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-31 13:16:04 -08:00
Tom Eastep	d6bac484dc	Allow the timeout to be specified in that 'safe' commands. ... Also, allow a suffix (s, m or h) in the <timeout> paramater to the 'try' command. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-31 09:40:36 -08:00
Tom Eastep	64d3ac036b	Disable BLACKLIST section	2011-12-30 20:25:54 -08:00
Tom Eastep	28f27c65aa	Use SHA1 to shorten digests. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-30 14:58:49 -08:00
Tom Eastep	4d9a43a4dd	Delete some 'dont_move' flags ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-30 11:31:08 -08:00
Tom Eastep	1d9a4c58e9	Cosmetic change with comments. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-30 10:59:23 -08:00
Tom Eastep	6f61293b08	Reduce the size of many configs by not copying long chains multiple times. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-30 10:27:58 -08:00
Tom Eastep	b63c7e0016	A bit of optimization in add_interface_options() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-30 08:08:28 -08:00
Tom Eastep	6bed5e5e55	Merge branch '4.4.27' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-30 07:28:14 -08:00
Tom Eastep	5b2f960db3	Disallow :P in CLASSIFY rules and complain if :F is used when the SOURCE or DEST is $FW. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-30 07:22:14 -08:00
Tom Eastep	1da7f52ed5	Copy output interface options rather than jump ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-29 18:49:47 -08:00
Tom Eastep	39f214208a	Fix silly bug in the new option chain implementation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-29 17:57:39 -08:00
Tom Eastep	6926bcdbb9	More refinements of the option chain stuff. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-29 14:52:07 -08:00
Tom Eastep	f9960a0c94	Restore blacklst and blackout chains ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-29 13:45:35 -08:00
Tom Eastep	2c441b5393	Copy option rules into interface chains if no blacklist ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-29 09:32:16 -08:00
Tom Eastep	bddfb4f41c	Add output option chains ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-29 08:22:00 -08:00
Tom Eastep	03610181fd	Disallow :P in CLASSIFY rules and complain if :F is used when the SOURCE or DEST is $FW. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-29 07:49:53 -08:00
Tom Eastep	3ca9577f04	Cruft removal ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-28 16:22:11 -08:00
Tom Eastep	8cdc83638e	Don't allow PREROUTING CLASSIFY rules. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-28 14:07:12 -08:00
Tom Eastep	a98c85cbc4	Make 'audit' work on a converted blacklist file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-28 10:30:24 -08:00
Tom Eastep	eda918215d	Option chain phase II implementation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-28 10:29:15 -08:00
Tom Eastep	0518def9cf	Merge branch '4.4.27'	2011-12-28 09:58:19 -08:00
Tom Eastep	09f58512be	Make 'audit' work on a converted blacklist file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-28 09:34:34 -08:00
Tom Eastep	eff447ac11	Phase one option chain implementation. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-27 18:12:58 -08:00
Tom Eastep	53451bdaa6	Remove BLACKLIST section from rules files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-27 15:32:49 -08:00
Tom Eastep	ea9c59a297	Add an interface filter chain for each interface. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-27 13:52:44 -08:00
Tom Eastep	49eb84b9e2	Remove more helper/proto silliness ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-27 13:06:37 -08:00
Tom Eastep	8a8214704e	Centralize checking for required proto with helper ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-27 13:04:19 -08:00
Tom Eastep	aa743f2886	Merge branch '4.4.27'	2011-12-27 13:02:08 -08:00
Tom Eastep	c5868ef6e4	Revert "Remove redundant check." ... This reverts commit 53dd13cf15.	2011-12-27 13:01:27 -08:00
Tom Eastep	7721644209	Merge branch '4.4.27' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.4.27 ... Conflicts: Shorewall/Perl/Shorewall/Chains.pm Shorewall/Perl/Shorewall/Raw.pm	2011-12-27 12:32:13 -08:00
Tom Eastep	1c2ab238a5	Merge branch '4.4.27' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.4.27 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-26 13:22:30 -08:00
Tom Eastep	3541767881	Don't croak when adding gateway route fails for IPv6. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-26 11:58:06 -08:00
Tom Eastep	53dd13cf15	Remove redundant check. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-26 11:57:34 -08:00
Tom Eastep	6db8748ee8	Don't show IPv6 cached routes unless asked. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-26 11:57:18 -08:00
Tom Eastep	5520a6d31d	Validate helper<->protocol ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-24 09:24:01 -08:00
Tom Eastep	be4cb9d26a	Validate helper<->protocol ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-23 17:55:13 -08:00
Tom Eastep	97354c8ce8	Detect CT_TARGET when LOAD_HELPERS_ONLY=No ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-23 11:59:51 -08:00
Tom Eastep	e8c7ec38dc	Allow netstat output to appear in dumps on Fedora ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-23 11:59:19 -08:00
Tom Eastep	b58ad8e758	Be sure to delete fooX chain on errors in determine_capabilities() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-23 10:55:08 -08:00
Tom Eastep	0e3ad6ff91	Omit the chain designator from an error message ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-23 07:51:12 -08:00
Tom Eastep	1c535ee0f9	Correct handling of a chain designator in CLASSIFY rules. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-23 07:44:16 -08:00
Tom Eastep	3081ab1da1	Correct RELATED_DISPOSITION error message ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-22 15:51:50 -08:00
Tom Eastep	ce735e9415	Allow a chain designator in CLASSIFY rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-22 15:41:16 -08:00
Tom Eastep	e93dbdcb99	Stop generation of superfluous routing rules. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-21 08:01:25 -08:00
Tom Eastep	ea8efd1c44	Correct 'show ipa' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-21 07:25:20 -08:00
Tom Eastep	c03fe0a076	Implement USE_LOGICAL_NAMES. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-20 16:03:56 -08:00
Tom Eastep	3e72442954	Convert sample notrack files to FORMAT 2 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-20 14:38:44 -08:00
Tom Eastep	0d4a6c1c28	Replace SHOREWALL_DIR with g_shorewalldir ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-20 08:19:57 -08:00
Tom Eastep	74cee48bc0	Change /sbin/shorewall6 back into a file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-19 15:52:42 -08:00
Tom Eastep	075d7ca68b	Rename $nolock to $g_nolock ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-19 06:29:05 -08:00
Tom Eastep	6b90c09c04	Correct 'show raw' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-18 15:11:56 -08:00
Tom Eastep	1c8f6d3856	Eliminate a variable ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-18 15:05:03 -08:00
Tom Eastep	c00068e08d	Another correction to the 'CT' target ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-18 07:21:32 -08:00
Tom Eastep	a80b46be81	Allow a port number to be appended to a helper name ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-17 17:08:24 -08:00
Tom Eastep	ec848ebc01	Parenthesize qa/.../ in embedded Perl ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-17 10:09:23 -08:00
Tom Eastep	ba5db8753e	Fix CT helpers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-17 08:59:27 -08:00
Tom Eastep	9d66f34932	Allow config options to be used as shell variables ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-15 12:52:22 -08:00
Tom Eastep	10d10b1c16	Remove a redundant capability test ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-15 12:52:06 -08:00
Tom Eastep	6194eceaa4	Restore text of 'Provider "..." compiled' message ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-15 12:51:39 -08:00
Tom Eastep	8ac5f6c086	use specified tool for capabilities detection	2011-12-11 16:28:40 -08:00
Tom Eastep	cc78073ce7	Merge lib.cli-lite into lib.cli ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-11 13:15:30 -08:00
Tom Eastep	4cf564e7c9	Move startup_error() to lib.cli, plus cosmetic changes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-08 22:00:48 -08:00
Tom Eastep	eec8a4edaf	Cosmetic cleanup ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-07 13:04:20 -08:00
Tom Eastep	eaad3d836c	Correct library name in header comments ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-06 19:05:55 -08:00
Tom Eastep	2142baca4f	Avoid inappropriate RELATED,ESTABLISHED rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-06 19:04:43 -08:00
Tom Eastep	645e8dfea0	Straighten out LITEDIR ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-06 15:39:18 -08:00
Tom Eastep	004d0bcc38	Allow rules in the RELATED section when there are non-default settions of ... the new RELATED_* options. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-06 13:38:11 -08:00
Tom Eastep	43913915f9	Combine the CLIs into a single 'shorewall' file. ... Add lib.cli-lite and lib.cli-std to contain the functions that are different between the full products and the lite ones. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-06 12:54:51 -08:00
Tom Eastep	c724e238e6	Move the bulk of command processing to lib.cli ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-06 07:47:34 -08:00
Tom Eastep	e762998f1e	Allow spaces in the argument to the iprange command. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-06 06:44:15 -08:00
Tom Eastep	d4957696d1	Update man pages and sample files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-05 17:45:09 -08:00
Tom Eastep	439af55312	Implement RELATED_DISPOSITION and RELATED_LOG_LEVEL ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-05 16:08:17 -08:00
Tom Eastep	febe9e5222	Apply Chris Boot's fix for TC_ENABLED=Shared ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-05 12:22:48 -08:00
Tom Eastep	b27e2517b4	Unify capabilities detection ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-05 12:00:36 -08:00
Tom Eastep	94b8d07645	Correct fix for dynamic blacklisting (chain_exists()) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-05 07:01:16 -08:00
Tom Eastep	7fcdfd6655	Fix chain_exists() from IPv4 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-05 06:54:03 -08:00
Tom Eastep	2cffae738f	Initial implementation of CT target support in the 'notrack' file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-04 17:15:58 -08:00
Tom Eastep	a794027f63	Implement CT capability ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-04 14:35:53 -08:00
Tom Eastep	e7d2b1d4ed	Consolidate the lib.common files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-04 09:19:48 -08:00
Tom Eastep	0d80b54ad9	Correct some issue with file consolidation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-03 13:13:25 -08:00
Tom Eastep	f89c78788f	Correct a couple of syntax errors in lib.cli ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-03 12:41:05 -08:00
Tom Eastep	252b6580c0	Load the common libs from /sbin/shorewall6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-03 12:04:28 -08:00
Tom Eastep	4161c35108	Implement common lib.base, lib.cli and CLI for Shorewall[6][-lite] ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-03 10:59:01 -08:00
Tom Eastep	bc3782c3de	Pass $CONFIG_PATH to compiler.pl ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-02 09:31:26 -08:00
Tom Eastep	8c6914d1a2	Don't deprecate 'optional' for shared providers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-01 11:23:22 -08:00
Tom Eastep	a27f5655a7	Merge branch '4.4.26'	2011-12-01 10:41:22 -08:00
Tom Eastep	99bf7fb994	Don't do TC stuff during enable/disable of a shared provider ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-01 10:41:03 -08:00
Tom Eastep	568e3b2e5b	Allow a provider name in addition to an interface name in enable/disable ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-01 10:32:54 -08:00
Tom Eastep	8f14485d67	Allow a provider name in addition to an interface name in enable/disable ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-01 10:30:42 -08:00
Tom Eastep	3110f7c74a	Add enable/disable commands to the CLIs ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-12-01 10:25:51 -08:00
Tom Eastep	d8caa6498a	Add tracing to Optimize 16. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-30 07:57:19 -08:00
Tom Eastep	3581b2667e	Don't install the blacklist file in /etc/shorewall[6] ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-27 14:39:59 -08:00
Tom Eastep	9e149ca038	Correct default values during update ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-27 14:12:51 -08:00
Tom Eastep	61d5c6d6da	Implement Shorewall::Chains::clone_rule() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-26 09:36:02 -08:00
Tom Eastep	3498076a96	Accurately compare rule key values that are array references. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-26 08:03:02 -08:00
Tom Eastep	15d95b6977	Fix SAME target. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-26 07:48:03 -08:00
Tom Eastep	5cdb74168f	Correct port list capture with --multiport. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-25 16:22:23 -08:00
Tom Eastep	613e41c25a	Enable OPT 16 in check -r; Suppress duplicate rules	2011-11-25 16:05:07 -08:00
Tom Eastep	90e03e1833	Even more tweaks to optimize 16 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-25 14:46:37 -08:00
Tom Eastep	71bbd7963c	Some tweaks to optimize 16	2011-11-25 10:42:10 -08:00
Tom Eastep	f305da9d0d	Require extended multi-port match for OPTIMIZE 16. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-24 10:57:09 -08:00
Tom Eastep	8d8a681f40	Implement optimization level 16 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-24 10:22:04 -08:00
Tom Eastep	4559c8b5d0	Tweaks to convert_blacklist() ... - Reword an error message to handle both missing file and zero-sized file. - Don't rename file that doesn't exist.	2011-11-21 12:13:39 -08:00
Tom Eastep	dffb79e7bd	Handle empty blacklist file in 'update -b' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-20 17:02:01 -08:00
Tom Eastep	bd8ba435cd	Avoid uninitialized value in hash element. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-20 16:24:42 -08:00
Tom Eastep	4d30811794	Implement 'show marks' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-20 12:29:17 -08:00
Tom Eastep	e5a6387695	Eliminate use of WIDE_TC_MARKS in the Tc module ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-20 08:45:16 -08:00
Tom Eastep	382309bc53	Derive default values for the mark-layout options ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-20 07:03:33 -08:00
Tom Eastep	86c51f24d9	Deprecate the old mark layout options. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-19 17:14:05 -08:00
Tom Eastep	0adc82f469	Add the mark layout options to shorewall.conf ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-19 15:29:07 -08:00
Tom Eastep	83d7cfa76a	Update documentation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-19 15:18:43 -08:00
Tom Eastep	ae8aa3a45a	More fixes for ZONE_BITS ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-19 08:19:38 -08:00
Tom Eastep	ab1b65d6a8	Fixes for blacklist conversion ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-19 08:18:58 -08:00
Tom Eastep	4f9afc32ec	Allow zone names in the MARK column when ZONE_BITS != 0 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-18 07:23:24 -08:00
Tom Eastep	7c0cb69c29	Don't copy limited broadcast routes to provider tables ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-18 07:07:51 -08:00
Tom Eastep	364b30fd9b	Fix 'update -b' handling of missing files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-18 06:26:37 -08:00
Tom Eastep	72f75c201c	Implement zone automark ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-17 16:07:45 -08:00
Tom Eastep	96f5aec71f	Add ZONE_BITS configuration option. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-17 10:40:47 -08:00
Tom Eastep	fe09646bed	Make zone types a power of 2. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-17 09:23:39 -08:00
Tom Eastep	348c6c8cf7	Correct handling of LOGMARK ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-17 07:22:07 -08:00
Tom Eastep	d096b9399a	Fix '\!' handling in validate_level() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-15 16:41:32 -08:00
Tom Eastep	afaf0d9de8	Trivial optimiation in validate_level() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-13 06:19:40 -08:00
Tom Eastep	28a1087cd4	Cleanup of rewritten validate_level() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-13 05:58:59 -08:00
Tom Eastep	73ed66b9b9	Add ULOG and NFLOG capabilities plus LOGMARK for IPv6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-12 14:10:48 -08:00
Tom Eastep	bf010dc03e	Macro changes from Tuomo Soini	2011-11-11 15:08:57 -08:00
Tom Eastep	ffec7a4d95	More corrections to wildcard interfaces ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-11 07:29:44 -08:00
Tom Eastep	04dfe26549	Remove two unused variables. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-11 05:23:37 -08:00
Tom Eastep	972721facb	Remove some white space ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-10 17:52:25 -08:00
Tom Eastep	6813409c31	Make the previous patch a bit cleaner ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-10 07:19:21 -08:00
Tom Eastep	d85f6970e3	Fix wildcard interfaces ... - Suppress extra jumps to interface chains. - Insure that the 'lo' ACCEPT rule doesn't get masked by a wildcard interface Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-10 06:53:48 -08:00
Tom Eastep	d053faadde	Allow convertion of a legacy blacklist configuration ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-08 12:59:40 -08:00
Tom Eastep	6108a9cad8	Delete BLACKLISTSECTION ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-06 14:46:14 -08:00
Tom Eastep	da7516d401	Update config files and manpages for BLACKLISTSECTION ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-06 12:05:07 -08:00
Tom Eastep	1091c24348	Implement the BLACKLISTSECTION option ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-06 08:43:38 -08:00
Tom Eastep	755ed9859b	Merge branch '4.4.25' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall	2011-11-06 06:16:43 -08:00
Roberto C. Sanchez	cf8c30904d	Add support for a "status" command to the Debian init scripts ... (cherry picked from commit d36a2030ea)	2011-11-06 09:10:59 -05:00
Tom Eastep	d883e45f83	Correct 'start -f' with AUTOMAKE=Yes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-05 07:54:05 -07:00
Tom Eastep	e236be37db	Include the rawpost table in dump output ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-05 07:52:40 -07:00
Tom Eastep	689e9b0fe1	Make replacement of '+' by '*' global in case statements. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-04 13:49:10 -07:00
Tom Eastep	352dba1aac	More cleanup of the IN_BANDWIDTH code ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-02 06:34:35 -07:00
Tom Eastep	b9a7374130	Omit estimator when no avrate. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-01 11:16:51 -07:00
Tom Eastep	cfa33e894f	Restore IN_BANDWIDTH functionality on moribund distributions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-01 07:02:32 -07:00
Tom Eastep	8b8140cc9f	Add 'Basic Filter' capability ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-01 06:34:57 -07:00
Tom Eastep	f3b5d5585f	Correct detection of FLOW_FILTER ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-11-01 06:21:34 -07:00
Tom Eastep	dc1f815679	Reload blacklistsection chains even when legacy blacklisting is used. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-31 08:04:32 -07:00
Tom Eastep	29f6f6e3f2	Allow 'refresh' to reload chains from the BLACKLIST section. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-30 06:05:24 -07:00
Tom Eastep	16457ce85b	Evaluate a variable at compile-time rather than at run-time ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-27 07:07:38 -07:00
Tom Eastep	c319921365	Correct validation of 4in6 addresses ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-25 06:19:34 -07:00
Tom Eastep	3258806f6c	Insure that 32767 default rule exists on IPv6. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-24 21:15:09 -07:00
Tom Eastep	ccdda4c73b	Tighten the rule compatibility test in sub compatible(). ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-24 13:16:17 -07:00
Tom Eastep	3c98094242	Combine all IPV6 filtering in the routing table copy routines ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-24 13:15:36 -07:00
Tom Eastep	14764acd2d	Restore a blank line in the generated script ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-24 08:50:15 -07:00
Tom Eastep	ee66be8f32	Place all ip-address rules at priority 20000. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-23 17:11:41 -07:00
Tom Eastep	54ba4ed879	Add MARK column to route_rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-23 07:56:53 -07:00
Tom Eastep	4b419f7497	Cleanup if IPv6 provider work ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-22 12:48:07 -07:00
Tom Eastep	d3d9380df5	Don't combine incompatible chains ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-21 11:55:30 -07:00
Tom Eastep	f31f3dc92a	Implement 'fallback' and 'balance' for IPv6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-21 11:55:15 -07:00
Tom Eastep	20cd943a60	Make route-table copying work on IPv6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-20 10:32:09 -07:00
Tom Eastep	a42e2dff7f	Allow caps in IPv6 addresses ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-19 07:47:49 -07:00
Tom Eastep	62d43ab6dd	Cleanup of new IN-BANDWIDTH handling. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-18 05:53:50 -07:00
Tom Eastep	dbe936c7c9	Cleanup of new IN-BANDWIDTH handling (avoids a syntax error) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-17 06:29:27 -07:00
Tom Eastep	4d83201843	Allow configuraton of a rate estimated policing filter ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-16 14:38:27 -07:00
Tom Eastep	ebc944f027	Add optional MTU parameter in IN_BANDWIDTH ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-16 10:52:45 -07:00
Tom Eastep	bf6ea13898	Update .service files with patch from Jonathan Underwood ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-12 06:13:15 -07:00
Tom Eastep	a077a9821d	Implement rate estimation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-11 15:27:24 -07:00
Tom Eastep	25a6f10025	Fix complex traffic shaping ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-11 10:52:37 -07:00
Tom Eastep	ede17cb771	Restore lost function from merging 4.4.24 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-10 16:51:27 -07:00
Tom Eastep	6d56a8aa45	Merge branch '4.4.24' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-10 06:57:05 -07:00
Tom Eastep	a12a4a5a89	Add '6in4' as a synonym for '6to4' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-10 06:54:31 -07:00
Tom Eastep	99b21fdfc5	Implement HL manipulation for IPv6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-09 14:01:40 -07:00
Tom Eastep	668926c2a6	Add BALANCE_TABLE. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-09 09:00:14 -07:00
Tom Eastep	a5010ec9a6	Correct alternate specification in the tunnels file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-09 08:50:55 -07:00
Tom Eastep	31e0b186bf	More fixes for 'fallback' without weight ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-09 07:53:59 -07:00
Tom Eastep	809f27decd	More alternate-specification fixes. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-09 07:06:01 -07:00
Tom Eastep	8115934adf	More alternate-specification fixes. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-09 07:05:08 -07:00
Tom Eastep	035db174d8	Fix 'fallback' without weight ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-09 06:58:41 -07:00
Tom Eastep	3afd6a3ad3	Correct proto column of the netmap file	2011-10-08 18:20:47 -07:00
Tom Eastep	2d6f5da6bc	Correct proto column of the netmap file	2011-10-08 18:19:08 -07:00
Tom Eastep	c304661217	Fix earlier change	2011-10-08 17:10:23 -07:00
Tom Eastep	661606ef95	Merge branch '4.4.24' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-08 17:07:12 -07:00
Tom Eastep	b5963c6783	Fix alternate nat handling	2011-10-08 17:01:18 -07:00
Tom Eastep	e6b120a805	Implement BALANCE table ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-08 13:54:39 -07:00
Tom Eastep	e322e60d73	Fix 'fallback'	2011-10-08 12:32:29 -07:00
Tom Eastep	04c2007d53	Resolve merge conflicts ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-08 07:03:01 -07:00
Tom Eastep	5d4a0172b7	A bit of cleanup ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-05 09:32:26 -07:00
Tom Eastep	835a056eb8	Implement BLACKLIST section in the rules file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-03 16:02:01 -07:00
Tom Eastep	e09aa8662b	Correct title in action.TCPFlags ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-03 09:05:38 -07:00
Tom Eastep	57650e8dd9	Add two new actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-02 18:41:58 -07:00
Tom Eastep	0a5d5821ec	Support additional forms of column/value pair specification ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-02 11:45:55 -07:00
Tom Eastep	e728d663f9	Implement IPTABLES_S capability ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-01 13:54:52 -07:00
Tom Eastep	2f0829596f	Fix format-1 Actions	2011-10-01 12:17:29 -07:00
Tom Eastep	f6092ee52d	Eliminate the maxcolumns argument to the split_line functions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-01 11:39:12 -07:00
Tom Eastep	072f4752fc	Get rid of minimum column requirement ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-10-01 09:56:25 -07:00
Tom Eastep	c76957cc39	Reword an error message ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-26 08:51:05 -07:00
Tom Eastep	4c7f1a03a0	Catch multiple semicolons on a line. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-26 07:42:44 -07:00
Tom Eastep	9a4dfc4394	Implement an alternate way of specifying column contents. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-25 17:08:53 -07:00
Tom Eastep	da5b6b99d4	Implement TTL support in tcrules. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-24 16:17:52 -07:00
Tom Eastep	dbf5f17b41	More tweaks to switch implementation. ... 1) Switch names may be 30 characters long. 2) Switch settings are retained over restart. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-24 07:34:58 -07:00
Tom Eastep	40bc6df07a	Correct handling of SWITCH column ... - Handle exclusion - Correctly detect CONDITION_MATCH at compile time - Include condition match in the filter part of a NAT rule Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-23 15:01:40 -07:00
Tom Eastep	caddd65412	Rename condition->switch and add more documentation. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-23 12:33:55 -07:00
Tom Eastep	75b4540d26	Add support for condition match in the rules file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-21 15:20:50 -07:00
Tom Eastep	7978993d2b	Validate NET2 in IPv6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-20 16:24:39 -07:00
Tom Eastep	d005536fcc	Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-20 16:20:34 -07:00
Tom Eastep	a5e05c9e8e	Don't allow long port lists or icmp lists in netmap	2011-09-19 13:27:27 -07:00
Tom Eastep	990d6e504d	Correct icmp-type and icmpv6-type	2011-09-19 10:05:58 -07:00
Tom Eastep	fd1e996fb1	Correct call to dest_iexclusion() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-19 08:28:29 -07:00
Tom Eastep	e01276225c	Correct port order in the netmap file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-19 06:17:02 -07:00
Tom Eastep	c2bcb08483	Add 'i' versions of exclusion functions. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-18 14:12:22 -07:00
Tom Eastep	95a83f7fdf	Allow exclusion in the netmap file's NET1 column	2011-09-17 09:20:15 -07:00
Tom Eastep	5aac5870a1	Call setup_netmap if IPv6 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-17 07:31:18 -07:00
Tom Eastep	86847957bf	Merge branch '4.4.23'	2011-09-16 09:03:43 -07:00
Tom Eastep	76fc55d750	Fix TC_ENABLED=Shared ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-16 06:50:34 -07:00
Tom Eastep	be1765f44d	Don't emit 'enable' code for required providers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-15 14:46:29 -07:00
Tom Eastep	fcb8fa79c0	Don't emit 'enable' code for required providers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-14 08:25:47 -07:00
Tom Eastep	e1afc645ba	Allow IPv6 stateless NAT (undocumented) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-14 08:24:44 -07:00
Tom Eastep	fe9df4dfd1	Remove interface weight file if not balance or default. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-14 06:24:22 -07:00
Tom Eastep	8fe6425690	Correct DONT_LOAD ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-13 07:42:26 -07:00
Tom Eastep	ab1fac3fc6	Add some comments to getparams ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-11 09:52:12 -07:00
Tom Eastep	d4b37d1c52	Better way of handling environmental variables with embedded quotes. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-10 15:46:26 -07:00
Tom Eastep	fb6d4ffaf9	Merge branch '4.4.23'	2011-09-10 08:34:45 -07:00
Tom Eastep	8ce60ce825	Don't emit dangerous %ENV entries to the generated script ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-10 08:18:46 -07:00
Tom Eastep	7ed52360d5	Set all interfaces's 'routefilter' option if ROUTE_FILTER=on ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-07 12:19:13 -07:00
Tom Eastep	6f2fd75a8c	Merge branch '4.4.23'	2011-09-07 11:14:11 -07:00
Tom Eastep	5f85646418	Fix disable of last balanced route ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-07 07:00:18 -07:00
Tom Eastep	6ae184ccc7	Update the released netmap file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-06 15:36:33 -07:00
Tom Eastep	b19a6f0bfd	Merge branch '4.4.23'	2011-09-05 17:25:03 -07:00
Tom Eastep	77ca62835f	Add PROTO and PORTS columns to netmap	2011-09-05 12:33:42 -07:00
Tom Eastep	02009ee060	Set 'use_..._chain' on interfaces with sfilters ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-05 06:23:18 -07:00
Tom Eastep	2285dce4d1	Fix debugging of ipv6 ruleset ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-03 13:58:05 -07:00
Tom Eastep	058b746f57	Use /sys/module/ to speed up module loading ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-03 11:49:31 -07:00
Tom Eastep	29e0f57928	Cosmetic/readability changes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-03 08:44:15 -07:00
Tom Eastep	d1fea7c682	Correct 'disable' with dynamic gateway ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-02 11:01:06 -07:00
Tom Eastep	46d9faa63a	Correct sed invocation in add_gateway() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-02 10:28:41 -07:00
Tom Eastep	a63d4dad44	More sfilter tweaks ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-02 08:41:42 -07:00
Tom Eastep	6afd18646d	Remove backslashes from routes before processing them. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-02 08:41:15 -07:00
Tom Eastep	f5c2e9b211	Make the sfilter logic cleaner and add a comment ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-01 14:15:15 -07:00
Tom Eastep	a0bbd72a39	Avoid a calculation in a loop in the generated code ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-09-01 06:06:50 -07:00
Tom Eastep	3fa646845f	Fix busybox anomaly	2011-08-31 16:38:58 -07:00
Tom Eastep	82a806d788	Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-31 07:58:51 -07:00
Tom Eastep	b8951259bd	Avoid emitting out-of-function statements. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-30 16:55:44 -07:00
Tom Eastep	78a25bb51b	Avoid undefined value error. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-30 16:43:38 -07:00
Tom Eastep	abdd6bec27	More corrections to undo_routing ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-30 09:31:06 -07:00
Tom Eastep	3031c37edd	Handle routes and rules for main and default ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-29 10:05:36 -07:00
Tom Eastep	45bc3a7ea0	Split add_a_provider() into two functions. ... - Avoid generating add_xxx_routes() and add_xxx_rules - Only configure tc during 'enable' - Fix a bad bug (routes were actually rules) Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-28 08:04:06 -07:00
Tom Eastep	65fe958e8e	Split add_a_provider() into two functions. ... - Avoid generating add_xxx_routes() and add_xxx_rules - Only configure tc during 'enable' - Fix a bad bug (routes were actually rules) Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-28 07:54:47 -07:00
Tom Eastep	90f83fd9fd	Clear device TC on 'disable' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-27 12:33:24 -07:00
Tom Eastep	ed7d70e54b	Merge branch 'EdW'	2011-08-27 11:45:37 -07:00
Tom Eastep	0ef8e3b1d6	Give tcpri processing its own function. Add some comments ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-27 11:44:42 -07:00
Tom Eastep	eb9d798ad3	Correct traffic-shaping handling ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-27 11:17:08 -07:00
Tom Eastep	5d21b55ecc	Configure /proc during 'enable' processing. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-27 09:21:02 -07:00
Tom Eastep	cedf203c21	Allow tc config during 'enable' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-27 08:29:55 -07:00
Tom Eastep	7d66b3e60f	Correct typo in prog.footer ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-26 14:13:34 -07:00
Tom Eastep	a8d0f5f40b	Fix the log message when 'enable' fails. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-26 11:02:42 -07:00
Tom Eastep	528f2b0aa2	Implement enable and disable commands for IPv4 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-25 16:00:27 -07:00
Tom Eastep	f6920cf061	Merge branch 'EdW'	2011-08-24 17:51:48 -07:00
Tom Eastep	2ef7dd5201	Re-factor Provider startup	2011-08-24 17:37:39 -07:00
Tom Eastep	971adc3d5b	Add support for serviced in the installers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-23 14:07:44 -07:00
Tom Eastep	33afe26a19	Add Redhat/Fedora init scripts from Jonathan Underwood ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-22 09:05:40 -07:00
Tom Eastep	4e15786156	Add copyright statements to the .service files	2011-08-22 06:53:04 -07:00
Tom Eastep	e6a6a1a609	Add .service files for systemd	2011-08-22 06:27:23 -07:00
Tom Eastep	24aacd67e6	Improve lockfile arguments ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-21 11:28:45 -07:00
Tom Eastep	56addf3d4c	Remove stale lock files ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-21 10:53:24 -07:00
Tom Eastep	2963acee80	Remove stale lock files	2011-08-21 10:21:58 -07:00
Tom Eastep	8c8326fa58	Correct handling of Wildcard Providers ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-20 06:49:02 -07:00
Tom Eastep	8ae9b2948e	Make 'start debug' work with the rawpost table. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-16 16:17:02 -07:00
Tom Eastep	ca8e99ed51	Correct implementation of the ALL section. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-16 14:10:21 -07:00
Tom Eastep	e5886abed1	Take care of oversights in the Stateless NAT implementation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-16 14:10:07 -07:00
Tom Eastep	c597eb25fc	Delete QUOTA_MATCH ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-16 05:39:28 -07:00
Tom Eastep	bc706324e9	Add an ALL section to the rules files. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-15 15:32:24 -07:00
Tom Eastep	d5290fc881	Correct typo that caused an internal error ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-15 10:11:12 -07:00
Tom Eastep	0b2a8b12c7	Implement Stateless NAT support. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-14 12:01:17 -07:00
Tom Eastep	71480ff647	Validate nets in the netmap file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-13 15:59:42 -07:00
Tom Eastep	97121116a3	Add rawpost table detection ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-13 11:14:29 -07:00
Tom Eastep	37b08dd991	Merge branch '4.4.22'	2011-08-13 10:48:27 -07:00
Tom Eastep	dec4f4f186	Separate target and targetopts in add_ijump calls. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-13 09:56:14 -07:00
Tom Eastep	b1b323191c	Merge branch '4.4.22'	2011-08-11 20:19:47 -07:00
Tom Eastep	786455b287	Unlink .bak file if no changes to .conf. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-11 20:19:30 -07:00
Tom Eastep	39c71418da	Merge branch '4.4.22'	2011-08-10 09:34:37 -07:00
Tom Eastep	7708c251db	Fix ECN when MANGLE_FORWARD is not available. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-10 09:34:15 -07:00
Tom Eastep	8eff66dcfd	Fix handling or ORIGINAL DEST when CONNTRACK_MATCH is not available ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-10 07:12:13 -07:00
Tom Eastep	67c1fa1e63	Fix old state match	2011-08-08 20:35:55 -07:00
Tom Eastep	8fe064914b	Fix old state match	2011-08-08 20:32:02 -07:00
Tom Eastep	4824c9b8ff	Add QUOTA_MATCH capability ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-08 14:37:47 -07:00
Tom Eastep	35457f4e95	Remove she-bang from lib.* ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-03 07:54:46 -07:00
Tom Eastep	b0fe8e1e60	Merge branch '4.4.22'	2011-08-03 07:20:57 -07:00
Tom Eastep	a548bddea8	Remove she-bang from first line of prog.header* ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-03 07:20:34 -07:00
Tom Eastep	679de4ccf6	Apply Orion Poplawski's 'qtnoin' patch ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-02 16:51:49 -07:00
Tom Eastep	50a29f6858	Correct detection of OLD_IPSET_MATCH when LOAD_MODULES_ONLY=No ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-08-02 11:58:54 -07:00
Tom Eastep	ae0cffa588	Fix handling of zone names beginning with 'all'	2011-08-02 09:13:23 -07:00
Tom Eastep	d358285d56	Remove obsolete comment ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-31 11:34:46 -07:00
Tom Eastep	f675513383	Make 'build' work on a Mac ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-30 10:57:32 -07:00
Tom Eastep	512273fa91	Avoid undefined reference in Shorewall::rules::save_policies ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-30 07:04:42 -07:00
Tom Eastep	42ae3ba581	Cleaner fix for TCP_FLAGS_DISPOSITION ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-30 06:57:18 -07:00
Tom Eastep	d9fe6e7a42	Handle missing TCP_FLAGS_DISPOSITION setting ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-28 15:56:34 -07:00
Tom Eastep	6c025d20c9	Fix Shorewall6 Kernel Version test ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-28 15:53:35 -07:00
Tom Eastep	a992ec594a	Accomodate kernel version 3.0 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-27 17:03:27 -07:00
Tom Eastep	33f7822df9	Correct 'action' editing RE in parameterized actions ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-25 09:16:22 -07:00
Tom Eastep	a18c502796	Correct reference counting in one more place in expand_rule() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-25 07:42:01 -07:00
Tom Eastep	ecd2e2276e	Add some comments and remove extra whitespace ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-25 06:56:05 -07:00
Tom Eastep	215e923562	A little cleanup ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-24 16:17:22 -07:00
Tom Eastep	703bc88bfd	Move merge_rules() back to where it was. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-24 15:06:42 -07:00
Tom Eastep	6300d6cbfc	Validate 'action' parameter to the new parameterized actions. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-24 11:46:57 -07:00
Tom Eastep	ac5a6f4471	Cleanup of progress messages ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-24 09:13:46 -07:00
Tom Eastep	f2c9647579	Set empty target in rules created via add_irule() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-24 08:28:43 -07:00
Tom Eastep	e693665be1	Add correct reference counting to merge_rules() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-24 08:03:45 -07:00
Tom Eastep	ea4b8cdb6f	Exempt policy chains from optimization level 8. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-23 16:34:01 -07:00
Tom Eastep	b789d825f8	Unify the setting of $targetref and $jump ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-23 14:47:16 -07:00
Tom Eastep	83e6e2f105	Another fix for reference counting. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-23 13:54:56 -07:00
Tom Eastep	028fc20741	Correct reference accounting when long port lists are split ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-23 07:31:58 -07:00
Tom Eastep	3d616980a6	Don't delete the {target} member in clear_rule_target() but instead set it to '' ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-23 07:30:56 -07:00
Tom Eastep	567993292f	Some efficiency changes ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-22 17:48:14 -07:00
Tom Eastep	5764e7899b	Rename combined chains created by optimization level 8 ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-22 14:12:03 -07:00
Tom Eastep	22463e451d	More efficient method of generating rule strings for comparison ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-22 11:06:29 -07:00
Tom Eastep	1d24f28c83	Rename %special -> %opttype ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-22 11:06:03 -07:00
Tom Eastep	bfd63dcace	Revert LOGLIMIT conversion change ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-22 07:53:30 -07:00
Tom Eastep	2adf2883d5	Revert addition of do_i functions. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-22 07:23:13 -07:00
Tom Eastep	5e190f4e4e	Implement '_i' equivalents of all do_ functions. ... Also implements handling of long port lists in new-format rules. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-22 06:22:52 -07:00
Tom Eastep	0791ea6698	Make 'KLUDGEFREE' a global to make it faster to test. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-21 12:57:20 -07:00
Tom Eastep	4eeb233d95	A little reorg to prepare for moving long port list remediation to the new chain structure. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-20 18:52:20 -07:00
Tom Eastep	705ffbca49	Fix for LOGMARK(<list>) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-20 17:33:31 -07:00
Tom Eastep	a7ab53e135	Trap '!' in port columns. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-20 15:55:18 -07:00
Tom Eastep	32a8b254a0	Some optimizations in the new rule infrastructure ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-20 15:53:00 -07:00
Tom Eastep	ca655a6f52	Use add_ijump for all jump 'irules'. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-20 07:30:49 -07:00
Tom Eastep	12b5aa687b	More conversion to new rule interface ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-19 11:58:10 -07:00
Tom Eastep	f8be76f471	Make LOGMARK work without a parameter. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-19 11:57:12 -07:00
Tom Eastep	8b56e16bf9	Fix LOGMARK ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-19 06:54:41 -07:00
Tom Eastep	58de3dd3c1	Fix :persistent and :random in /etc/shorewall/masq ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 15:35:07 -07:00
Tom Eastep	346df62cc6	Support long-form iptables options. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 13:47:52 -07:00
Tom Eastep	796f3b6668	Correct cmdlevel settings in irules. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 10:05:39 -07:00
Tom Eastep	1e89074bf8	Correct tracing of nested rules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 09:46:41 -07:00
Tom Eastep	a80b04bd74	Correct formatting of empty arguments to add_commands ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 09:45:59 -07:00
Tom Eastep	bfd69c33c7	Correctly format empty arguments to add_commands() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 09:19:52 -07:00
Tom Eastep	043fb8757c	Convert Rules.pm infrastructure to use the new rule interface ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 08:29:42 -07:00
Tom Eastep	7aa7cd54c2	Convert Providers.pm to use the new rules interface. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 07:43:25 -07:00
Tom Eastep	3c60f107b7	Convert generate_matrix() to use the new rules interface ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-18 07:24:21 -07:00
Tom Eastep	2efa2796d3	More new rule interface calls in the Misc module ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-17 15:12:58 -07:00
Tom Eastep	b2305ca9cf	Convert Tunnels file to use irules ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-17 11:33:01 -07:00
Tom Eastep	a211f8fd0f	Infrastructure for new rule interface ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-17 10:37:15 -07:00
Tom Eastep	f3f535abac	POC of new rule interface ... Also removed FAKE_AUDIT option Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-17 08:35:09 -07:00
Tom Eastep	950c32d46b	Convert add_commands() calls to the equivalent add_rule() calls. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-16 16:31:29 -07:00
Tom Eastep	03913019d8	Mark DHCP rules for the convenience of move_rules(). ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-16 15:34:57 -07:00
Tom Eastep	27621fa0f9	Impose some structure on setting rule options ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-16 14:46:34 -07:00
Tom Eastep	0f742187ae	Implement intermediate rule representation ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-16 09:41:53 -07:00
Tom Eastep	9661b445f2	Make install/uninstall files version independent ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-13 07:29:47 -07:00
Tom Eastep	d1b8d7b953	Make perl modules version-neutral ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-10 15:10:27 -07:00
Tom Eastep	11c580de54	Fix exclusion in IPv6 hosts file. ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-09 17:27:09 -07:00
Tom Eastep	e21ff03339	Fix ipsets in IPv6 hosts file ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-09 16:17:35 -07:00
Tom Eastep	fbeddca6a4	Another IPv6 ipset issue (z:!+set in the DEST column) ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-09 15:40:18 -07:00
Tom Eastep	a998476d00	Correct Accounting module version ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-09 07:08:47 -07:00
Tom Eastep	6c802d3353	Tighten up source and dest checking in expand_rule() ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-09 07:08:39 -07:00
Tom Eastep	1f30976790	Correct change that tightened editing of IPv6 addresses ... Signed-off-by: Tom Eastep <teastep@shorewall.net>	2011-07-08 18:34:33 -07:00