projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vlog: Fix logic error in update_min_level().
[openvswitch]
/
tests
/
test-flows.c
diff --git
a/tests/test-flows.c
b/tests/test-flows.c
index 6e0b773670db02ef7597186d3e4f996f8fca5e00..be401edf95b5b780116a22993b01dd914da59653 100644
(file)
--- a/
tests/test-flows.c
+++ b/
tests/test-flows.c
@@
-1,5
+1,5
@@
/*
/*
- * 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.
@@
-31,7
+31,7
@@
#include <assert.h>
int
#include <assert.h>
int
-main(int argc UNUSED, char *argv[])
+main(int argc
OVS_
UNUSED, char *argv[])
{
struct ofp_match expected_match;
FILE *flows, *pcap;
{
struct ofp_match expected_match;
FILE *flows, *pcap;
@@
-39,8
+39,6
@@
main(int argc 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");
@@
-67,8
+65,8
@@
main(int argc 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);