/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 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 <stdlib.h>
#include <unistd.h>
#include "command-line.h"
+#include "openflow/openflow.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "stream.h"
bind_path = xasprintf("fake-pvconn.%d", unix_count++);
fpv->pvconn_name = xasprintf("punix:%s", bind_path);
fpv->vconn_name = xasprintf("unix:%s", bind_path);
- CHECK_ERRNO(pstream_open(fpv->pvconn_name, &fpv->pstream), 0);
+ CHECK_ERRNO(pstream_open(fpv->pvconn_name, &fpv->pstream,
+ DSCP_DEFAULT), 0);
free(bind_path);
} else if (!strcmp(type, "tcp") || !strcmp(type, "ssl")) {
char *s, *port, *save_ptr = NULL;
char *open_name;
open_name = xasprintf("p%s:0:127.0.0.1", type);
- CHECK_ERRNO(pstream_open(open_name, &fpv->pstream), 0);
+ CHECK_ERRNO(pstream_open(open_name, &fpv->pstream, DSCP_DEFAULT), 0);
/* Extract bound port number from pstream name. */
s = xstrdup(pstream_get_name(fpv->pstream));
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);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn,
+ DSCP_DEFAULT), 0);
fpv_close(&fpv);
vconn_run(vconn);
CHECK_ERRNO(vconn_connect(vconn), expected_error);
: EPROTO);
fpv_create(type, &fpv);
- CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
+ CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP10_VERSION, &vconn,
+ DSCP_DEFAULT), 0);
vconn_run(vconn);
stream_close(fpv_accept(&fpv));
fpv_close(&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, OFP10_VERSION, &vconn,
+ DSCP_DEFAULT), 0);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
retval = stream_recv(stream, &hello, sizeof hello);
if (retval == sizeof hello) {
- CHECK(hello.version, OFP_VERSION);
+ CHECK(hello.version, OFP10_VERSION);
CHECK(hello.type, OFPT_HELLO);
- CHECK(hello.length, htons(sizeof hello));
+ CHECK(ntohs(hello.length), sizeof hello);
break;
} else {
CHECK_ERRNO(retval, -EAGAIN);
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, OFP10_VERSION, &vconn,
+ DSCP_DEFAULT), 0);
vconn_run(vconn);
stream = fpv_accept(&fpv);
fpv_destroy(&fpv);
struct ofp_header hello;
int retval = stream_recv(stream, &hello, sizeof hello);
if (retval == sizeof hello) {
- CHECK(hello.version, OFP_VERSION);
+ CHECK(hello.version, OFP10_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);
const char *type = argv[1];
struct ofp_header hello;
- hello.version = OFP_VERSION;
+ hello.version = OFP10_VERSION;
hello.type = OFPT_HELLO;
hello.length = htons(sizeof hello);
hello.xid = htonl(0x12345678);
struct ofp_header hello;
char buffer[sizeof hello * 2];
- hello.version = OFP_VERSION;
+ hello.version = OFP10_VERSION;
hello.type = OFPT_HELLO;
hello.length = htons(sizeof buffer);
hello.xid = htonl(0x12345678);
const char *type = argv[1];
struct ofp_header echo;
- echo.version = OFP_VERSION;
+ echo.version = OFP10_VERSION;
echo.type = OFPT_ECHO_REQUEST;
echo.length = htons(sizeof echo);
echo.xid = htonl(0x89abcdef);
const char *type = argv[1];
struct ofp_header hello;
- hello.version = OFP_VERSION - 1;
+ hello.version = OFP10_VERSION - 1;
hello.type = OFPT_HELLO;
hello.length = htons(sizeof hello);
hello.xid = htonl(0x12345678);
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);