X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fflowgen.pl;h=a14faa7093b89ac93b6dc62408fbb5d0cd2fd1ab;hb=d785193ad9989b429ea4c6931af9da7f4edf60ec;hp=bbb6f11d42bc34e005f6a1dd36b18238fab59a47;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=openvswitch

diff --git a/tests/flowgen.pl b/tests/flowgen.pl
index bbb6f11d..a14faa70 100755
--- a/tests/flowgen.pl
+++ b/tests/flowgen.pl
@@ -111,6 +111,10 @@ sub output {
     my $packet = '';
     $packet .= pack_ethaddr($flow{DL_DST});
     $packet .= pack_ethaddr($flow{DL_SRC});
+    if ($flow{DL_VLAN} != 0xffff) {
+        $packet .= pack('nn', 0x8100, $flow{DL_VLAN});
+    }
+    my $len_ofs = length($packet);
     $packet .= pack('n', 0) if $attrs{DL_HEADER} =~ /^802.2/;
     if ($attrs{DL_HEADER} eq '802.2') {
         $packet .= pack('CCC', 0x42, 0x42, 0x03); # LLC for 802.1D STP.
@@ -119,9 +123,6 @@ sub output {
             $packet .= pack('CCC', 0xaa, 0xaa, 0x03); # LLC for SNAP.
             $packet .= pack('CCC', 0, 0, 0);          # SNAP OUI.
         }
-        if ($attrs{DL_VLAN} ne 'none') {
-            $packet .= pack('nn', 0x8100, $flow{DL_VLAN});
-        }
         $packet .= pack('n', $flow{DL_TYPE});
         if ($attrs{DL_TYPE} eq 'ip') {
             my $ip = pack('CCnnnCCnNN',
@@ -193,8 +194,11 @@ sub output {
             $packet .= $ip;
         }
     }
-    substr($packet, 12, 2) = pack('n', length($packet))
-      if $attrs{DL_HEADER} =~ /^802.2/;
+    if ($attrs{DL_HEADER} =~ /^802.2/) {
+        my $len = length ($packet);
+        $len -= 4 if $flow{DL_VLAN} != 0xffff;
+        substr($packet, $len_ofs, 2) = pack('n', $len);
+    }
 
     print join(' ', map("$_=$attrs{$_}", keys(%attrs))), "\n";
     print join(' ', map("$_=$flow{$_}", keys(%flow))), "\n";