git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index
a9890b5
..
9347b5e
100644
(file)
--- a/
lib/vconn-stream.c
+++ b/
lib/vconn-stream.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011
, 2012, 2013 Nicira, Inc
.
*
* 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.
@@
-15,7
+15,6
@@
*/
#include <config.h>
*/
#include <config.h>
-#include <assert.h>
#include <errno.h>
#include <poll.h>
#include <stdlib.h>
#include <errno.h>
#include <poll.h>
#include <stdlib.h>
@@
-23,7
+22,6
@@
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.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 "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
@@
-47,28
+45,25
@@
struct vconn_stream
int n_packets;
};
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 struct vconn *
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25);
static void vconn_stream_clear_txbuf(struct vconn_stream *);
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,
{
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->n_packets = 0;
s->stream = 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;
}
return &s->vconn;
}
@@
-77,18
+72,17
@@
vconn_stream_new(struct stream *stream, int connect_status)
*
* Returns 0 if successful, otherwise a positive errno value. */
static int
*
* Returns 0 if successful, otherwise a positive errno value. */
static int
-vconn_stream_open(const char *name,
char *suffix OVS_UNUSED
,
-
struct vconn **vconn
p)
+vconn_stream_open(const char *name,
uint32_t allowed_versions
,
+
char *suffix OVS_UNUSED, struct vconn **vconnp, uint8_t dsc
p)
{
struct stream *stream;
int error;
{
struct stream *stream;
int error;
- error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
- &stream);
+ error = stream_open_with_default_port(name, OFP_OLD_PORT, &stream, dscp);
if (!error) {
error = stream_connect(stream);
if (!error || error == EAGAIN) {
if (!error) {
error = stream_connect(stream);
if (!error || error == EAGAIN) {
- *vconnp = vconn_stream_new(stream, error);
+ *vconnp = vconn_stream_new(stream, error
, allowed_versions
);
return 0;
}
}
return 0;
}
}
@@
-109,7
+103,7
@@
vconn_stream_close(struct vconn *vconn)
struct vconn_stream *s = vconn_stream_cast(vconn);
if ((vconn->error == EPROTO || s->n_packets < 1) && s->rxbuf) {
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,
+ stream_report_content(
ofpbuf_data(s->rxbuf), ofpbuf_size(s->rxbuf)
, STREAM_OPENFLOW,
THIS_MODULE, vconn_get_name(vconn));
}
THIS_MODULE, vconn_get_name(vconn));
}
@@
-132,14
+126,14
@@
vconn_stream_recv__(struct vconn_stream *s, int rx_len)
struct ofpbuf *rx = s->rxbuf;
int want_bytes, retval;
struct ofpbuf *rx = s->rxbuf;
int want_bytes, retval;
- want_bytes = rx_len -
rx->size
;
+ want_bytes = rx_len -
ofpbuf_size(rx)
;
ofpbuf_prealloc_tailroom(rx, want_bytes);
retval = stream_recv(s->stream, ofpbuf_tail(rx), want_bytes);
if (retval > 0) {
ofpbuf_prealloc_tailroom(rx, want_bytes);
retval = stream_recv(s->stream, ofpbuf_tail(rx), want_bytes);
if (retval > 0) {
-
rx->size += retval
;
+
ofpbuf_set_size(rx, ofpbuf_size(rx) + retval)
;
return retval == want_bytes ? 0 : EAGAIN;
} else if (retval == 0) {
return retval == want_bytes ? 0 : EAGAIN;
} else if (retval == 0) {
- if (
rx->size
) {
+ if (
ofpbuf_size(rx)
) {
VLOG_ERR_RL(&rl, "connection dropped mid-packet");
return EPROTO;
}
VLOG_ERR_RL(&rl, "connection dropped mid-packet");
return EPROTO;
}
@@
-162,7
+156,7
@@
vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
}
/* Read ofp_header. */
}
/* Read ofp_header. */
- if (
s->rxbuf->size
< sizeof(struct ofp_header)) {
+ if (
ofpbuf_size(s->rxbuf)
< sizeof(struct ofp_header)) {
int retval = vconn_stream_recv__(s, sizeof(struct ofp_header));
if (retval) {
return retval;
int retval = vconn_stream_recv__(s, sizeof(struct ofp_header));
if (retval) {
return retval;
@@
-170,12
+164,12
@@
vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
}
/* Read payload. */
}
/* Read payload. */
- oh =
s->rxbuf->data
;
+ oh =
ofpbuf_data(s->rxbuf)
;
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;
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) {
+ } else if (
ofpbuf_size(s->rxbuf)
< rx_len) {
int retval = vconn_stream_recv__(s, rx_len);
if (retval) {
return retval;
int retval = vconn_stream_recv__(s, rx_len);
if (retval) {
return retval;
@@
-205,12
+199,11
@@
vconn_stream_send(struct vconn *vconn, struct ofpbuf *buffer)
return EAGAIN;
}
return EAGAIN;
}
- retval = stream_send(s->stream,
buffer->data, buffer->size
);
- if (retval ==
buffer->size
) {
+ retval = stream_send(s->stream,
ofpbuf_data(buffer), ofpbuf_size(buffer)
);
+ if (retval ==
ofpbuf_size(buffer)
) {
ofpbuf_delete(buffer);
return 0;
} else if (retval >= 0 || retval == -EAGAIN) {
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);
s->txbuf = buffer;
if (retval > 0) {
ofpbuf_pull(buffer, retval);
@@
-232,16
+225,16
@@
vconn_stream_run(struct vconn *vconn)
return;
}
return;
}
- retval = stream_send(s->stream,
s->txbuf->data, s->txbuf->size
);
+ retval = stream_send(s->stream,
ofpbuf_data(s->txbuf), ofpbuf_size(s->txbuf)
);
if (retval < 0) {
if (retval != -EAGAIN) {
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;
}
} else if (retval > 0) {
ofpbuf_pull(s->txbuf, retval);
vconn_stream_clear_txbuf(s);
return;
}
} else if (retval > 0) {
ofpbuf_pull(s->txbuf, retval);
- if (!
s->txbuf->size
) {
+ if (!
ofpbuf_size(s->txbuf)
) {
vconn_stream_clear_txbuf(s);
return;
}
vconn_stream_clear_txbuf(s);
return;
}
@@
-284,7
+277,7
@@
vconn_stream_wait(struct vconn *vconn, enum vconn_wait_type wait)
break;
default:
break;
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
\f
}
}
\f
@@
-296,7
+289,7
@@
struct pvconn_pstream
struct pstream *pstream;
};
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)
static struct pvconn_pstream *
pvconn_pstream_cast(struct pvconn *pvconn)
@@
-310,21
+303,22
@@
pvconn_pstream_cast(struct pvconn *pvconn)
* Returns 0 if successful, otherwise a positive errno value. (The current
* implementation never fails.) */
static int
* 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;
int error;
{
struct pvconn_pstream *ps;
struct pstream *pstream;
int error;
- error = pstream_open_with_default_port
s(name, OFP_TCP_PORT, OFP_SSL
_PORT,
-
&pstream
);
+ error = pstream_open_with_default_port
(name, OFP_OLD
_PORT,
+
&pstream, dscp
);
if (error) {
return error;
}
ps = xmalloc(sizeof *ps);
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;
ps->pstream = pstream;
*pvconnp = &ps->pvconn;
return 0;
@@
-349,12
+343,12
@@
pvconn_pstream_accept(struct pvconn *pvconn, struct vconn **new_vconnp)
if (error) {
if (error != EAGAIN) {
VLOG_DBG_RL(&rl, "%s: accept: %s",
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;
}
}
return error;
}
- *new_vconnp = vconn_stream_new(stream, 0);
+ *new_vconnp = vconn_stream_new(stream, 0
, pvconn->allowed_versions
);
return 0;
}
return 0;
}
@@
-389,16
+383,16
@@
pvconn_pstream_wait(struct pvconn *pvconn)
pvconn_pstream_wait \
}
pvconn_pstream_wait \
}
-static struct vconn_class stream_vconn_class = STREAM_INIT("stream");
-static struct pvconn_class pstream_pvconn_class = PSTREAM_INIT("pstream");
+static
const
struct vconn_class stream_vconn_class = STREAM_INIT("stream");
+static
const
struct pvconn_class pstream_pvconn_class = PSTREAM_INIT("pstream");
-struct vconn_class tcp_vconn_class = STREAM_INIT("tcp");
-struct pvconn_class ptcp_pvconn_class = PSTREAM_INIT("ptcp");
+
const
struct vconn_class tcp_vconn_class = STREAM_INIT("tcp");
+
const
struct pvconn_class ptcp_pvconn_class = PSTREAM_INIT("ptcp");
-struct vconn_class unix_vconn_class = STREAM_INIT("unix");
-struct pvconn_class punix_pvconn_class = PSTREAM_INIT("punix");
+
const
struct vconn_class unix_vconn_class = STREAM_INIT("unix");
+
const
struct pvconn_class punix_pvconn_class = PSTREAM_INIT("punix");
#ifdef HAVE_OPENSSL
#ifdef HAVE_OPENSSL
-struct vconn_class ssl_vconn_class = STREAM_INIT("ssl");
-struct pvconn_class pssl_pvconn_class = PSTREAM_INIT("pssl");
+
const
struct vconn_class ssl_vconn_class = STREAM_INIT("ssl");
+
const
struct pvconn_class pssl_pvconn_class = PSTREAM_INIT("pssl");
#endif
#endif