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 'master' of git://openvswitch.org/openvswitch
[sliver-openvswitch.git]
/
tests
/
test-vconn.c
diff --git
a/tests/test-vconn.c
b/tests/test-vconn.c
index
0b2b063
..
1e4e787
100644
(file)
--- a/
tests/test-vconn.c
+++ b/
tests/test-vconn.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.
@@
-148,8
+148,7
@@
test_refuse_connection(int argc OVS_UNUSED, char *argv[])
int error;
fpv_create(type, &fpv);
int error;
fpv_create(type, &fpv);
- CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn,
- DSCP_DEFAULT), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, 0, DSCP_DEFAULT, &vconn), 0);
fpv_close(&fpv);
vconn_run(vconn);
fpv_close(&fpv);
vconn_run(vconn);
@@
-186,8
+185,7
@@
test_accept_then_close(int argc OVS_UNUSED, char *argv[])
int error;
fpv_create(type, &fpv);
int error;
fpv_create(type, &fpv);
- CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn,
- DSCP_DEFAULT), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, 0, DSCP_DEFAULT, &vconn), 0);
vconn_run(vconn);
stream_close(fpv_accept(&fpv));
fpv_close(&fpv);
vconn_run(vconn);
stream_close(fpv_accept(&fpv));
fpv_close(&fpv);
@@
-219,8
+217,7
@@
test_read_hello(int argc OVS_UNUSED, char *argv[])
int error;
fpv_create(type, &fpv);
int error;
fpv_create(type, &fpv);
- CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn,
- DSCP_DEFAULT), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, 0, DSCP_DEFAULT, &vconn), 0);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
@@
-273,8
+270,7
@@
test_send_hello(const char *type, const void *out, size_t out_size,
size_t n_sent;
fpv_create(type, &fpv);
size_t n_sent;
fpv_create(type, &fpv);
- CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn,
- DSCP_DEFAULT), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, 0, DSCP_DEFAULT, &vconn), 0);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);