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
lib/flow: Retain ODPP_NONE on flow_extract().
[sliver-openvswitch.git]
/
tests
/
test-flows.c
diff --git
a/tests/test-flows.c
b/tests/test-flows.c
index
8308bf8
..
a498142
100644
(file)
--- a/
tests/test-flows.c
+++ b/
tests/test-flows.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012
, 2013
Nicira, Inc.
*
* 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.
@@
-48,7
+48,7
@@
main(int argc OVS_UNUSED, char *argv[])
ovs_fatal(errno, "failed to open fd 3 for reading");
}
ovs_fatal(errno, "failed to open fd 3 for reading");
}
- retval = pcap_read_header(pcap);
+ retval =
ovs_
pcap_read_header(pcap);
if (retval) {
ovs_fatal(retval > 0 ? retval : 0, "reading pcap header failed");
}
if (retval) {
ovs_fatal(retval > 0 ? retval : 0, "reading pcap header failed");
}
@@
-58,19
+58,19
@@
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++;
n++;
- retval =
pcap_read(pcap, &packet
);
+ retval =
ovs_pcap_read(pcap, &packet, NULL
);
if (retval == EOF) {
ovs_fatal(0, "unexpected end of file reading pcap file");
} else if (retval) {
ovs_fatal(retval, "error reading pcap file");
}
if (retval == EOF) {
ovs_fatal(0, "unexpected end of file reading pcap file");
} else if (retval) {
ovs_fatal(retval, "error reading pcap file");
}
- in_port_.ofp_port = u16_to_ofp(1);
- flow_extract(packet, 0, 0, NULL, &in_port_, &flow);
- match_init_exact(&match, &flow);
+ flow_extract(packet, NULL, &flow);
+ flow.in_port.ofp_port = u16_to_ofp(1);
+
+ 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)) {