projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Drop obsolete comment.
[openvswitch]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index 3d0887463ac87d8854a3342e857d74970425a22c..39f1c94df3169a601d1f5eeacbe5ed12993d209e 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
Nicira Networks.
*
* 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.
@@
-32,9
+32,9
@@
#include "util.h"
#include "vconn-provider.h"
#include "vconn.h"
#include "util.h"
#include "vconn-provider.h"
#include "vconn.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_vconn_stream
+
+VLOG_DEFINE_THIS_MODULE(vconn_stream);
/* Active stream socket vconn. */
/* Active stream socket vconn. */
@@
-85,13
+85,16
@@
vconn_stream_open(const char *name, char *suffix OVS_UNUSED,
error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
&stream);
error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
&stream);
-
- if (error && error != EAGAIN) {
- return error;
+ if (!error) {
+ error = stream_connect(stream);
+ if (!error || error == EAGAIN) {
+ *vconnp = vconn_stream_new(stream, error);
+ return 0;
+ }
}
}
-
*vconnp = vconn_stream_new(stream, error
);
- return
0
;
+
stream_close(stream
);
+ return
error
;
}
static struct vconn_stream *
}
static struct vconn_stream *
@@
-170,8
+173,7
@@
vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
oh = s->rxbuf->data;
rx_len = ntohs(oh->length);
if (rx_len < sizeof(struct ofp_header)) {
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 (%zu bytes)",
- rx_len);
+ 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);
return EPROTO;
} else if (s->rxbuf->size < rx_len) {
int retval = vconn_stream_recv__(s, rx_len);
@@
-363,9
+365,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, \
@@
-374,27
+376,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
struct vconn_class stream_vconn_class = STREAM_INIT("stream"
);
+static
struct pvconn_class pstream_pvconn_class = PSTREAM_INIT("pstream"
);
-
DEFINE_VCONN_STREAM_CLASS(tcp
);
-
DEFINE_PVCONN_STREAM_CLASS(ptcp
);
+
struct vconn_class tcp_vconn_class = STREAM_INIT("tcp"
);
+
struct pvconn_class ptcp_pvconn_class = PSTREAM_INIT("ptcp"
);
-
DEFINE_VCONN_STREAM_CLASS(unix
);
-
DEFINE_PVCONN_STREAM_CLASS(punix
);
+
struct vconn_class unix_vconn_class = STREAM_INIT("unix"
);
+
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
);
+
struct vconn_class ssl_vconn_class = STREAM_INIT("ssl"
);
+
struct pvconn_class pssl_pvconn_class = PSTREAM_INIT("pssl"
);
#endif
#endif