Allow text string for IP port match

This allows use of IANA (/etc/services) values for port names:
example:
   traffic-policy shaper SS {
       class 2 {
         match SMTP ip destination port smtp
       }
   }

13 files changed, 93 insertions, 59 deletions

diff --git a/lib/Vyatta/Qos/Match.pm b/lib/Vyatta/Qos/Match.pm
index cb5d4ff..a3842f6 100644
--- a/lib/Vyatta/Qos/Match.pm
+++ b/lib/Vyatta/Qos/Match.pm
@@ -20,40 +20,56 @@ use Vyatta::Qos::Util qw(getIfIndex getDsfield getProtocol);
 use strict;
 use warnings;
 
+sub getPort {
+    my ($str, $proto) = @_;
+    return unless defined($str);
+
+    if ( $str =~ /^([0-9]+)|(0x[0-9a-fA-F]+)$/ ) {
+	die "$str is not a valid port number\n"
+	    if ( $str <= 0 || $str > 65535 );
+        return $str;
+    }
+  
+    $proto = "tcp" unless $proto;
+    my $port = getservbyname($str, $proto);
+    die "$str unknown $proto port name\n" unless $port;
+
+    return $port;
+}
+
 sub new {
     my ( $that, $config ) = @_;
     my $self = {};
     my $class = ref($that) || $that;
-    my $ptype;
+    my $lastaf;
 
     bless $self, $class;
 
-    foreach my $proto (qw(ip ipv6 ether)) {
-        next unless $config->exists($proto);
+    foreach my $af (qw(ip ipv6 ether)) {
+        next unless $config->exists($af);
 
         my %fields;
 
-        if ( $proto eq 'ether' ) {
+        if ( $af eq 'ether' ) {
             $fields{protocol} = $config->returnValue("ether protocol");
             $fields{src} = $config->returnValue("ether source");
             $fields{dst} = $config->returnValue("ether destination");
         } else {
             $fields{dsfield} =
-              getDsfield( $config->returnValue("$proto dscp") );
-            $fields{protocol} =
-              getProtocol( $config->returnValue("$proto protocol") );
-            $fields{src}   = $config->returnValue("$proto source address");
-            $fields{dst}   = $config->returnValue("$proto destination address");
-            $fields{sport} = $config->returnValue("$proto source port");
-            $fields{dport} = $config->returnValue("$proto destination port");
+              getDsfield( $config->returnValue("$af dscp") );
+	    my $ipprot = $config->returnValue("$af protocol");
+            $fields{protocol} = getProtocol($ipprot);
+            $fields{src}   = $config->returnValue("$af source address");
+            $fields{dst}   = $config->returnValue("$af destination address");
+            $fields{sport} = getPort($config->returnValue("$af source port"), $ipprot);
+            $fields{dport} = getPort($config->returnValue("$af destination port"), $ipprot);
         }
 
-        $self->{$proto} = \%fields;
+        $self->{$af} = \%fields;
 
-	my $other = $ptype;
-	die "Can not match on both $proto and $other protocol in same match\n"
-	    if $other;
-	$ptype = $other;
+	die "Can not match on both $af and $lastaf protocol in same match\n"
+	    if $lastaf;
+	$lastaf = $af;
     }
 
     my $vif = $config->returnValue("vif");
@@ -65,7 +81,7 @@ sub new {
     my $fwmark = $config->returnValue("mark");
     $self->{_fwmark} = $fwmark;
 
-    if ($ptype) {
+    if ($lastaf) {
 	die "Can not combine protocol and vlan tag match\n"
 	    if ($vif);
 	die "Can not combine protocol and interface match\n"
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
index c067ef4..4b221ba 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -1,4 +1,5 @@
-type: u32
+type: txt
 help: IP destination port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
index 89c241e..ad5e485 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -1,4 +1,6 @@
-type: u32
+type: txt
 help: IP source port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
+
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
index c067ef4..6fb393e 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
@@ -1,4 +1,5 @@
-type: u32
-help: IP destination port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+type: txt
+help: IPv6 destination port for this match
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
index 89c241e..f305799 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -1,4 +1,6 @@
-type: u32
-help: IP source port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+type: txt
+help: IPv6 source port for this match
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
+
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
index c067ef4..4b221ba 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -1,4 +1,5 @@
-type: u32
+type: txt
 help: IP destination port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
index 89c241e..ad5e485 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -1,4 +1,6 @@
-type: u32
+type: txt
 help: IP source port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
+
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
index c067ef4..6fb393e 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
@@ -1,4 +1,5 @@
-type: u32
-help: IP destination port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+type: txt
+help: IPv6 destination port for this match
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
index 89c241e..f305799 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -1,4 +1,6 @@
-type: u32
-help: IP source port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+type: txt
+help: IPv6 source port for this match
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
+
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
index c067ef4..4b221ba 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -1,4 +1,5 @@
-type: u32
+type: txt
 help: IP destination port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
index 89c241e..ad5e485 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -1,4 +1,6 @@
-type: u32
+type: txt
 help: IP source port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
+
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
index c067ef4..6fb393e 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
@@ -1,4 +1,5 @@
-type: u32
-help: IP destination port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+type: txt
+help: IPv6 destination port for this match
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
index 89c241e..f305799 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -1,4 +1,6 @@
-type: u32
-help: IP source port for this match
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
-val_help:<1-65535>; IP port
+type: txt
+help: IPv6 source port for this match
+
+val_help: u32:1-65535>; Numeric IP port
+val_help: txt; Assigned IP port name
+