git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Match on IP ToS/DSCP bits (OpenFlow 1.0)
[sliver-openvswitch.git]
/
tests
/
flowgen.pl
diff --git
a/tests/flowgen.pl
b/tests/flowgen.pl
index
74738d2
..
bbb6f11
100755
(executable)
--- a/
tests/flowgen.pl
+++ b/
tests/flowgen.pl
@@
-1,6
+1,6
@@
#! /usr/bin/perl
#! /usr/bin/perl
-# Copyright (c) 2009 Nicira Networks.
+# Copyright (c) 2009
, 2010
Nicira Networks.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-60,6
+60,7
@@
sub output {
$flow{DL_SRC} = "00:02:e3:0f:80:a4";
$flow{DL_DST} = "00:1a:92:40:ac:05";
$flow{NW_PROTO} = 0;
$flow{DL_SRC} = "00:02:e3:0f:80:a4";
$flow{DL_DST} = "00:1a:92:40:ac:05";
$flow{NW_PROTO} = 0;
+ $flow{NW_TOS} = 0;
$flow{NW_SRC} = '0.0.0.0';
$flow{NW_DST} = '0.0.0.0';
$flow{TP_SRC} = 0;
$flow{NW_SRC} = '0.0.0.0';
$flow{NW_DST} = '0.0.0.0';
$flow{TP_SRC} = 0;
@@
-78,6
+79,7
@@
sub output {
$flow{DL_TYPE} = 0x0800; # ETH_TYPE_IP
$flow{NW_SRC} = '10.0.2.15';
$flow{NW_DST} = '192.168.1.20';
$flow{DL_TYPE} = 0x0800; # ETH_TYPE_IP
$flow{NW_SRC} = '10.0.2.15';
$flow{NW_DST} = '192.168.1.20';
+ $flow{NW_TOS} = 44;
if ($attrs{TP_PROTO} eq 'other') {
$flow{NW_PROTO} = 42;
} elsif ($attrs{TP_PROTO} eq 'TCP' ||
if ($attrs{TP_PROTO} eq 'other') {
$flow{NW_PROTO} = 42;
} elsif ($attrs{TP_PROTO} eq 'TCP' ||
@@
-124,7
+126,7
@@
sub output {
if ($attrs{DL_TYPE} eq 'ip') {
my $ip = pack('CCnnnCCnNN',
(4 << 4) | 5, # version, hdrlen
if ($attrs{DL_TYPE} eq 'ip') {
my $ip = pack('CCnnnCCnNN',
(4 << 4) | 5, # version, hdrlen
-
0,
# type of service
+
$flow{NW_TOS},
# type of service
0, # total length (filled in later)
65432, # id
0, # frag offset
0, # total length (filled in later)
65432, # id
0, # frag offset
@@
-203,10
+205,11
@@
sub output {
1); # in_port
print FLOWS pack_ethaddr($flow{DL_SRC});
print FLOWS pack_ethaddr($flow{DL_DST});
1); # in_port
print FLOWS pack_ethaddr($flow{DL_SRC});
print FLOWS pack_ethaddr($flow{DL_DST});
- print FLOWS pack('nCxnC
x
xxNNnn',
+ print FLOWS pack('nCxnC
C
xxNNnn',
$flow{DL_VLAN},
0, # DL_VLAN_PCP
$flow{DL_TYPE},
$flow{DL_VLAN},
0, # DL_VLAN_PCP
$flow{DL_TYPE},
+ $flow{NW_TOS},
$flow{NW_PROTO},
inet_aton($flow{NW_SRC}),
inet_aton($flow{NW_DST}),
$flow{NW_PROTO},
inet_aton($flow{NW_SRC}),
inet_aton($flow{NW_DST}),