#include "daemon.h"
#include "datapath.h"
#include "fault.h"
-#include "openflow.h"
+#include "openflow/openflow.h"
#include "poll-loop.h"
#include "queue.h"
#include "util.h"
signal(SIGPIPE, SIG_IGN);
if (argc - optind != 1) {
- fatal(0, "missing controller argument; use --help for usage");
+ ofp_fatal(0, "missing controller argument; use --help for usage");
}
rconn = rconn_create(60, max_backoff);
error = rconn_connect(rconn, argv[optind]);
if (error == EAFNOSUPPORT) {
- fatal(0, "no support for %s vconn", argv[optind]);
+ ofp_fatal(0, "no support for %s vconn", argv[optind]);
}
error = dp_new(&dp, dpid, rconn);
if (listen_pvconn_name) {
retval = pvconn_open(listen_pvconn_name, &listen_pvconn);
if (retval && retval != EAGAIN) {
- fatal(retval, "opening %s", listen_pvconn_name);
+ ofp_fatal(retval, "opening %s", listen_pvconn_name);
}
dp_add_listen_pvconn(dp, listen_pvconn);
}
if (error) {
- fatal(error, "could not create datapath");
+ ofp_fatal(error, "could not create datapath");
}
if (port_list) {
add_ports(dp, port_list);
}
+ die_if_already_running();
+ daemonize();
+
error = vlog_server_listen(NULL, NULL);
if (error) {
- fatal(error, "could not listen for vlog connections");
+ ofp_fatal(error, "could not listen for vlog connections");
}
- die_if_already_running();
- daemonize();
-
for (;;) {
dp_run(dp);
dp_wait(dp);
port = strtok_r(NULL, ",,", &save_ptr)) {
int error = dp_add_port(dp, port);
if (error) {
- fatal(error, "failed to add port %s", port);
+ ofp_fatal(error, "failed to add port %s", port);
}
}
}
OPT_MFR_DESC,
OPT_HW_DESC,
OPT_SW_DESC,
- OPT_SERIAL_NUM
+ OPT_SERIAL_NUM,
+ OPT_BOOTSTRAP_CA_CERT
};
static struct option long_options[] = {
{"datapath-id", required_argument, 0, 'd'},
{"max-backoff", required_argument, 0, OPT_MAX_BACKOFF},
{"listen", required_argument, 0, 'l'},
- {"detach", no_argument, 0, 'D'},
- {"pidfile", optional_argument, 0, 'P'},
- {"force", no_argument, 0, 'f'},
{"verbose", optional_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
{"hw-desc", required_argument, 0, OPT_HW_DESC},
{"sw-desc", required_argument, 0, OPT_SW_DESC},
{"serial_num", required_argument, 0, OPT_SERIAL_NUM},
+ DAEMON_LONG_OPTIONS,
+#ifdef HAVE_OPENSSL
VCONN_SSL_LONG_OPTIONS
+ {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
+#endif
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
case 'd':
if (strlen(optarg) != 12
|| strspn(optarg, "0123456789abcdefABCDEF") != 12) {
- fatal(0, "argument to -d or --datapath-id must be "
- "exactly 12 hex digits");
+ ofp_fatal(0, "argument to -d or --datapath-id must be "
+ "exactly 12 hex digits");
}
dpid = strtoll(optarg, NULL, 16);
if (!dpid) {
- fatal(0, "argument to -d or --datapath-id must be nonzero");
+ ofp_fatal(0, "argument to -d or --datapath-id must "
+ "be nonzero");
}
break;
usage();
case 'V':
- printf("%s "VERSION" compiled "__DATE__" "__TIME__"\n", argv[0]);
+ printf("%s %s compiled "__DATE__" "__TIME__"\n",
+ program_name, VERSION BUILDNR);
exit(EXIT_SUCCESS);
- case 'D':
- set_detach();
- break;
-
- case 'P':
- set_pidfile(optarg);
- break;
-
- case 'f':
- ignore_existing_pidfile();
- break;
-
case 'v':
vlog_set_verbosity(optarg);
break;
case OPT_MAX_BACKOFF:
max_backoff = atoi(optarg);
if (max_backoff < 1) {
- fatal(0, "--max-backoff argument must be at least 1");
+ ofp_fatal(0, "--max-backoff argument must be at least 1");
} else if (max_backoff > 3600) {
max_backoff = 3600;
}
case 'l':
if (listen_pvconn_name) {
- fatal(0, "-l or --listen may be only specified once");
+ ofp_fatal(0, "-l or --listen may be only specified once");
}
listen_pvconn_name = optarg;
break;
+ DAEMON_OPTION_HANDLERS
+
+#ifdef HAVE_OPENSSL
VCONN_SSL_OPTION_HANDLERS
+ case OPT_BOOTSTRAP_CA_CERT:
+ vconn_ssl_set_ca_cert_file(optarg, true);
+ break;
+#endif
+
case '?':
exit(EXIT_FAILURE);
"usage: %s [OPTIONS] CONTROLLER\n"
"where CONTROLLER is an active OpenFlow connection method.\n",
program_name, program_name);
- vconn_usage(true, true);
+ vconn_usage(true, true, true);
printf("\nConfiguration options:\n"
" -i, --interfaces=NETDEV[,NETDEV]...\n"
" add specified initial switch ports\n"
" --max-backoff=SECS max time between controller connection\n"
" attempts (default: 15 seconds)\n"
" -l, --listen=METHOD allow management connections on METHOD\n"
- " (a passive OpenFlow connection method)\n"
- "\nOther options:\n"
- " -D, --detach run in background as daemon\n"
- " -P, --pidfile[=FILE] create pidfile (default: %s/switch.pid)\n"
- " -f, --force with -P, start even if already running\n"
- " -v, --verbose=MODULE[:FACILITY[:LEVEL]] set logging levels\n"
- " -v, --verbose set maximum verbosity level\n"
+ " (a passive OpenFlow connection method)\n");
+ daemon_usage();
+ vlog_usage();
+ printf("\nOther options:\n"
" -h, --help display this help message\n"
- " -V, --version display version information\n",
- RUNDIR);
+ " -V, --version display version information\n");
exit(EXIT_SUCCESS);
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff