projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-idl: Add "safe" iterator macro to generated code.
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index e2816cfc347d9bf1bb724d66e897916cea1a856b..30acc8ba46e97288f7968a89bb7cd1cdab4a3ed3 100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-1,5
+1,5
@@
/*
/*
- * 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.
@@
-26,16
+26,15
@@
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
-#include "fault.h"
#include "learning-switch.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
#include "learning-switch.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
+#include "stream-ssl.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn-ssl.h"
#include "vconn.h"
#include "vlog.h"
#include "vconn.h"
#include "vlog.h"
@@
-68,6
+67,9
@@
static int max_idle = 60;
* of their messages (for debugging fail-open mode). */
static bool mute = false;
* 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[]);
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[]);
@@
-83,8
+85,8
@@
main(int argc, char *argv[])
int retval;
int i;
int retval;
int i;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
set_program_name(argv[0]);
- register_fault_handlers();
time_init();
vlog_init();
parse_options(argc, argv);
time_init();
vlog_init();
parse_options(argc, argv);
@@
-129,9
+131,9
@@
main(int argc, char *argv[])
die_if_already_running();
daemonize_start();
die_if_already_running();
daemonize_start();
- retval = unixctl_server_create(
NULL
, &unixctl);
+ retval = unixctl_server_create(
unixctl_path
, &unixctl);
if (retval) {
if (retval) {
-
ovs_fatal(retval, "Could not listen for unixctl connections"
);
+
exit(EXIT_FAILURE
);
}
daemonize_complete();
}
daemonize_complete();
@@
-243,6
+245,7
@@
parse_options(int argc, char *argv[])
OPT_MAX_IDLE = UCHAR_MAX + 1,
OPT_PEER_CA_CERT,
OPT_MUTE,
OPT_MAX_IDLE = UCHAR_MAX + 1,
OPT_PEER_CA_CERT,
OPT_MUTE,
+ OPT_UNIXCTL,
VLOG_OPTION_ENUMS
};
static struct option long_options[] = {
VLOG_OPTION_ENUMS
};
static struct option long_options[] = {
@@
-252,12
+255,13
@@
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},
{"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,
VLOG_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_LONG_OPTIONS
+
STREAM
_SSL_LONG_OPTIONS
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#endif
{0, 0, 0, 0},
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#endif
{0, 0, 0, 0},
@@
-306,6
+310,10
@@
parse_options(int argc, char *argv[])
}
break;
}
break;
+ case OPT_UNIXCTL:
+ unixctl_path = optarg;
+ break;
+
case 'h':
usage();
case 'h':
usage();
@@
-317,10
+325,10
@@
parse_options(int argc, char *argv[])
DAEMON_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
DAEMON_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_OPTION_HANDLERS
+
STREAM
_SSL_OPTION_HANDLERS
case OPT_PEER_CA_CERT:
case OPT_PEER_CA_CERT:
-
vconn
_ssl_set_peer_ca_cert_file(optarg);
+
stream
_ssl_set_peer_ca_cert_file(optarg);
break;
#endif
break;
#endif
@@
-350,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"
" --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);
" -h, --help display this help message\n"
" -V, --version display version information\n");
exit(EXIT_SUCCESS);