projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif: Make parameters const.
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 1b9e26c57dca5945452b9c4d4e7e9e5c20602b0f..f97df8d62625121162308d6cacfe2a4984e46483 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira
Networks
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira
, Inc.
*
* 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.
@@
-49,18
+49,19
@@
#include "util.h"
#include "vconn.h"
#include "vlog.h"
#include "util.h"
#include "vconn.h"
#include "vlog.h"
-#include "
vswitchd
/vswitch-idl.h"
+#include "
lib
/vswitch-idl.h"
VLOG_DEFINE_THIS_MODULE(vswitchd);
static unixctl_cb_func ovs_vswitchd_exit;
VLOG_DEFINE_THIS_MODULE(vswitchd);
static unixctl_cb_func ovs_vswitchd_exit;
-static char *parse_options(int argc, char *argv[]);
+static char *parse_options(int argc, char *argv[]
, char **unixctl_path
);
static void usage(void) NO_RETURN;
int
main(int argc, char *argv[])
{
static void usage(void) NO_RETURN;
int
main(int argc, char *argv[])
{
+ char *unixctl_path = NULL;
struct unixctl_server *unixctl;
struct signal *sighup;
char *remote;
struct unixctl_server *unixctl;
struct signal *sighup;
char *remote;
@@
-70,7
+71,7
@@
main(int argc, char *argv[])
proctitle_init(argc, argv);
set_program_name(argv[0]);
stress_init_command();
proctitle_init(argc, argv);
set_program_name(argv[0]);
stress_init_command();
- remote = parse_options(argc, argv);
+ remote = parse_options(argc, argv
, &unixctl_path
);
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
process_init();
signal(SIGPIPE, SIG_IGN);
sighup = signal_register(SIGHUP);
process_init();
@@
-78,7
+79,7
@@
main(int argc, char *argv[])
daemonize_start();
daemonize_start();
- retval = unixctl_server_create(
NULL
, &unixctl);
+ retval = unixctl_server_create(
unixctl_path
, &unixctl);
if (retval) {
exit(EXIT_FAILURE);
}
if (retval) {
exit(EXIT_FAILURE);
}
@@
-115,11
+116,12
@@
main(int argc, char *argv[])
}
static char *
}
static char *
-parse_options(int argc, char *argv[])
+parse_options(int argc, char *argv[]
, char **unixctl_pathp
)
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
OPT_MLOCKALL,
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
OPT_MLOCKALL,
+ OPT_UNIXCTL,
VLOG_OPTION_ENUMS,
LEAK_CHECKER_OPTION_ENUMS,
OPT_BOOTSTRAP_CA_CERT,
VLOG_OPTION_ENUMS,
LEAK_CHECKER_OPTION_ENUMS,
OPT_BOOTSTRAP_CA_CERT,
@@
-131,6
+133,7
@@
parse_options(int argc, char *argv[])
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'},
{"mlockall", no_argument, NULL, OPT_MLOCKALL},
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'},
{"mlockall", no_argument, NULL, OPT_MLOCKALL},
+ {"unixctl", required_argument, NULL, OPT_UNIXCTL},
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
@@
-156,7
+159,7
@@
parse_options(int argc, char *argv[])
usage();
case 'V':
usage();
case 'V':
- ovs_print_version(OFP
_VERSION, OFP
_VERSION);
+ ovs_print_version(OFP
10_VERSION, OFP10
_VERSION);
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
@@
-169,6
+172,10
@@
parse_options(int argc, char *argv[])
#endif
break;
#endif
break;
+ case OPT_UNIXCTL:
+ *unixctl_pathp = optarg;
+ break;
+
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
LEAK_CHECKER_OPTION_HANDLERS
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
LEAK_CHECKER_OPTION_HANDLERS
@@
-227,6
+234,7
@@
usage(void)
daemon_usage();
vlog_usage();
printf("\nOther options:\n"
daemon_usage();
vlog_usage();
printf("\nOther options:\n"
+ " --unixctl=SOCKET override default control socket name\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");
leak_checker_usage();
" -h, --help display this help message\n"
" -V, --version display version information\n");
leak_checker_usage();
@@
-239,5
+247,5
@@
ovs_vswitchd_exit(struct unixctl_conn *conn, int argc OVS_UNUSED,
{
bool *exiting = exiting_;
*exiting = true;
{
bool *exiting = exiting_;
*exiting = true;
- unixctl_command_reply(conn,
200,
NULL);
+ unixctl_command_reply(conn, NULL);
}
}