projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fatal-signal: After fork, clear hooks instead of disabling them.
[openvswitch]
/
ovsdb
/
ovsdb-server.c
diff --git
a/ovsdb/ovsdb-server.c
b/ovsdb/ovsdb-server.c
index 116c486b2e5b472c702ba0079f3fc81287d4ad44..e3740a36c5ae3b4f709936de8da7dc26e1f6f41d 100644
(file)
--- a/
ovsdb/ovsdb-server.c
+++ b/
ovsdb/ovsdb-server.c
@@
-25,7
+25,6
@@
#include "column.h"
#include "command-line.h"
#include "daemon.h"
#include "column.h"
#include "command-line.h"
#include "daemon.h"
-#include "fault.h"
#include "file.h"
#include "json.h"
#include "jsonrpc.h"
#include "file.h"
#include "json.h"
#include "jsonrpc.h"
@@
-38,6
+37,7
@@
#include "poll-loop.h"
#include "process.h"
#include "row.h"
#include "poll-loop.h"
#include "process.h"
#include "row.h"
+#include "stream-ssl.h"
#include "stream.h"
#include "svec.h"
#include "table.h"
#include "stream.h"
#include "svec.h"
#include "table.h"
@@
-72,7
+72,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();
signal(SIGPIPE, SIG_IGN);
time_init();
vlog_init();
signal(SIGPIPE, SIG_IGN);
@@
-93,7
+92,7
@@
main(int argc, char *argv[])
retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
-
ovs_fatal(retval, "could not listen for control connections"
);
+
exit(EXIT_FAILURE
);
}
daemonize_complete();
}
daemonize_complete();
@@
-204,6
+203,7
@@
parse_options(int argc, char *argv[], char **file_namep,
OPT_DUMMY = UCHAR_MAX + 1,
OPT_REMOTE,
OPT_UNIXCTL,
OPT_DUMMY = UCHAR_MAX + 1,
OPT_REMOTE,
OPT_UNIXCTL,
+ OPT_BOOTSTRAP_CA_CERT,
VLOG_OPTION_ENUMS,
LEAK_CHECKER_OPTION_ENUMS
};
VLOG_OPTION_ENUMS,
LEAK_CHECKER_OPTION_ENUMS
};
@@
-215,6
+215,10
@@
parse_options(int argc, char *argv[], char **file_namep,
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
+#ifdef HAVE_OPENSSL
+ {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
+ STREAM_SSL_LONG_OPTIONS
+#endif
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
@@
-248,6
+252,15
@@
parse_options(int argc, char *argv[], char **file_namep,
DAEMON_OPTION_HANDLERS
LEAK_CHECKER_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
LEAK_CHECKER_OPTION_HANDLERS
+#ifdef HAVE_OPENSSL
+ STREAM_SSL_OPTION_HANDLERS
+
+ case OPT_BOOTSTRAP_CA_CERT:
+ stream_ssl_set_ca_cert_file(optarg, true);
+ break;
+#endif
+
+
case '?':
exit(EXIT_FAILURE);
case '?':
exit(EXIT_FAILURE);
@@
-279,7
+292,7
@@
usage(void)
program_name, program_name);
printf("\nJSON-RPC options (may be specified any number of times):\n"
" --remote=REMOTE connect or listen to REMOTE\n");
program_name, program_name);
printf("\nJSON-RPC options (may be specified any number of times):\n"
" --remote=REMOTE connect or listen to REMOTE\n");
- stream_usage("JSON-RPC", true, true);
+ stream_usage("JSON-RPC", true, true
, true
);
daemon_usage();
vlog_usage();
printf("\nOther options:\n"
daemon_usage();
vlog_usage();
printf("\nOther options:\n"