extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-03 12:09:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove requirement that matches and proto end with a space in perl helper API.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-01 12:29:30 -08:00
parent c9247c8074
commit a5d3b1f470
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -2662,6 +2662,8 @@ sub perl_action_helper($$) {
assert( $chainref ); assert( $chainref );
$matches .= ' ' unless $matches =~ /^(?:.+\s)?$/;
if ( $inlines{$action} ) { if ( $inlines{$action} ) {
$result = &process_rule( $chainref, $result = &process_rule( $chainref,
$matches, $matches,
@ -2708,6 +2710,8 @@ sub perl_action_tcp_helper($$) {
assert( $chainref ); assert( $chainref );
$proto .= ' ' unless $proto =~ /^(?:.+\s)?$/;
if ( $passedproto eq '-' || $passedproto eq 'tcp' || $passedproto eq '6' ) { if ( $passedproto eq '-' || $passedproto eq 'tcp' || $passedproto eq '6' ) {
# #
# For other protos, a 'no rule generated' warning will be issued # For other protos, a 'no rule generated' warning will be issued

8
Shorewall/action.Established
View File

@ -24,12 +24,12 @@
# #
# Established[([<action>])] # Established[([<action>])]
# #
# Default action is DROP # Default action is ACCEPT
# #
########################################################################################## ##########################################################################################
?FORMAT 2 ?FORMAT 2
DEFAULTS DROP DEFAULTS ACCEPT
?BEGIN PERL; ?BEGIN PERL;
@ -45,8 +45,8 @@ my ( $level, $tag ) = get_action_logging;
$action = join( ':', $action, $level, $tag ) if "${level}${tag}"; $action = join( ':', $action, $level, $tag ) if "${level}${tag}";
perl_action_helper( perl_action_helper(
$action, # Target $action, # Target
"$globals{STATEMATCH} INVALID ", # Matches "$globals{STATEMATCH} ESTABLISHED", # Matches
); );
allow_optimize( get_action_chain ); allow_optimize( get_action_chain );

4
Shorewall/action.Invalid
View File

@ -50,8 +50,8 @@ my ( $level, $tag ) = get_action_logging;
$action = join( ':', $action, $level, $tag ) if "${level}${tag}"; $action = join( ':', $action, $level, $tag ) if "${level}${tag}";
perl_action_helper( perl_action_helper(
$action, # Target $action, # Target
"$globals{STATEMATCH} INVALID ", # Matches "$globals{STATEMATCH} INVALID", # Matches
); );
allow_optimize( get_action_chain); allow_optimize( get_action_chain);

2
Shorewall/action.NotSyn
View File

@ -51,7 +51,7 @@ $action = join( ':', $action, $level, $tag ) if "${level}${tag}";
perl_action_tcp_helper( perl_action_tcp_helper(
$action, $action,
'-p 6 ! --syn ' '-p 6 ! --syn'
); );
allow_optimize( get_action_chain ); allow_optimize( get_action_chain );

2
Shorewall/action.RST
View File

@ -50,7 +50,7 @@ $action = join( ':', $action, $level, $tag ) if "${level}${tag}";
perl_action_tcp_helper( perl_action_tcp_helper(
$action, $action,
'-p 6 --tcp-flags RST RST ' '-p 6 --tcp-flags RST RST'
); );
allow_optimize( get_action_chain ); allow_optimize( get_action_chain );

4
Shorewall/action.Related
View File

@ -46,8 +46,8 @@ my ( $level, $tag ) = get_action_logging;
$action = join( ':', $action, $level, $tag ) if "${level}${tag}"; $action = join( ':', $action, $level, $tag ) if "${level}${tag}";
perl_action_helper( perl_action_helper(
$action, # Target $action, # Target
"$globals{STATEMATCH} RELATED ", # Matches "$globals{STATEMATCH} RELATED", # Matches
); );
allow_optimize( get_action_chain ); allow_optimize( get_action_chain );

4
docs/Actions.xml
View File

@ -930,10 +930,6 @@ bar:debug</programlisting>
<para>ip[6]tables matches to be included in the rule. When <para>ip[6]tables matches to be included in the rule. When
called in an inline action, these matches are augmented by called in an inline action, these matches are augmented by
matches generated by the invoking rule.</para> matches generated by the invoking rule.</para>
<important>
<para>The matches must end with a space character.</para>
</important>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>