projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-client: Refactor table code to save original json during formatting.
[openvswitch]
/
tests
/
test-flows.c
diff --git
a/tests/test-flows.c
b/tests/test-flows.c
index 451ca1ad0ea5f8e1c72d9a2ac8d118a32632845f..a4649b3f81de1e38202eecaec5454b4cbebf465f 100644
(file)
--- a/
tests/test-flows.c
+++ b/
tests/test-flows.c
@@
-39,8
+39,6
@@
main(int argc OVS_UNUSED, char *argv[])
int n = 0, errors = 0;
set_program_name(argv[0]);
int n = 0, errors = 0;
set_program_name(argv[0]);
- time_init();
- vlog_init();
flows = stdin;
pcap = fdopen(3, "rb");
flows = stdin;
pcap = fdopen(3, "rb");
@@
-56,7
+54,7
@@
main(int argc OVS_UNUSED, char *argv[])
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
struct ofp_match extracted_match;
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
struct ofp_match extracted_match;
-
flow_t
flow;
+
struct flow
flow;
n++;
n++;
@@
-67,8
+65,8
@@
main(int argc OVS_UNUSED, char *argv[])
ovs_fatal(retval, "error reading pcap file");
}
ovs_fatal(retval, "error reading pcap file");
}
- flow_extract(packet, 1, &flow);
- flow_to_match(&flow, 0, &extracted_match);
+ flow_extract(packet,
0,
1, &flow);
+ flow_to_match(&flow, 0,
false,
&extracted_match);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
char *exp_s = ofp_match_to_string(&expected_match, 2);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
char *exp_s = ofp_match_to_string(&expected_match, 2);
@@
-77,6
+75,7
@@
main(int argc OVS_UNUSED, char *argv[])
printf("mismatch on packet #%d (1-based).\n", n);
printf("Packet:\n");
ofp_print_packet(stdout, packet->data, packet->size, packet->size);
printf("mismatch on packet #%d (1-based).\n", n);
printf("Packet:\n");
ofp_print_packet(stdout, packet->data, packet->size, packet->size);
+ ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
printf("Expected flow:\n%s\n", exp_s);
printf("Actually extracted flow:\n%s\n", got_s);
printf("\n");
printf("Expected flow:\n%s\n", exp_s);
printf("Actually extracted flow:\n%s\n", got_s);
printf("\n");