/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2016 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 "stream.h"
#include "util.h"
#include "vconn-provider.h"
-#include "vconn.h"
-#include "vlog.h"
+#include "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(vconn_stream);
s->txbuf = NULL;
s->rxbuf = NULL;
s->n_packets = 0;
- s->vconn.remote_ip = stream_get_remote_ip(stream);
- s->vconn.remote_port = stream_get_remote_port(stream);
- s->vconn.local_ip = stream_get_local_ip(stream);
- s->vconn.local_port = stream_get_local_port(stream);
return &s->vconn;
}
struct stream *stream;
int error;
- error = stream_open_with_default_port(name, OFP_OLD_PORT, &stream, dscp);
+ error = stream_open_with_default_port(name, OFP_PORT, &stream, dscp);
if (!error) {
error = stream_connect(stream);
if (!error || error == EAGAIN) {
if ((vconn->error == EPROTO || s->n_packets < 1) && s->rxbuf) {
stream_report_content(s->rxbuf->data, s->rxbuf->size, STREAM_OPENFLOW,
- THIS_MODULE, vconn_get_name(vconn));
+ &this_module, vconn_get_name(vconn));
}
stream_close(s->stream);
struct pstream *pstream;
int error;
- error = pstream_open_with_default_port(name, OFP_OLD_PORT,
- &pstream, dscp);
+ error = pstream_open_with_default_port(name, OFP_PORT, &pstream, dscp);
if (error) {
return error;
}