projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Resolve pep8 blank line errors.
[cascardo/ovs.git]
/
utilities
/
ovs-vsctl.c
diff --git
a/utilities/ovs-vsctl.c
b/utilities/ovs-vsctl.c
index
e28634a
..
36290db
100644
(file)
--- a/
utilities/ovs-vsctl.c
+++ b/
utilities/ovs-vsctl.c
@@
-201,6
+201,7
@@
parse_options(int argc, char *argv[], struct shash *local_options)
OPT_NO_SYSLOG,
OPT_NO_WAIT,
OPT_DRY_RUN,
OPT_NO_SYSLOG,
OPT_NO_WAIT,
OPT_DRY_RUN,
+ OPT_BOOTSTRAP_CA_CERT,
OPT_PEER_CA_CERT,
OPT_LOCAL,
OPT_RETRY,
OPT_PEER_CA_CERT,
OPT_LOCAL,
OPT_RETRY,
@@
-224,6
+225,7
@@
parse_options(int argc, char *argv[], struct shash *local_options)
VLOG_LONG_OPTIONS,
TABLE_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
TABLE_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS,
+ {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{NULL, 0, NULL, 0},
};
{"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
{NULL, 0, NULL, 0},
};
@@
-324,6
+326,10
@@
parse_options(int argc, char *argv[], struct shash *local_options)
stream_ssl_set_peer_ca_cert_file(optarg);
break;
stream_ssl_set_peer_ca_cert_file(optarg);
break;
+ case OPT_BOOTSTRAP_CA_CERT:
+ stream_ssl_set_ca_cert_file(optarg, true);
+ break;
+
case '?':
exit(EXIT_FAILURE);
case '?':
exit(EXIT_FAILURE);
@@
-477,7
+483,7
@@
struct vsctl_iface {
struct vsctl_port *port;
};
struct vsctl_port *port;
};
-/* Casts 'base' into 'str
cu
t vsctl_context'. */
+/* Casts 'base' into 'str
uc
t vsctl_context'. */
static struct vsctl_context *
vsctl_context_cast(struct ctl_context *base)
{
static struct vsctl_context *
vsctl_context_cast(struct ctl_context *base)
{
@@
-1085,10
+1091,8
@@
cmd_emer_reset(struct ctl_context *ctx)
/* We only want to save the "hwaddr" key from other_config. */
hwaddr = smap_get(&br->other_config, "hwaddr");
if (hwaddr) {
/* We only want to save the "hwaddr" key from other_config. */
hwaddr = smap_get(&br->other_config, "hwaddr");
if (hwaddr) {
- struct smap smap = SMAP_INITIALIZER(&smap);
- smap_add(&smap, "hwaddr", hwaddr);
+ const struct smap smap = SMAP_CONST1(&smap, "hwaddr", hwaddr);
ovsrec_bridge_set_other_config(br, &smap);
ovsrec_bridge_set_other_config(br, &smap);
- smap_destroy(&smap);
} else {
ovsrec_bridge_set_other_config(br, NULL);
}
} else {
ovsrec_bridge_set_other_config(br, NULL);
}