projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
secchan: Remove mention of "-f" flag as being equivalent "--fail"
[openvswitch]
/
lib
/
vconn.c
diff --git
a/lib/vconn.c
b/lib/vconn.c
index 2940c114d65e1390940de5462dd539a576e86fc9..b5e110204eef1d64d925bb79731237601038f759 100644
(file)
--- a/
lib/vconn.c
+++ b/
lib/vconn.c
@@
-128,11
+128,11
@@
vconn_usage(bool active, bool passive, bool bootstrap UNUSED)
printf("\n");
if (active) {
printf("Active OpenFlow connection methods:\n");
printf("\n");
if (active) {
printf("Active OpenFlow connection methods:\n");
- printf(" tcp:
HOST
[:PORT] "
- "PORT (default: %d)
on remote TCP HOST
\n", OFP_TCP_PORT);
+ printf(" tcp:
IP
[:PORT] "
+ "PORT (default: %d)
at remote IP
\n", OFP_TCP_PORT);
#ifdef HAVE_OPENSSL
#ifdef HAVE_OPENSSL
- printf(" ssl:
HOST
[:PORT] "
- "SSL PORT (default: %d)
on remote HOST
\n", OFP_SSL_PORT);
+ printf(" ssl:
IP
[:PORT] "
+ "SSL PORT (default: %d)
at remote IP
\n", OFP_SSL_PORT);
#endif
printf(" unix:FILE Unix domain socket named FILE\n");
}
#endif
printf(" unix:FILE Unix domain socket named FILE\n");
}
@@
-1407,8
+1407,7
@@
normalize_match(struct ofp_match *m)
void
vconn_init(struct vconn *vconn, struct vconn_class *class, int connect_status,
void
vconn_init(struct vconn *vconn, struct vconn_class *class, int connect_status,
- uint32_t remote_ip, uint16_t remote_port, const char *name,
- bool reconnectable)
+ const char *name, bool reconnectable)
{
vconn->class = class;
vconn->state = (connect_status == EAGAIN ? VCS_CONNECTING
{
vconn->class = class;
vconn->state = (connect_status == EAGAIN ? VCS_CONNECTING
@@
-1417,14
+1416,26
@@
vconn_init(struct vconn *vconn, struct vconn_class *class, int connect_status,
vconn->error = connect_status;
vconn->version = -1;
vconn->min_version = -1;
vconn->error = connect_status;
vconn->version = -1;
vconn->min_version = -1;
- vconn->remote_ip =
remote_ip
;
- vconn->remote_port =
remote_port
;
+ vconn->remote_ip =
0
;
+ vconn->remote_port =
0
;
vconn->local_ip = 0;
vconn->local_port = 0;
vconn->name = xstrdup(name);
vconn->reconnectable = reconnectable;
}
vconn->local_ip = 0;
vconn->local_port = 0;
vconn->name = xstrdup(name);
vconn->reconnectable = reconnectable;
}
+void
+vconn_set_remote_ip(struct vconn *vconn, uint32_t ip)
+{
+ vconn->remote_ip = ip;
+}
+
+void
+vconn_set_remote_port(struct vconn *vconn, uint16_t port)
+{
+ vconn->remote_port = port;
+}
+
void
vconn_set_local_ip(struct vconn *vconn, uint32_t ip)
{
void
vconn_set_local_ip(struct vconn *vconn, uint32_t ip)
{