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
leak-checker: Remove because it cannot be made thread-safe.
[sliver-openvswitch.git]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index
82854e9
..
08ec7bf
100644
(file)
--- a/
lib/vconn-stream.c
+++ b/
lib/vconn-stream.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010
, 2011, 2012 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,20
+45,21
@@
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->stream = stream;
s->txbuf = NULL;
s->rxbuf = NULL;
@@
-77,18
+76,18
@@
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;
error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
{
struct stream *stream;
int error;
error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
- &stream);
+ &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;
}
}
@@
-210,7
+209,6
@@
vconn_stream_send(struct vconn *vconn, struct ofpbuf *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);
@@
-227,6
+225,7
@@
vconn_stream_run(struct vconn *vconn)
struct vconn_stream *s = vconn_stream_cast(vconn);
ssize_t retval;
struct vconn_stream *s = vconn_stream_cast(vconn);
ssize_t retval;
+ stream_run(s->stream);
if (!s->txbuf) {
return;
}
if (!s->txbuf) {
return;
}
@@
-252,6
+251,7
@@
vconn_stream_run_wait(struct vconn *vconn)
{
struct vconn_stream *s = vconn_stream_cast(vconn);
{
struct vconn_stream *s = vconn_stream_cast(vconn);
+ stream_run_wait(s->stream);
if (s->txbuf) {
stream_send_wait(s->stream);
}
if (s->txbuf) {
stream_send_wait(s->stream);
}
@@
-294,7
+294,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)
@@
-308,21
+308,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;
error = pstream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
{
struct pvconn_pstream *ps;
struct pstream *pstream;
int error;
error = pstream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
- &pstream);
+ &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;
@@
-352,7
+353,7
@@
pvconn_pstream_accept(struct pvconn *pvconn, struct vconn **new_vconnp)
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;
}
@@
-365,9
+366,9
@@
pvconn_pstream_wait(struct pvconn *pvconn)
\f
/* Stream-based vconns and pvconns. */
\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_open, \
vconn_stream_close, \
vconn_stream_connect, \
@@
-376,27
+377,27
@@
pvconn_pstream_wait(struct pvconn *pvconn)
vconn_stream_run, \
vconn_stream_run_wait, \
vconn_stream_wait, \
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 \
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
#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
#endif