Add TCP SYN/ACK and IP max length matching (#513)

9 files changed, 61 insertions, 2 deletions

diff --git a/lib/Vyatta/Qos/Match.pm b/lib/Vyatta/Qos/Match.pm
index 176748c..c8078b6 100644
--- a/lib/Vyatta/Qos/Match.pm
+++ b/lib/Vyatta/Qos/Match.pm
@@ -67,13 +67,25 @@ sub new {
             my $dst     = $config->returnValue("$af destination address");
             my $sport   = $config->returnValue("$af source port");
             my $dport   = $config->returnValue("$af destination port");
-
+            my $maxlen  = $config->returnValue("$af max-length");
+            my $tcpsyn  = $config->exists("$af tcp syn");
+            my $tcpack  = $config->exists("$af tcp ack");
+        
             $fields{dsfield}  = getDsfield($dsfield) if $dsfield;
             $fields{protocol} = getProtocol($ipprot) if $ipprot;
             $fields{src}      = $src if $src;
             $fields{dst}      = $dst if $dst;
             $fields{sport}    = getPort( $sport, $ipprot ) if $sport;
             $fields{dport}    = getPort( $dport, $ipprot ) if $dport;
+            $fields{maxlen}   = $maxlen if $maxlen;
+            $fields{tcpsyn}   = $tcpsyn;
+            $fields{tcpack}   = $tcpack;
+            
+            # Reject any protocol apart from tcp if tcp syn or tcp ack are set
+            if($tcpsyn or $tcpack) {
+                die "Protocol cannot be different from tcp" if defined $fields{protocol} and $fields{protocol} ne getProtocol('tcp');
+                $fields{protocol} = getProtocol('tcp');
+            }
         }
 
         # if the hash is empty then we didn't generate a match rule 
@@ -141,7 +153,7 @@ sub filter {
             my $type = $$p{protocol};
             $type = 'all' unless $type;
 
-	    print " protocol $type u32";
+	        print " protocol $type u32";
             if ( defined( $$p{src} ) || defined( $$p{dst} ) ) {
                 print " match ether src $$p{src}" if $$p{src};
                 print " match ether dst $$p{dst}" if $$p{dst};
@@ -166,6 +178,37 @@ sub filter {
             print " match $sel sport $$p{sport} 0xffff" if $$p{sport};
             print " match $sel dst $$p{dst}"            if $$p{dst};
             print " match $sel dport $$p{dport} 0xffff" if $$p{dport};
+            # Max Length :
+            # Will match against total length of an IPv4 packet and payload length of an IPv6 packet.
+            # IPv4 : match u16 0x0000 ~MAXLEN at 2
+            # IPv6 : match u16 0x0000 ~MAXLEN at 4
+            if ($$p{maxlen}) {
+                if ( $proto eq 'ip' ) {
+                    printf " match u16 0x0000 %#.4x at 2", (hex('0xFFFF') & ~($$p{maxlen}));
+                } elsif ( $proto eq 'ipv6' ) {
+                    printf " match u16 0x0000 %#.4x at 4", (hex('0xFFFF') & ~($$p{maxlen}));
+                }
+            }
+            # TCP Flags :
+            # Will match against specific TCP flags
+            # We will assume the IPv4 header length is 20 bytes
+            # We will assume the IPv6 packet is not using extension headers (hence a ip header length of 40 bytes)
+            # TCP Flags are set on byte 13 of the TCP header.
+            # IPv4 : match u8 X X at 33
+            # IPv6 : match u8 X X at 53
+            # with X = 0x02 for SYN and X = 0x10 for ACK
+            if ($$p{tcpsyn} or $$p{tcpack}) {
+                # Let's build the binary mask
+                my $mask = 0;
+                $mask |= 0x02 if $$p{tcpsyn};
+                $mask |= 0x10 if $$p{tcpack};
+
+                if ( $proto eq 'ip' ) {
+                    printf " match u8 %#.2x %#.2x at 33", $mask, $mask;
+                } elsif ( $proto eq 'ipv6' ) {
+                    printf " match u8 %#.2x %#.2x at 53", $mask, $mask;
+                }
+            }
         }
 
         print " match mark $fwmark 0xff" if $fwmark;
diff --git a/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/max-length/node.def b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/max-length/node.def
new file mode 100644
index 0000000..35bc356
--- /dev/null
+++ b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/max-length/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Maximum packet length (ipv4)
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; \
+                  "Maximum IPv4 total packet length is 65535"
+val_help: u32:0-65535; Maximum packet/payload length 
diff --git a/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/ack/node.def b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/ack/node.def
new file mode 100644
index 0000000..8ba48e0
--- /dev/null
+++ b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/ack/node.def
@@ -0,0 +1 @@
+help: Match TCP ACK
diff --git a/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/node.def b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/node.def
new file mode 100644
index 0000000..983f832
--- /dev/null
+++ b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/node.def
@@ -0,0 +1 @@
+help: TCP Flags matching
diff --git a/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/syn/node.def b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/syn/node.def
new file mode 100644
index 0000000..f6b37dc
--- /dev/null
+++ b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ip/tcp/syn/node.def
@@ -0,0 +1 @@
+help: Match TCP SYN
diff --git a/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/max-length/node.def b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/max-length/node.def
new file mode 100644
index 0000000..8e4416f
--- /dev/null
+++ b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/max-length/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Maximum payload length
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; \
+                  "Maximum payload length must be >= 0 and < 65535"
+val_help: u32:0-65535; Maximum packet/payload length 
diff --git a/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/ack/node.def b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/ack/node.def
new file mode 100644
index 0000000..8ba48e0
--- /dev/null
+++ b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/ack/node.def
@@ -0,0 +1 @@
+help: Match TCP ACK
diff --git a/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/node.def b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/node.def
new file mode 100644
index 0000000..983f832
--- /dev/null
+++ b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/node.def
@@ -0,0 +1 @@
+help: TCP Flags matching
diff --git a/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/syn/node.def b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/syn/node.def
new file mode 100644
index 0000000..f6b37dc
--- /dev/null
+++ b/templates-skeleton/qos-match-templates/class/node.tag/match/node.tag/ipv6/tcp/syn/node.def
@@ -0,0 +1 @@
+help: Match TCP SYN