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
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
tests
/
test-flows.c
diff --git
a/tests/test-flows.c
b/tests/test-flows.c
index
a40709a
..
6528b07
100644
(file)
--- a/
tests/test-flows.c
+++ b/
tests/test-flows.c
@@
-25,7
+25,7
@@
#include "ofpbuf.h"
#include "ofp-print.h"
#include "ofp-util.h"
#include "ofpbuf.h"
#include "ofp-print.h"
#include "ofp-util.h"
-#include "pcap.h"
+#include "pcap
-file
.h"
#include "util.h"
#include "vlog.h"
#include "util.h"
#include "vlog.h"
@@
-58,7
+58,7
@@
main(int argc OVS_UNUSED, char *argv[])
struct ofp10_match extracted_match;
struct match match;
struct flow flow;
struct ofp10_match extracted_match;
struct match match;
struct flow flow;
-
+ union flow_in_port in_port_;
n++;
retval = pcap_read(pcap, &packet);
n++;
retval = pcap_read(pcap, &packet);
@@
-68,8
+68,9
@@
main(int argc OVS_UNUSED, char *argv[])
ovs_fatal(retval, "error reading pcap file");
}
ovs_fatal(retval, "error reading pcap file");
}
- flow_extract(packet, 0, NULL, 1, &flow);
- match_init_exact(&match, &flow);
+ in_port_.ofp_port = u16_to_ofp(1);
+ flow_extract(packet, 0, 0, NULL, &in_port_, &flow);
+ match_wc_init(&match, &flow);
ofputil_match_to_ofp10_match(&match, &extracted_match);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
ofputil_match_to_ofp10_match(&match, &extracted_match);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {