/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * 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 <config.h>
-#include <assert.h>
#include <errno.h>
#include <poll.h>
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
-#include "leak-checker.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "stream.h"
#include "util.h"
#include "vconn-provider.h"
-#include "vconn.h"
+#include "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
-#include "vlog.h"
-#define THIS_MODULE VLM_vconn_stream
+VLOG_DEFINE_THIS_MODULE(vconn_stream);
/* Active stream socket vconn. */
struct stream *stream;
struct ofpbuf *rxbuf;
struct ofpbuf *txbuf;
+ int n_packets;
};
-static struct vconn_class stream_vconn_class;
+static const struct vconn_class stream_vconn_class;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25);
static void vconn_stream_clear_txbuf(struct vconn_stream *);
-static int count_fields(const char *);
static struct vconn *
-vconn_stream_new(struct stream *stream, int connect_status)
+vconn_stream_new(struct stream *stream, int connect_status,
+ uint32_t allowed_versions)
{
struct vconn_stream *s;
s = xmalloc(sizeof *s);
vconn_init(&s->vconn, &stream_vconn_class, connect_status,
- stream_get_name(stream));
+ stream_get_name(stream), allowed_versions);
s->stream = stream;
s->txbuf = NULL;
s->rxbuf = NULL;
- 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);
+ s->n_packets = 0;
return &s->vconn;
}
*
* Returns 0 if successful, otherwise a positive errno value. */
static int
-vconn_stream_open(const char *name_, char *suffix OVS_UNUSED,
- struct vconn **vconnp)
+vconn_stream_open(const char *name, uint32_t allowed_versions,
+ char *suffix OVS_UNUSED, struct vconn **vconnp, uint8_t dscp)
{
struct stream *stream;
- char *name;
int error;
- if (!strncmp(name_, "tcp:", 4) && count_fields(name_) < 3) {
- name = xasprintf("%s:%d", name_, OFP_TCP_PORT);
- } else if (!strncmp(name_, "ssl:", 4) && count_fields(name_) < 3) {
- name = xasprintf("%s:%d", name_, OFP_SSL_PORT);
- } else {
- name = xstrdup(name_);
- }
- error = stream_open(name, &stream);
- free(name);
-
- if (error && error != EAGAIN) {
- return error;
+ error = stream_open_with_default_port(name, OFP_PORT, &stream, dscp);
+ if (!error) {
+ error = stream_connect(stream);
+ if (!error || error == EAGAIN) {
+ *vconnp = vconn_stream_new(stream, error, allowed_versions);
+ return 0;
+ }
}
- *vconnp = vconn_stream_new(stream, error);
- return 0;
+ stream_close(stream);
+ return error;
}
static struct vconn_stream *
vconn_stream_close(struct vconn *vconn)
{
struct vconn_stream *s = vconn_stream_cast(vconn);
+
+ 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));
+ }
+
stream_close(s->stream);
vconn_stream_clear_txbuf(s);
ofpbuf_delete(s->rxbuf);
}
static int
-vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
+vconn_stream_recv__(struct vconn_stream *s, int rx_len)
{
- struct vconn_stream *s = vconn_stream_cast(vconn);
- struct ofpbuf *rx;
- size_t want_bytes;
- ssize_t retval;
+ struct ofpbuf *rx = s->rxbuf;
+ int want_bytes, retval;
- if (s->rxbuf == NULL) {
- s->rxbuf = ofpbuf_new(1564);
- }
- rx = s->rxbuf;
-
-again:
- if (sizeof(struct ofp_header) > rx->size) {
- want_bytes = sizeof(struct ofp_header) - rx->size;
- } else {
- struct ofp_header *oh = rx->data;
- size_t length = ntohs(oh->length);
- if (length < sizeof(struct ofp_header)) {
- VLOG_ERR_RL(&rl, "received too-short ofp_header (%zu bytes)",
- length);
- return EPROTO;
- }
- want_bytes = length - rx->size;
- if (!want_bytes) {
- *bufferp = rx;
- s->rxbuf = NULL;
- return 0;
- }
- }
+ want_bytes = rx_len - rx->size;
ofpbuf_prealloc_tailroom(rx, want_bytes);
-
retval = stream_recv(s->stream, ofpbuf_tail(rx), want_bytes);
if (retval > 0) {
rx->size += retval;
- if (retval == want_bytes) {
- if (rx->size > sizeof(struct ofp_header)) {
- *bufferp = rx;
- s->rxbuf = NULL;
- return 0;
- } else {
- goto again;
- }
- }
- return EAGAIN;
+ return retval == want_bytes ? 0 : EAGAIN;
} else if (retval == 0) {
if (rx->size) {
VLOG_ERR_RL(&rl, "connection dropped mid-packet");
return EPROTO;
- } else {
- return EOF;
}
+ return EOF;
} else {
return -retval;
}
}
+static int
+vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
+{
+ struct vconn_stream *s = vconn_stream_cast(vconn);
+ const struct ofp_header *oh;
+ int rx_len;
+
+ /* Allocate new receive buffer if we don't have one. */
+ if (s->rxbuf == NULL) {
+ s->rxbuf = ofpbuf_new(1564);
+ }
+
+ /* Read ofp_header. */
+ if (s->rxbuf->size < sizeof(struct ofp_header)) {
+ int retval = vconn_stream_recv__(s, sizeof(struct ofp_header));
+ if (retval) {
+ return retval;
+ }
+ }
+
+ /* Read payload. */
+ oh = s->rxbuf->data;
+ rx_len = ntohs(oh->length);
+ if (rx_len < sizeof(struct ofp_header)) {
+ VLOG_ERR_RL(&rl, "received too-short ofp_header (%d bytes)", rx_len);
+ return EPROTO;
+ } else if (s->rxbuf->size < rx_len) {
+ int retval = vconn_stream_recv__(s, rx_len);
+ if (retval) {
+ return retval;
+ }
+ }
+
+ s->n_packets++;
+ *bufferp = s->rxbuf;
+ s->rxbuf = NULL;
+ return 0;
+}
+
static void
vconn_stream_clear_txbuf(struct vconn_stream *s)
{
ofpbuf_delete(buffer);
return 0;
} else if (retval >= 0 || retval == -EAGAIN) {
- leak_checker_claim(buffer);
s->txbuf = buffer;
if (retval > 0) {
ofpbuf_pull(buffer, retval);
struct vconn_stream *s = vconn_stream_cast(vconn);
ssize_t retval;
+ stream_run(s->stream);
if (!s->txbuf) {
return;
}
retval = stream_send(s->stream, s->txbuf->data, s->txbuf->size);
if (retval < 0) {
if (retval != -EAGAIN) {
- VLOG_ERR_RL(&rl, "send: %s", strerror(-retval));
+ VLOG_ERR_RL(&rl, "send: %s", ovs_strerror(-retval));
vconn_stream_clear_txbuf(s);
return;
}
{
struct vconn_stream *s = vconn_stream_cast(vconn);
+ stream_run_wait(s->stream);
if (s->txbuf) {
stream_send_wait(s->stream);
}
break;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
\f
struct pstream *pstream;
};
-static struct pvconn_class pstream_pvconn_class;
+static const struct pvconn_class pstream_pvconn_class;
static struct pvconn_pstream *
pvconn_pstream_cast(struct pvconn *pvconn)
* Returns 0 if successful, otherwise a positive errno value. (The current
* implementation never fails.) */
static int
-pvconn_pstream_listen(const char *name_, char *suffix OVS_UNUSED,
- struct pvconn **pvconnp)
+pvconn_pstream_listen(const char *name, uint32_t allowed_versions,
+ char *suffix OVS_UNUSED, struct pvconn **pvconnp,
+ uint8_t dscp)
{
struct pvconn_pstream *ps;
struct pstream *pstream;
- char *name;
int error;
- if (!strncmp(name_, "ptcp:", 5) && count_fields(name_) < 2) {
- name = xasprintf("%s%d", name_, OFP_TCP_PORT);
- } else if (!strncmp(name_, "pssl:", 5) && count_fields(name_) < 2) {
- name = xasprintf("%s%d", name_, OFP_SSL_PORT);
- } else {
- name = xstrdup(name_);
- }
- error = pstream_open(name, &pstream);
- free(name);
+ error = pstream_open_with_default_port(name, OFP_PORT, &pstream, dscp);
if (error) {
return error;
}
ps = xmalloc(sizeof *ps);
- pvconn_init(&ps->pvconn, &pstream_pvconn_class, name_);
+ pvconn_init(&ps->pvconn, &pstream_pvconn_class, name, allowed_versions);
ps->pstream = pstream;
*pvconnp = &ps->pvconn;
return 0;
if (error) {
if (error != EAGAIN) {
VLOG_DBG_RL(&rl, "%s: accept: %s",
- pstream_get_name(ps->pstream), strerror(error));
+ pstream_get_name(ps->pstream), ovs_strerror(error));
}
return error;
}
- *new_vconnp = vconn_stream_new(stream, 0);
+ *new_vconnp = vconn_stream_new(stream, 0, pvconn->allowed_versions);
return 0;
}
pstream_wait(ps->pstream);
}
\f
-static int
-count_fields(const char *s_)
-{
- char *s, *field, *save_ptr;
- int n = 0;
-
- save_ptr = NULL;
- s = xstrdup(s_);
- for (field = strtok_r(s, ":", &save_ptr); field != NULL;
- field = strtok_r(NULL, ":", &save_ptr)) {
- n++;
- }
- free(s);
-
- return n;
-}
-\f
/* Stream-based vconns and pvconns. */
-#define DEFINE_VCONN_STREAM_CLASS(NAME) \
- struct vconn_class NAME##_vconn_class = { \
- #NAME, \
+#define STREAM_INIT(NAME) \
+ { \
+ NAME, \
vconn_stream_open, \
vconn_stream_close, \
vconn_stream_connect, \
vconn_stream_run, \
vconn_stream_run_wait, \
vconn_stream_wait, \
- };
+ }
-#define DEFINE_PVCONN_STREAM_CLASS(NAME) \
- struct pvconn_class NAME##_pvconn_class = { \
- #NAME, \
+#define PSTREAM_INIT(NAME) \
+ { \
+ NAME, \
pvconn_pstream_listen, \
pvconn_pstream_close, \
pvconn_pstream_accept, \
pvconn_pstream_wait \
- };
+ }
-static DEFINE_VCONN_STREAM_CLASS(stream);
-static DEFINE_PVCONN_STREAM_CLASS(pstream);
+static const struct vconn_class stream_vconn_class = STREAM_INIT("stream");
+static const struct pvconn_class pstream_pvconn_class = PSTREAM_INIT("pstream");
-DEFINE_VCONN_STREAM_CLASS(tcp);
-DEFINE_PVCONN_STREAM_CLASS(ptcp);
+const struct vconn_class tcp_vconn_class = STREAM_INIT("tcp");
+const struct pvconn_class ptcp_pvconn_class = PSTREAM_INIT("ptcp");
-DEFINE_VCONN_STREAM_CLASS(unix);
-DEFINE_PVCONN_STREAM_CLASS(punix);
+const struct vconn_class unix_vconn_class = STREAM_INIT("unix");
+const struct pvconn_class punix_pvconn_class = PSTREAM_INIT("punix");
#ifdef HAVE_OPENSSL
-DEFINE_VCONN_STREAM_CLASS(ssl);
-DEFINE_PVCONN_STREAM_CLASS(pssl);
+const struct vconn_class ssl_vconn_class = STREAM_INIT("ssl");
+const struct pvconn_class pssl_pvconn_class = PSTREAM_INIT("pssl");
#endif
projects / cascardo / ovs.git / blobdiff