/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
#include <config.h>
+#undef NDEBUG
#include "vconn.h"
+#include <assert.h>
#include <errno.h>
#include <inttypes.h>
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
#include "command-line.h"
+#include "fatal-signal.h"
#include "ofp-msgs.h"
#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
+#include "ovstest.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "stream.h"
#include "stream-ssl.h"
#include "timeval.h"
#include "util.h"
-#include "vlog.h"
-
-#undef NDEBUG
-#include <assert.h>
+#include "openvswitch/vlog.h"
struct fake_pvconn {
const char *type;
check_errno(int a, int b, const char *as, const char *file, int line)
{
if (a != b) {
- char *str_b = strdup(strerror(abs(b)));
+ char *str_b = xstrdup(ovs_strerror(abs(b)));
ovs_fatal(0, "%s:%d: %s is %d (%s) but should be %d (%s)",
- file, line, as, a, strerror(abs(a)), b, str_b);
+ file, line, as, a, ovs_strerror(abs(a)), b, str_b);
}
}
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);
error = vconn_connect_block(vconn);
if (!strcmp(type, "tcp")) {
- if (error != ECONNRESET && error != EPIPE) {
+ if (error != ECONNRESET && error != EPIPE
+#ifdef _WIN32
+ && error != WSAECONNRESET
+#endif
+ ) {
ovs_fatal(0, "unexpected vconn_connect() return value %d (%s)",
- error, strerror(error));
+ error, ovs_strerror(error));
}
} else if (!strcmp(type, "unix")) {
+#ifndef _WIN32
CHECK_ERRNO(error, EPIPE);
+#else
+ CHECK_ERRNO(error, WSAECONNRESET);
+#endif
} else if (!strcmp(type, "ssl")) {
if (error != EPROTO && error != ECONNRESET) {
ovs_fatal(0, "unexpected vconn_connect() return value %d (%s)",
- error, strerror(error));
+ error, ovs_strerror(error));
}
} else {
ovs_fatal(0, "invalid connection type %s", type);
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);
error = vconn_connect_block(vconn);
if (!strcmp(type, "tcp") || !strcmp(type, "unix")) {
- if (error != ECONNRESET && error != EPIPE) {
+ if (error != ECONNRESET && error != EPIPE
+#ifdef _WIN32
+ && error != WSAECONNRESET
+#endif
+ ) {
ovs_fatal(0, "unexpected vconn_connect() return value %d (%s)",
- error, strerror(error));
+ error, ovs_strerror(error));
}
} else {
CHECK_ERRNO(error, EPROTO);
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);
if (retval == sizeof hello) {
enum ofpraw raw;
- CHECK(hello.version, OFP10_VERSION);
+ CHECK(hello.version, OFP13_VERSION);
CHECK(ofpraw_decode_partial(&raw, &hello, sizeof hello), 0);
CHECK(raw, OFPRAW_OFPT_HELLO);
CHECK(ntohs(hello.length), sizeof hello);
error = vconn_connect_block(vconn);
if (error != ECONNRESET && error != EPIPE) {
ovs_fatal(0, "unexpected vconn_connect() return value %d (%s)",
- error, strerror(error));
+ error, ovs_strerror(error));
}
vconn_close(vconn);
}
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);
if (retval == sizeof hello) {
enum ofpraw raw;
- CHECK(hello.version, OFP10_VERSION);
+ CHECK(hello.version, OFP13_VERSION);
CHECK(ofpraw_decode_partial(&raw, &hello, sizeof hello), 0);
CHECK(raw, OFPRAW_OFPT_HELLO);
CHECK(ntohs(hello.length), sizeof hello);
const char *type = argv[1];
struct ofpbuf *hello;
- hello = ofpraw_alloc_xid(OFPRAW_OFPT_HELLO, OFP10_VERSION,
+ hello = ofpraw_alloc_xid(OFPRAW_OFPT_HELLO, OFP13_VERSION,
htonl(0x12345678), 0);
- test_send_hello(type, hello->data, hello->size, 0);
+ test_send_hello(type, ofpbuf_data(hello), ofpbuf_size(hello), 0);
ofpbuf_delete(hello);
}
struct ofpbuf *hello;
enum { EXTRA_BYTES = 8 };
- hello = ofpraw_alloc_xid(OFPRAW_OFPT_HELLO, OFP10_VERSION,
+ hello = ofpraw_alloc_xid(OFPRAW_OFPT_HELLO, OFP13_VERSION,
htonl(0x12345678), EXTRA_BYTES);
ofpbuf_put_zeros(hello, EXTRA_BYTES);
ofpmsg_update_length(hello);
- test_send_hello(type, hello->data, hello->size, 0);
+ test_send_hello(type, ofpbuf_data(hello), ofpbuf_size(hello), 0);
ofpbuf_delete(hello);
}
const char *type = argv[1];
struct ofpbuf *echo;
- echo = ofpraw_alloc_xid(OFPRAW_OFPT_ECHO_REQUEST, OFP10_VERSION,
+ echo = ofpraw_alloc_xid(OFPRAW_OFPT_ECHO_REQUEST, OFP13_VERSION,
htonl(0x12345678), 0);
- test_send_hello(type, echo->data, echo->size, EPROTO);
+ test_send_hello(type, ofpbuf_data(echo), ofpbuf_size(echo), EPROTO);
ofpbuf_delete(echo);
}
const char *type = argv[1];
struct ofpbuf *hello;
- hello = ofpraw_alloc_xid(OFPRAW_OFPT_HELLO, OFP10_VERSION,
+ hello = ofpraw_alloc_xid(OFPRAW_OFPT_HELLO, OFP13_VERSION,
htonl(0x12345678), 0);
- ((struct ofp_header *) hello->data)->version = 0;
- test_send_hello(type, hello->data, hello->size, EPROTO);
+ ((struct ofp_header *) ofpbuf_data(hello))->version = 0;
+ test_send_hello(type, ofpbuf_data(hello), ofpbuf_size(hello), EPROTO);
ofpbuf_delete(hello);
}
static const struct command commands[] = {
- {"refuse-connection", 1, 1, test_refuse_connection},
- {"accept-then-close", 1, 1, test_accept_then_close},
- {"read-hello", 1, 1, test_read_hello},
- {"send-plain-hello", 1, 1, test_send_plain_hello},
- {"send-long-hello", 1, 1, test_send_long_hello},
- {"send-echo-hello", 1, 1, test_send_echo_hello},
- {"send-short-hello", 1, 1, test_send_short_hello},
- {"send-invalid-version-hello", 1, 1, test_send_invalid_version_hello},
- {NULL, 0, 0, NULL},
+ {"refuse-connection", NULL, 1, 1, test_refuse_connection},
+ {"accept-then-close", NULL, 1, 1, test_accept_then_close},
+ {"read-hello", NULL, 1, 1, test_read_hello},
+ {"send-plain-hello", NULL, 1, 1, test_send_plain_hello},
+ {"send-long-hello", NULL, 1, 1, test_send_long_hello},
+ {"send-echo-hello", NULL, 1, 1, test_send_echo_hello},
+ {"send-short-hello", NULL, 1, 1, test_send_short_hello},
+ {"send-invalid-version-hello", NULL, 1, 1, test_send_invalid_version_hello},
+ {NULL, NULL, 0, 0, NULL},
};
-int
-main(int argc, char *argv[])
+static void
+test_vconn_main(int argc, char *argv[])
{
set_program_name(argv[0]);
vlog_set_levels(NULL, VLF_ANY_FACILITY, VLL_EMER);
vlog_set_levels(NULL, VLF_CONSOLE, VLL_DBG);
- signal(SIGPIPE, SIG_IGN);
+ fatal_ignore_sigpipe();
time_alarm(10);
run_command(argc - 1, argv + 1, commands);
-
- return 0;
}
+
+OVSTEST_REGISTER("test-vconn", test_vconn_main);
projects / cascardo / ovs.git / blobdiff