projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-controller: Document how to use with management protocol.
[openvswitch]
/
lib
/
vconn-stream.c
diff --git
a/lib/vconn-stream.c
b/lib/vconn-stream.c
index 594eded5571458e982efbede3336179a15530ee0..aa2e61947222fcee92afd2541403aca5f8053348 100644
(file)
--- a/
lib/vconn-stream.c
+++ b/
lib/vconn-stream.c
@@
-64,6
+64,10
@@
vconn_stream_new(struct stream *stream, int connect_status)
s->stream = stream;
s->txbuf = NULL;
s->rxbuf = NULL;
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);
return &s->vconn;
}
return &s->vconn;
}
@@
-72,7
+76,7
@@
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 UNUSED,
+vconn_stream_open(const char *name_, char *suffix
OVS_
UNUSED,
struct vconn **vconnp)
{
struct stream *stream;
struct vconn **vconnp)
{
struct stream *stream;
@@
-298,7
+302,7
@@
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 UNUSED,
+pvconn_pstream_listen(const char *name_, char *suffix
OVS_
UNUSED,
struct pvconn **pvconnp)
{
struct pvconn_pstream *ps;
struct pvconn **pvconnp)
{
struct pvconn_pstream *ps;
@@
-307,9
+311,9
@@
pvconn_pstream_listen(const char *name_, char *suffix UNUSED,
int error;
if (!strncmp(name_, "ptcp:", 5) && count_fields(name_) < 2) {
int error;
if (!strncmp(name_, "ptcp:", 5) && count_fields(name_) < 2) {
- name = xasprintf("%s
:
%d", name_, OFP_TCP_PORT);
+ name = xasprintf("%s%d", name_, OFP_TCP_PORT);
} else if (!strncmp(name_, "pssl:", 5) && count_fields(name_) < 2) {
} else if (!strncmp(name_, "pssl:", 5) && count_fields(name_) < 2) {
- name = xasprintf("%s
:
%d", name_, OFP_SSL_PORT);
+ name = xasprintf("%s%d", name_, OFP_SSL_PORT);
} else {
name = xstrdup(name_);
}
} else {
name = xstrdup(name_);
}