From b66bdf3032561157c66c81e1f9f1e05aec18ede7 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 23 Mar 2010 11:24:38 -0700 Subject: [PATCH] ovs-controller: Add --unixctl option. --- utilities/ovs-controller.8.in | 1 + utilities/ovs-controller.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/utilities/ovs-controller.8.in b/utilities/ovs-controller.8.in index e0c15402..adef7182 100644 --- a/utilities/ovs-controller.8.in +++ b/utilities/ovs-controller.8.in @@ -86,6 +86,7 @@ This option is only for debugging the Open vSwitch implementation of .so lib/ssl-peer-ca-cert.man .so lib/daemon.man .so lib/vlog.man +.so lib/unixctl.man .so lib/common.man . .SH EXAMPLES diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 0497d9a4..30acc8ba 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -67,6 +67,9 @@ static int max_idle = 60; * of their messages (for debugging fail-open mode). */ static bool mute = false; +/* --unixctl: Name of unixctl socket, or null to use the default. */ +static char *unixctl_path = NULL; + static int do_switching(struct switch_ *); static void new_switch(struct switch_ *, struct vconn *, const char *name); static void parse_options(int argc, char *argv[]); @@ -128,7 +131,7 @@ main(int argc, char *argv[]) die_if_already_running(); daemonize_start(); - retval = unixctl_server_create(NULL, &unixctl); + retval = unixctl_server_create(unixctl_path, &unixctl); if (retval) { exit(EXIT_FAILURE); } @@ -242,6 +245,7 @@ parse_options(int argc, char *argv[]) OPT_MAX_IDLE = UCHAR_MAX + 1, OPT_PEER_CA_CERT, OPT_MUTE, + OPT_UNIXCTL, VLOG_OPTION_ENUMS }; static struct option long_options[] = { @@ -251,6 +255,7 @@ parse_options(int argc, char *argv[]) {"wildcard", no_argument, 0, 'w'}, {"max-idle", required_argument, 0, OPT_MAX_IDLE}, {"mute", no_argument, 0, OPT_MUTE}, + {"unixctl", required_argument, 0, OPT_UNIXCTL}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, DAEMON_LONG_OPTIONS, @@ -305,6 +310,10 @@ parse_options(int argc, char *argv[]) } break; + case OPT_UNIXCTL: + unixctl_path = optarg; + break; + case 'h': usage(); @@ -349,6 +358,7 @@ usage(void) " --max-idle=SECS max idle time for new flows\n" " -N, --normal use OFPAT_NORMAL action\n" " -w, --wildcard use wildcards, not exact-match rules\n" + " --unixctl=SOCKET override default control socket name\n" " -h, --help display this help message\n" " -V, --version display version information\n"); exit(EXIT_SUCCESS); -- 2.30.2