projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs.stream: Simplify logic in Stream.wait().
[openvswitch]
/
tests
/
test-vconn.c
diff --git
a/tests/test-vconn.c
b/tests/test-vconn.c
index 265bdecb5e7e6acd2116ba390ab3969a95cdeadd..2b14fa85d1858d873d32d1d034ef4bcbfbff69a4 100644
(file)
--- a/
tests/test-vconn.c
+++ b/
tests/test-vconn.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010
, 2011
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.
@@
-141,7
+141,9
@@
test_refuse_connection(int argc OVS_UNUSED, char *argv[])
struct fake_pvconn fpv;
struct vconn *vconn;
struct fake_pvconn fpv;
struct vconn *vconn;
- expected_error = !strcmp(type, "unix") ? EPIPE : ECONNRESET;
+ expected_error = (!strcmp(type, "unix") ? EPIPE
+ : !strcmp(type, "tcp") ? ECONNRESET
+ : EPROTO);
fpv_create(type, &fpv);
CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
fpv_create(type, &fpv);
CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
@@
-201,7
+203,7
@@
test_read_hello(int argc OVS_UNUSED, char *argv[])
if (retval == sizeof hello) {
CHECK(hello.version, OFP_VERSION);
CHECK(hello.type, OFPT_HELLO);
if (retval == sizeof hello) {
CHECK(hello.version, OFP_VERSION);
CHECK(hello.type, OFPT_HELLO);
- CHECK(
hello.length, htons(sizeof hello)
);
+ CHECK(
ntohs(hello.length), sizeof hello
);
break;
} else {
CHECK_ERRNO(retval, -EAGAIN);
break;
} else {
CHECK_ERRNO(retval, -EAGAIN);
@@
-267,7
+269,7
@@
test_send_hello(const char *type, const void *out, size_t out_size,
if (retval == sizeof hello) {
CHECK(hello.version, OFP_VERSION);
CHECK(hello.type, OFPT_HELLO);
if (retval == sizeof hello) {
CHECK(hello.version, OFP_VERSION);
CHECK(hello.type, OFPT_HELLO);
- CHECK(
hello.length, htons(sizeof hello)
);
+ CHECK(
ntohs(hello.length), sizeof hello
);
read_hello = true;
} else {
CHECK_ERRNO(retval, -EAGAIN);
read_hello = true;
} else {
CHECK_ERRNO(retval, -EAGAIN);
@@
-399,10
+401,8
@@
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
main(int argc, char *argv[])
{
set_program_name(argv[0]);
- time_init();
- vlog_init();
- vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_EMER);
- vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_DBG);
+ vlog_set_levels(NULL, VLF_ANY_FACILITY, VLL_EMER);
+ vlog_set_levels(NULL, VLF_CONSOLE, VLL_DBG);
signal(SIGPIPE, SIG_IGN);
time_alarm(10);
signal(SIGPIPE, SIG_IGN);
time_alarm(10);