projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-data: Add some more functions for dealing with "struct ovsdb_datum".
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 1d1fa291f1e6ce91ea5a5cf5bc2d91b1b8a16837..d9086dc93b7ffc967347178a7b3331fd166a24f8 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009 Nicira Networks
+/* Copyright (c) 2008, 2009
, 2010
Nicira Networks
*
* 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.
@@
-28,7
+28,6
@@
#include "compiler.h"
#include "daemon.h"
#include "dpif.h"
#include "compiler.h"
#include "daemon.h"
#include "dpif.h"
-#include "fault.h"
#include "leak-checker.h"
#include "netdev.h"
#include "ovsdb-idl.h"
#include "leak-checker.h"
#include "netdev.h"
#include "ovsdb-idl.h"
@@
-64,7
+63,6
@@
main(int argc, char *argv[])
int retval;
set_program_name(argv[0]);
int retval;
set_program_name(argv[0]);
- register_fault_handlers();
time_init();
vlog_init();
remote = parse_options(argc, argv);
time_init();
vlog_init();
remote = parse_options(argc, argv);
@@
-77,7
+75,7
@@
main(int argc, char *argv[])
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
-
ovs_fatal(retval, "could not listen for control connections"
);
+
exit(EXIT_FAILURE
);
}
daemonize_complete();
}
daemonize_complete();
@@
-138,7
+136,8
@@
parse_options(int argc, char *argv[])
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
OPT_FAKE_PROC_NET,
VLOG_OPTION_ENUMS,
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
OPT_FAKE_PROC_NET,
VLOG_OPTION_ENUMS,
- LEAK_CHECKER_OPTION_ENUMS
+ LEAK_CHECKER_OPTION_ENUMS,
+ OPT_BOOTSTRAP_CA_CERT
};
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
};
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
@@
-150,6
+149,7
@@
parse_options(int argc, char *argv[])
#ifdef HAVE_OPENSSL
STREAM_SSL_LONG_OPTIONS
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#ifdef HAVE_OPENSSL
STREAM_SSL_LONG_OPTIONS
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
+ {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
#endif
{0, 0, 0, 0},
};
#endif
{0, 0, 0, 0},
};
@@
-191,6
+191,10
@@
parse_options(int argc, char *argv[])
case OPT_PEER_CA_CERT:
stream_ssl_set_peer_ca_cert_file(optarg);
break;
case OPT_PEER_CA_CERT:
stream_ssl_set_peer_ca_cert_file(optarg);
break;
+
+ case OPT_BOOTSTRAP_CA_CERT:
+ stream_ssl_set_ca_cert_file(optarg, true);
+ break;
#endif
case '?':
#endif
case '?':