Tom Eastep
|
2fbbc70e83
|
Only do SET and RESET when we aren't omitting.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 16:27:18 -08:00 |
|
Tom Eastep
|
c18996b6f5
|
Implement ?set and ?reset directives
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 14:28:03 -08:00 |
|
Tom Eastep
|
02cbd72a91
|
Merge branch '4.5.10'
|
2012-12-04 10:56:09 -08:00 |
|
Tom Eastep
|
60012d1208
|
Add additional space for the OPTIONS column
- actions and actions.std problem
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 10:54:32 -08:00 |
|
Tom Eastep
|
a7b8b53f72
|
Small change to the Actions document.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 10:40:22 -08:00 |
|
Tom Eastep
|
22aa06f497
|
Small change to the Actions document.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 10:39:29 -08:00 |
|
Tom Eastep
|
903e25a91a
|
Add ALLOWUNKNOWNVARIABLES to the sample configurations.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 09:04:34 -08:00 |
|
Tom Eastep
|
8f1e8bf475
|
Add 'ALLOWUNKNOWNVARIABLES' to the manpages.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 08:50:23 -08:00 |
|
Tom Eastep
|
fb2d876683
|
Rename $loglevel and $logtag to $_loglevel and $_logtag respectively.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 08:49:59 -08:00 |
|
Tom Eastep
|
a25b3c68ee
|
Rename %symbols to %variables
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-04 08:49:25 -08:00 |
|
Tom Eastep
|
314632f1f4
|
Unified symbol table for shell variables.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-03 17:18:21 -08:00 |
|
Tom Eastep
|
409f5f2aab
|
Expand variables from the shorewallrc1 then shorewallrc hashes
|
2012-12-03 15:33:33 -08:00 |
|
Tom Eastep
|
fb0035bdf3
|
Add ALLOWUNKNOWNVARIABLES option.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-03 14:43:35 -08:00 |
|
Tom Eastep
|
72aabef0fa
|
Add $logaction and $logtag as variables usable within actions
- Also make action variables usable in ?if and ?elsif expressions.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-03 12:31:47 -08:00 |
|
Tom Eastep
|
fc3606a489
|
Prepare for multiple options in actions files
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-03 08:17:55 -08:00 |
|
Tom Eastep
|
ad4709cb6d
|
Small effeciency improvement
- Don't check for 'bad match' until it is known that the matches are the same.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-03 06:54:44 -08:00 |
|
Tom Eastep
|
c0abdc1fe8
|
Add some comments in and around delete_duplicates()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-02 17:31:13 -08:00 |
|
Tom Eastep
|
d5405757dd
|
Merge branch '4.5.10'
Conflicts:
Shorewall/Perl/Shorewall/Chains.pm
Shorewall/manpages/shorewall.conf.xml
Shorewall6/manpages/shorewall6.conf.xml
|
2012-12-02 13:18:33 -08:00 |
|
Tom Eastep
|
cd5e9be467
|
Carefully suppress duplicate rules in all tables
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-02 12:20:24 -08:00 |
|
Tom Eastep
|
334bdd16d6
|
Carefully suppress duplicate rules in all tables
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-02 10:40:14 -08:00 |
|
Tom Eastep
|
c05c928c6c
|
Delete adjacent duplicate rules in tables other than 'raw'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-02 09:21:04 -08:00 |
|
Tom Eastep
|
a33cf5cc91
|
Fix AUTOCOMMENT=No
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-02 08:26:54 -08:00 |
|
Tom Eastep
|
9da507ae98
|
Remove error messages from 6 actions regarding in-line.
- The compiler now ignores 'inline' for these actions.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-02 07:13:09 -08:00 |
|
Tom Eastep
|
e0e7b2a9f2
|
Correct action.DropSmurfs
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-02 07:11:58 -08:00 |
|
Tom Eastep
|
65676cb865
|
Support passing log levels inside parameters.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 15:06:51 -08:00 |
|
Tom Eastep
|
8ebbdee20f
|
Only look for numerics if a shell variable begins with a number.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 12:52:26 -08:00 |
|
Tom Eastep
|
6c1a5b8051
|
Be more agressive about detecting action recursion.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 12:10:06 -08:00 |
|
Tom Eastep
|
cc657e571d
|
Update action templates with new columns.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 10:25:10 -08:00 |
|
Tom Eastep
|
f358a78eca
|
Revise the description of 'noinline' to match the changed implementation.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 09:33:38 -08:00 |
|
Tom Eastep
|
b9adc2ebec
|
Remove another vestage of CONDITION_INIT
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 09:33:01 -08:00 |
|
Tom Eastep
|
44f00cd0aa
|
Restore original $actionfile logic in process_actions()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 08:09:20 -08:00 |
|
Tom Eastep
|
ae5680401f
|
Remove questionable autocreate of an action in createlogactionchain()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 08:04:29 -08:00 |
|
Tom Eastep
|
8cbe26e32c
|
Ignore 'inline' for certain actions.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-12-01 07:54:42 -08:00 |
|
Tom Eastep
|
146402d9be
|
Yet another correction to the same line :-(
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-30 09:55:24 -08:00 |
|
Tom Eastep
|
70f26d8bb2
|
Correct line in prior commit.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-30 09:30:27 -08:00 |
|
Tom Eastep
|
893d054cb8
|
Reduce the block levels in define_firewall()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-30 08:46:49 -08:00 |
|
Tom Eastep
|
53fd0e7c8c
|
Don't require functions called from Shorewall::Compiler::compiler to know the current indentation.
Also, add an optional 'times' parameter to push_indent() and pop_indent().
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-30 07:49:42 -08:00 |
|
Tom Eastep
|
87e205208d
|
Merge branch '4.5.10' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.5.10
|
2012-11-30 07:32:15 -08:00 |
|
Tom Eastep
|
6702bb1989
|
Revert condition initialization patch.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-30 07:31:29 -08:00 |
|
Tom Eastep
|
1fe1c2209c
|
Revert condition initialization patch.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 17:06:08 -08:00 |
|
Tom Eastep
|
e60369728a
|
Only initialize switches that survived optimization
- Also use push_indent to make things more readable
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 15:25:28 -08:00 |
|
Tom Eastep
|
7d4bc568d8
|
Include initialization in condition match if supported
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 14:54:09 -08:00 |
|
Tom Eastep
|
11d4e92a29
|
Correct check for leading zeros in action variables.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 14:39:02 -08:00 |
|
Tom Eastep
|
409c427134
|
Add support for future condition initial values.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 12:15:15 -08:00 |
|
Tom Eastep
|
7bdce1bc97
|
Disallow superfluous leading zeros in action parameter numbers.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 08:29:20 -08:00 |
|
Tom Eastep
|
e1524763ad
|
Also substute the chain name for '@0'.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 08:28:52 -08:00 |
|
Tom Eastep
|
15121e0743
|
Also substitute the chain name for '@0' in SWITCH names.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 08:05:49 -08:00 |
|
Tom Eastep
|
172c1a5b44
|
Update the alternative column specification table.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 07:43:48 -08:00 |
|
Tom Eastep
|
9c0d8a2533
|
Use '@{0}' as the chain name surrogate in SWITCH columns
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-29 07:17:13 -08:00 |
|
Tom Eastep
|
bff91cd325
|
Allow overriding 'inline' on some standard actions.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-11-28 15:03:08 -08:00 |
|