projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: Abstract "features" interface away from OpenFlow 1.0.
[openvswitch]
/
tests
/
test-vconn.c
diff --git
a/tests/test-vconn.c
b/tests/test-vconn.c
index adddc682d1770af602901f386e2a618f5e0658a4..8dfc1e43708e3421d7b5f72f0f0b57a3c9304305 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.
@@
-22,6
+22,7
@@
#include <stdlib.h>
#include <unistd.h>
#include "command-line.h"
#include <stdlib.h>
#include <unistd.h>
#include "command-line.h"
+#include "openflow/openflow.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "stream.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "stream.h"
@@
-146,7
+147,7
@@
test_refuse_connection(int argc OVS_UNUSED, char *argv[])
: EPROTO);
fpv_create(type, &fpv);
: EPROTO);
fpv_create(type, &fpv);
- CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP
10
_VERSION, &vconn), 0);
fpv_close(&fpv);
vconn_run(vconn);
CHECK_ERRNO(vconn_connect(vconn), expected_error);
fpv_close(&fpv);
vconn_run(vconn);
CHECK_ERRNO(vconn_connect(vconn), expected_error);
@@
-170,7
+171,7
@@
test_accept_then_close(int argc OVS_UNUSED, char *argv[])
: EPROTO);
fpv_create(type, &fpv);
: EPROTO);
fpv_create(type, &fpv);
- CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP
10
_VERSION, &vconn), 0);
vconn_run(vconn);
stream_close(fpv_accept(&fpv));
fpv_close(&fpv);
vconn_run(vconn);
stream_close(fpv_accept(&fpv));
fpv_close(&fpv);
@@
-191,7
+192,7
@@
test_read_hello(int argc OVS_UNUSED, char *argv[])
struct stream *stream;
fpv_create(type, &fpv);
struct stream *stream;
fpv_create(type, &fpv);
- CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP
10
_VERSION, &vconn), 0);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
@@
-201,9
+202,9
@@
test_read_hello(int argc OVS_UNUSED, char *argv[])
retval = stream_recv(stream, &hello, sizeof hello);
if (retval == sizeof hello) {
retval = stream_recv(stream, &hello, sizeof hello);
if (retval == sizeof hello) {
- CHECK(hello.version, OFP_VERSION);
+ CHECK(hello.version, OFP
10
_VERSION);
CHECK(hello.type, OFPT_HELLO);
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);
@@
-237,7
+238,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, OFP_VERSION, &vconn), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP
10
_VERSION, &vconn), 0);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
@@
-267,9
+268,9
@@
test_send_hello(const char *type, const void *out, size_t out_size,
struct ofp_header hello;
int retval = stream_recv(stream, &hello, sizeof hello);
if (retval == sizeof hello) {
struct ofp_header hello;
int retval = stream_recv(stream, &hello, sizeof hello);
if (retval == sizeof hello) {
- CHECK(hello.version, OFP_VERSION);
+ CHECK(hello.version, OFP
10
_VERSION);
CHECK(hello.type, OFPT_HELLO);
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);
@@
-317,7
+318,7
@@
test_send_plain_hello(int argc OVS_UNUSED, char *argv[])
const char *type = argv[1];
struct ofp_header hello;
const char *type = argv[1];
struct ofp_header hello;
- hello.version = OFP_VERSION;
+ hello.version = OFP
10
_VERSION;
hello.type = OFPT_HELLO;
hello.length = htons(sizeof hello);
hello.xid = htonl(0x12345678);
hello.type = OFPT_HELLO;
hello.length = htons(sizeof hello);
hello.xid = htonl(0x12345678);
@@
-334,7
+335,7
@@
test_send_long_hello(int argc OVS_UNUSED, char *argv[])
struct ofp_header hello;
char buffer[sizeof hello * 2];
struct ofp_header hello;
char buffer[sizeof hello * 2];
- hello.version = OFP_VERSION;
+ hello.version = OFP
10
_VERSION;
hello.type = OFPT_HELLO;
hello.length = htons(sizeof buffer);
hello.xid = htonl(0x12345678);
hello.type = OFPT_HELLO;
hello.length = htons(sizeof buffer);
hello.xid = htonl(0x12345678);
@@
-351,7
+352,7
@@
test_send_echo_hello(int argc OVS_UNUSED, char *argv[])
const char *type = argv[1];
struct ofp_header echo;
const char *type = argv[1];
struct ofp_header echo;
- echo.version = OFP_VERSION;
+ echo.version = OFP
10
_VERSION;
echo.type = OFPT_ECHO_REQUEST;
echo.length = htons(sizeof echo);
echo.xid = htonl(0x89abcdef);
echo.type = OFPT_ECHO_REQUEST;
echo.length = htons(sizeof echo);
echo.xid = htonl(0x89abcdef);
@@
-378,7
+379,7
@@
test_send_invalid_version_hello(int argc OVS_UNUSED, char *argv[])
const char *type = argv[1];
struct ofp_header hello;
const char *type = argv[1];
struct ofp_header hello;
- hello.version = OFP_VERSION - 1;
+ hello.version = OFP
10
_VERSION - 1;
hello.type = OFPT_HELLO;
hello.length = htons(sizeof hello);
hello.xid = htonl(0x12345678);
hello.type = OFPT_HELLO;
hello.length = htons(sizeof hello);
hello.xid = htonl(0x12345678);
@@
-401,10
+402,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);