Add UDP rule to macro.RDP

Signed-off-by: Tom Eastep <teastep@shorewall.net>
Module suffix changes
2017-08-22 08:07:32 -07:00 · 2017-08-21 12:44:23 -07:00 · 2017-08-21 10:27:29 -07:00 · 2017-08-19 12:25:27 -07:00 · 2017-08-19 12:12:54 -07:00 · 2017-08-19 08:08:24 -07:00
7 changed files with 14 additions and 12 deletions
--- a/Shorewall-core/lib.common
+++ b/Shorewall-core/lib.common
@@ -274,7 +274,7 @@ loadmodule() # $1 = module name, $2 - * arguments

    if [ -d /sys/module/ ]; then
 	if ! list_search $modulename $DONT_LOAD; then
-	    if [ ! -d /sys/module/$modulename ]; then
+	    if [ ! -f /sys/module/$modulename ]; then
 		shift

 		for suffix in $MODULE_SUFFIX ; do
--- a/Shorewall/Macros/macro.RDP
+++ b/Shorewall/Macros/macro.RDP
@@ -6,4 +6,5 @@
 ###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DPORT	SPORT	ORIGDEST	RATE	USER

+PARAM	-	-	udp	3389
 PARAM	-	-	tcp	3389
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -1345,8 +1345,6 @@ sub format_rule( $$;$ ) {
 	    } else {
 		$rule .= join( '' , ' --', $_, ' ', $value );
 	    }
-
-	    next;
 	} elsif ( $type == EXPENSIVE ) {
 	    #
 	    # Only emit expensive matches now if there are '-m nfacct' or '-m recent' matches in the rule
@@ -1929,7 +1927,7 @@ sub delete_reference( $$ ) {

    assert( $toref );

-    delete $toref->{references}{$fromref->{name}} unless --$toref->{references}{$fromref->{name}} > 0;
+    delete $toref->{references}{$fromref->{name}} if --$toref->{references}{$fromref->{name}} <= 0;
 }

 #
@@ -2067,7 +2065,7 @@ sub adjust_reference_counts( $$$ ) {
    my ($toref, $name1, $name2) = @_;

    if ( $toref ) {
-	delete $toref->{references}{$name1} unless --$toref->{references}{$name1} > 0;
+	delete $toref->{references}{$name1} if --$toref->{references}{$name1} <= 0;
 	$toref->{references}{$name2}++;
    }
 }
@@ -3900,7 +3898,10 @@ sub optimize_level8( $$$ ) {
 		    }

 		    $combined{ $chainref1->{name} } = $chainref->{name};
-
+		    #
+		    # While rare, it is possible for a policy chain to be combined with a non-policy chain. So we need to preserve
+		    # the policy attributes in the combined chain
+		    #
 		    if ( $chainref->{policychain} ) {
 			@{$chainref1}{qw(policychain policy)} = @{$chainref}{qw(policychain policy)} unless $chainref1->{policychain};
 		    } elsif ( $chainref1->{policychain} ) {
@@ -4832,7 +4833,7 @@ sub do_proto( $$$;$ )
 				$multiport = 1;
 			    }  else {
 				fatal_error "Missing DEST PORT" unless supplied $ports;
-				$ports   = validate_portpair $pname , $ports;
+				$ports   = validate_portpair $pname , $ports unless $ports =~ /^\$/;
 				$output .= ( $srcndst ? "-m multiport ${invert}--ports ${ports} " : "${invert}--dport ${ports} " );
 			    }
 			}
@@ -5039,7 +5040,7 @@ sub do_iproto( $$$ )
 				$multiport = 1;
 			    }  else {
 				fatal_error "Missing DEST PORT" unless supplied $ports;
-				$ports   = validate_portpair $pname , $ports;
+				$ports   = validate_portpair $pname , $ports unless $ports =~ /^\$/;

 				if ( $srcndst ) {
 				    push @output, multiport => "${invert}--ports ${ports}";
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -4320,7 +4320,7 @@ sub load_kernel_modules( ) {

 	close LSMOD;

-	$config{MODULE_SUFFIX} = 'o gz xz ko o.gz o.xz ko.gz ko.xz' unless $config{MODULE_SUFFIX};
+	$config{MODULE_SUFFIX} = 'ko ko.gz ko.xz o o.gz o.xz gz xz' unless $config{MODULE_SUFFIX};

 	my @suffixes = split /\s+/ , $config{MODULE_SUFFIX};

--- a/Shorewall/configfiles/shorewall.conf
+++ b/Shorewall/configfiles/shorewall.conf
@@ -205,7 +205,7 @@ MARK_IN_FORWARD_CHAIN=No

 MINIUPNPD=No

-MODULE_SUFFIX=ko
+MODULE_SUFFIX="ko ko.xz"

 MULTICAST=No

--- a/Shorewall6/configfiles/shorewall6.conf
+++ b/Shorewall6/configfiles/shorewall6.conf
@@ -190,7 +190,7 @@ MARK_IN_FORWARD_CHAIN=No

 MINIUPNPD=No

-MODULE_SUFFIX=ko
+MODULE_SUFFIX="ko ko.xz"

 MUTEX_TIMEOUT=60

--- a/docs/Shorewall_and_Aliased_Interfaces.xml
+++ b/docs/Shorewall_and_Aliased_Interfaces.xml
@@ -253,7 +253,7 @@ eth0:0                   192.168.1.0/24 206.124.146.178-206.124.146.180</program
      <filename>/etc/shorewall/snat</filename> is:</para>

      <programlisting>#ACTION                              SOURCE          DEST                PROTO   PORT
-SNAT(206.124.146.178-206.24.146.80)  192.168.1.0/24  eth0</programlisting>
+SNAT(206.124.146.178-206.24.146.180)  192.168.1.0/24  eth0</programlisting>

      <para>The above would create three IP addresses:</para>
Author	SHA1	Message	Date
Tom Eastep	3d322d31b7	Add UDP rule to macro.RDP Signed-off-by: Tom Eastep <teastep@shorewall.net>	2017-08-22 08:07:32 -07:00
Tom Eastep	34e4fffd7d	Module suffix changes - Re-order default list in the compiler to match lib.common - MODULE_SUFFIX="ko ko.xz" in standard .conf files. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2017-08-21 12:44:23 -07:00
Tom Eastep	2e98d4375b	Correct check for module already loaded Signed-off-by: Tom Eastep <teastep@shorewall.net>	2017-08-21 10:27:29 -07:00
Tom Eastep	419ff8903b	Invert logic in Shorewall::Chains::delete_reference() - better readability - similar change in Shorewall::Chains::adjust_reference_counts() Signed-off-by: Tom Eastep <teastep@shorewall.net>	2017-08-19 12:25:27 -07:00
Tom Eastep	390ac30be8	Remove a superfluous line of code from Shorewall::Chains::format_rule() Signed-off-by: Tom Eastep <teastep@shorewall.net>	2017-08-19 12:12:54 -07:00
Tom Eastep	8cb98f16ea	Add a comment in Shorewall::Chains::optimize_level8() Signed-off-by: Tom Eastep <teastep@shorewall.net>	2017-08-19 08:08:24 -07:00
Tom Eastep	5a9f179e25	Allow port variables as the server port in DNAT rules Signed-off-by: Tom Eastep <teastep@shorewall.net>	2017-08-16 15:36:18 -07:00
Tom Eastep	d8eca457de	Correct typo in the Aliased Interfaces article. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2017-08-16 08:24:44 -07:00