projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debian: Depend on python (>= 2.7) | python-argparse
[openvswitch]
/
vswitchd
/
bridge.c
diff --git
a/vswitchd/bridge.c
b/vswitchd/bridge.c
index 396c7206f319877c644604386168c9f88b86681c..265410fcb80673d9ce786b97f4783e5d9f892597 100644
(file)
--- a/
vswitchd/bridge.c
+++ b/
vswitchd/bridge.c
@@
-40,6
+40,7
@@
#include "sha1.h"
#include "shash.h"
#include "socket-util.h"
#include "sha1.h"
#include "shash.h"
#include "socket-util.h"
+#include "stream.h"
#include "stream-ssl.h"
#include "sset.h"
#include "system-stats.h"
#include "stream-ssl.h"
#include "sset.h"
#include "system-stats.h"
@@
-373,10
+374,10
@@
collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg,
SSET_FOR_EACH (target, &targets) {
struct sockaddr_in *sin = &managers[n_managers];
SSET_FOR_EACH (target, &targets) {
struct sockaddr_in *sin = &managers[n_managers];
- if (
(!strncmp(target, "tcp:", 4)
- && inet_parse_active(target + 4, JSONRPC_TCP_PORT, sin)) ||
- (!strncmp(target, "ssl:", 4)
-
&& inet_parse_active(target + 4, JSONRPC_SSL_PORT, sin)
)) {
+ if (
stream_parse_target_with_default_ports(target,
+ JSONRPC_TCP_PORT,
+ JSONRPC_SSL_PORT,
+
sin
)) {
n_managers++;
}
}
n_managers++;
}
}