projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket-util: Report fd of -1 on error in inet_open_active().
[openvswitch]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index a9890b594b30231c0f739df8982f29a1deb8f660..38ce374777881b472a243246fe6dddc9fb2f638b 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 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.
@@
-54,13
+54,14
@@
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 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
+78,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;
}
}
@@
-310,21
+311,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;
@@
-354,7
+356,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;
}