X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-openflowd.c;h=486eae288e9e56ab3cd2d9823d18cb9d546b8dd4;hb=25608d9720000ba2f4b4a881ca2a8cf519404f96;hp=945b11d056b4e657cbd9fa52d28b34f8322bf187;hpb=2a022368f4b37559de5d5621a88c648023493f75;p=openvswitch diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 945b11d0..486eae28 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ #include "daemon.h" #include "dirs.h" #include "dpif.h" +#include "dummy.h" #include "leak-checker.h" #include "list.h" #include "netdev.h" @@ -46,14 +47,17 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(openflowd) +VLOG_DEFINE_THIS_MODULE(openflowd); /* Settings that may be configured by the user. */ struct ofsettings { + const char *unixctl_path; /* File name for unixctl socket. */ + /* Controller configuration. */ struct ofproto_controller *controllers; size_t n_controllers; enum ofproto_fail_mode fail_mode; + bool run_forever; /* Continue running even with no controller? */ /* Datapath. */ uint64_t datapath_id; /* Datapath ID. */ @@ -78,6 +82,8 @@ struct ofsettings { struct svec netflow; /* NetFlow targets. */ }; +static unixctl_cb_func ovs_openflowd_exit; + static void parse_options(int argc, char *argv[], struct ofsettings *); static void usage(void) NO_RETURN; @@ -90,6 +96,7 @@ main(int argc, char *argv[]) int error; struct dpif *dpif; struct netflow_options nf_options; + bool exiting; proctitle_init(argc, argv); set_program_name(argv[0]); @@ -100,11 +107,13 @@ main(int argc, char *argv[]) daemonize_start(); /* Start listening for ovs-appctl requests. */ - error = unixctl_server_create(NULL, &unixctl); + error = unixctl_server_create(s.unixctl_path, &unixctl); if (error) { exit(EXIT_FAILURE); } + unixctl_command_register("exit", ovs_openflowd_exit, &exiting); + VLOG_INFO("Open vSwitch version %s", VERSION BUILDNR); VLOG_INFO("OpenFlow protocol version 0x%02x", OFP_VERSION); @@ -119,10 +128,19 @@ main(int argc, char *argv[]) size_t i; SVEC_FOR_EACH (i, port, &s.ports) { - error = dpif_port_add(dpif, port, 0, NULL); + struct netdev *netdev; + + error = netdev_open_default(port, &netdev); + if (error) { + ovs_fatal(error, "%s: failed to open network device", port); + } + + error = dpif_port_add(dpif, netdev, NULL); if (error) { ovs_fatal(error, "failed to add %s as a port", port); } + + netdev_close(netdev); } } @@ -152,7 +170,8 @@ main(int argc, char *argv[]) daemonize_complete(); - while (ofproto_is_alive(ofproto)) { + exiting = false; + while (!exiting && (s.run_forever || ofproto_is_alive(ofproto))) { error = ofproto_run(ofproto); if (error) { ovs_fatal(error, "unrecoverable datapath error"); @@ -165,6 +184,9 @@ main(int argc, char *argv[]) unixctl_server_wait(unixctl); dp_wait(); netdev_wait(); + if (exiting) { + poll_immediate_wake(); + } poll_block(); } @@ -172,6 +194,15 @@ main(int argc, char *argv[]) return 0; } + +static void +ovs_openflowd_exit(struct unixctl_conn *conn, const char *args OVS_UNUSED, + void *exiting_) +{ + bool *exiting = exiting_; + *exiting = true; + unixctl_command_reply(conn, 200, NULL); +} /* User interface. */ @@ -200,8 +231,11 @@ parse_options(int argc, char *argv[], struct ofsettings *s) OPT_IN_BAND, OPT_NETFLOW, OPT_PORTS, + OPT_UNIXCTL, + OPT_ENABLE_DUMMY, VLOG_OPTION_ENUMS, - LEAK_CHECKER_OPTION_ENUMS + LEAK_CHECKER_OPTION_ENUMS, + DAEMON_OPTION_ENUMS }; static struct option long_options[] = { {"datapath-id", required_argument, 0, OPT_DATAPATH_ID}, @@ -226,6 +260,8 @@ parse_options(int argc, char *argv[], struct ofsettings *s) {"in-band", no_argument, 0, OPT_IN_BAND}, {"netflow", required_argument, 0, OPT_NETFLOW}, {"ports", required_argument, 0, OPT_PORTS}, + {"unixctl", required_argument, 0, OPT_UNIXCTL}, + {"enable-dummy", no_argument, 0, OPT_ENABLE_DUMMY}, {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, @@ -252,6 +288,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) controller_opts.update_resolv_conf = true; controller_opts.rate_limit = 0; controller_opts.burst_limit = 0; + s->unixctl_path = NULL; s->fail_mode = OFPROTO_FAIL_STANDALONE; s->datapath_id = 0; s->mfr_desc = NULL; @@ -390,6 +427,14 @@ parse_options(int argc, char *argv[], struct ofsettings *s) svec_split(&s->ports, optarg, ","); break; + case OPT_UNIXCTL: + s->unixctl_path = optarg; + break; + + case OPT_ENABLE_DUMMY: + dummy_enable(); + break; + case 'h': usage(); @@ -443,12 +488,17 @@ parse_options(int argc, char *argv[], struct ofsettings *s) dp_parse_name(argv[0], &s->dp_name, &s->dp_type); /* Figure out controller names. */ + s->run_forever = false; if (!controllers.n) { - svec_add_nocopy(&controllers, - xasprintf("punix:%s/%s.mgmt", ovs_rundir, s->dp_name)); + svec_add_nocopy(&controllers, xasprintf("punix:%s/%s.mgmt", + ovs_rundir(), s->dp_name)); } for (i = 1; i < argc; i++) { - svec_add(&controllers, argv[i]); + if (!strcmp(argv[i], "none")) { + s->run_forever = true; + } else { + svec_add(&controllers, argv[i]); + } } if (argc < 2) { svec_add(&controllers, "discover"); @@ -457,11 +507,9 @@ parse_options(int argc, char *argv[], struct ofsettings *s) /* Set up controllers. */ s->n_controllers = controllers.n; s->controllers = xmalloc(s->n_controllers * sizeof *s->controllers); - if (argc > 1) { - for (i = 0; i < s->n_controllers; i++) { - s->controllers[i] = controller_opts; - s->controllers[i].target = controllers.names[i]; - } + for (i = 0; i < s->n_controllers; i++) { + s->controllers[i] = controller_opts; + s->controllers[i].target = controllers.names[i]; } /* Sanity check. */ @@ -479,8 +527,9 @@ static void usage(void) { printf("%s: an OpenFlow switch implementation.\n" - "usage: %s [OPTIONS] DATAPATH [CONTROLLER...]\n" - "DATAPATH is a local datapath (e.g. \"dp0\").\n" + "usage: %s [OPTIONS] [TYPE@]DATAPATH [CONTROLLER...]\n" + "where DATAPATH is a local datapath (e.g. \"dp0\")\n" + "optionally with an explicit TYPE (default: \"system\").\n" "Each CONTROLLER is an active OpenFlow connection method. If\n" "none is given, ovs-openflowd performs controller discovery.\n", program_name, program_name); @@ -516,6 +565,7 @@ usage(void) 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();