Tom Eastep
|
5d7442e9e9
|
Correct typo in converted blrules file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-07 12:13:26 -07:00 |
|
Tom Eastep
|
ef90006334
|
Avoid reference to unitialized variable on bogus FORMAT in interfaces
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-07 12:00:21 -07:00 |
|
Tom Eastep
|
2cbf1e86ad
|
Allow synonyms for column names in alternate specification formats
- gateway and gateways in the tunnels file
- mark and action in the tcrules file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-07 11:59:47 -07:00 |
|
Tom Eastep
|
dd8e9ff09d
|
Fix 'COMMENT' along in the tunnels file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-07 11:58:37 -07:00 |
|
Tom Eastep
|
4320150dc4
|
Add alternate specification in tunnels file ('gateways')
- Make similar change in tcrules file with 'action'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-07 07:43:11 -07:00 |
|
Tom Eastep
|
003daec41c
|
Remove a couple of hard-coded '/usr/share' in Shorewall::Config
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-06 17:30:17 -07:00 |
|
Tom Eastep
|
aac00c3cc7
|
Pop open stack in run_user_exit1 and run_user_exit2
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-05 10:31:55 -07:00 |
|
Tom Eastep
|
af228806fc
|
Allow manual changes to be used in macros.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-05 08:56:26 -07:00 |
|
Tom Eastep
|
1d90ee174c
|
Cleanup of ERROR/WARNING message enhancement.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-04 07:01:08 -07:00 |
|
Tom Eastep
|
3e37f47fb5
|
Print out the include/open stack in WARNING and ERROR messages.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-05-03 17:17:55 -07:00 |
|
Tom Eastep
|
894931731b
|
Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall
|
2012-05-02 07:04:30 -07:00 |
|
Tom Eastep
|
731b310359
|
Use --hashlimit-upto when available.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-30 13:45:09 -07:00 |
|
Tom Eastep
|
35c08c109e
|
Fix IPv4 'reset'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-30 07:54:40 -07:00 |
|
Tom Eastep
|
766771d812
|
Remove absurd test
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-30 07:48:07 -07:00 |
|
Tom Eastep
|
b9e6349994
|
Add some comments
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-29 09:07:34 -07:00 |
|
Tom Eastep
|
c9b4d3d8c8
|
Add/improve comments.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-25 09:44:08 -07:00 |
|
Tom Eastep
|
d904a2de86
|
Search and destroy trailing whitespace
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-24 14:52:57 -07:00 |
|
Tom Eastep
|
f860cd037d
|
Change a comment in generate_matrix() to acknowledge 'KLUDGEFREE'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-24 13:34:56 -07:00 |
|
Tom Eastep
|
3bdf703522
|
Allow TC experts to SAVE/RESTORE all parts of the packet mark
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-24 09:19:38 -07:00 |
|
Tom Eastep
|
34f5838365
|
Allow multiple GATEWAYS to be listed in the tunnels file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-18 09:28:37 -07:00 |
|
Tom Eastep
|
2b7e5dd9d8
|
Suppress duplicate option when not KLUDGEFREE
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-17 07:35:37 -07:00 |
|
Tom Eastep
|
44c8ef2ede
|
Correct ill-advised change to push_matches()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-17 07:30:17 -07:00 |
|
Tom Eastep
|
aaab505006
|
Improve the debuggability of failed assertions
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-14 17:57:49 -07:00 |
|
Tom Eastep
|
63a2a32b4b
|
Suppress trailing whitespace.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-14 13:50:59 -07:00 |
|
Tom Eastep
|
31752d9ee1
|
Move macro.BLACKLIST to where it belongs
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-14 08:14:45 -07:00 |
|
Tom Eastep
|
24e2fe4a04
|
Make options argument to read_a_line manditory
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-14 08:04:28 -07:00 |
|
Tom Eastep
|
42950e53cd
|
Use logical add rather than arithmetic add for uniformity
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-11 14:28:09 -07:00 |
|
Tom Eastep
|
ae9f538ef8
|
Simplify an assertion
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-11 14:27:48 -07:00 |
|
Tom Eastep
|
e880d2fd84
|
Remove some whitespace
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-11 08:03:02 -07:00 |
|
Tom Eastep
|
e791a63671
|
Merge branch '4.5.2'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-11 07:13:40 -07:00 |
|
Tom Eastep
|
e263a3c27d
|
Remove redundant logic
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-11 07:11:05 -07:00 |
|
Tom Eastep
|
0b5e30aa7b
|
Fix INCLUDE inside an ?IF ... ?ENDIF
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-10 17:27:47 -07:00 |
|
Tom Eastep
|
07ff3f294d
|
Fix INCLUDE inside an ?IF ... ?ENDIF
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-10 17:27:23 -07:00 |
|
Tom Eastep
|
6ba69c9540
|
Eliminate read_a_line1()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-10 17:01:38 -07:00 |
|
Tom Eastep
|
5ee554708c
|
Control the proliferation of arguments to read_a_line() by using
a bit-mapped single argument.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-10 13:51:25 -07:00 |
|
Tom Eastep
|
623e545f09
|
Don't allow accounting chains to be altered when OPTIMIZE_ACCOUNTING=No
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-09 21:44:44 -07:00 |
|
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
|
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
|
24e115d0f9
|
Move a comment
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-06 08:00:20 -07:00 |
|