X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=f4358e9f352fb9276625da74982505e8b5f26c7b;hb=e3648418c4bf028e6bca38bcbfc5a5ed493447fb;hp=314da18682f7e49e25a43aefc3f8685f5cb860a5;hpb=576e26d7b47f4e53116ef0b5f035d260f426d37b;p=sliver-openvswitch.git diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 314da1868..f4358e9f3 100644 --- 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. @@ -26,16 +26,15 @@ #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 "stream-ssl.h" #include "timeval.h" #include "unixctl.h" #include "util.h" -#include "vconn-ssl.h" #include "vconn.h" #include "vlog.h" @@ -53,7 +52,13 @@ struct switch_ { static bool learn_macs = true; /* Set up flows? (If not, every packet is processed at the controller.) */ -static bool setup_flows = true; +static bool set_up_flows = true; + +/* -N, --normal: Use "NORMAL" action instead of explicit port? */ +static bool action_normal = false; + +/* -w, --wildcard: Set up exact match or wildcard flow entries? */ +static bool exact_flows = true; /* --max-idle: Maximum idle time, in seconds, before flows expire. */ static int max_idle = 60; @@ -62,8 +67,11 @@ 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 new_switch(struct switch_ *, struct vconn *); static void parse_options(int argc, char *argv[]); static void usage(void) NO_RETURN; @@ -77,8 +85,8 @@ main(int argc, char *argv[]) int retval; int i; + proctitle_init(argc, argv); set_program_name(argv[0]); - register_fault_handlers(); time_init(); vlog_init(); parse_options(argc, argv); @@ -100,7 +108,7 @@ main(int argc, char *argv[]) if (n_switches >= MAX_SWITCHES) { ovs_fatal(0, "max %d switch connections", n_switches); } - new_switch(&switches[n_switches++], vconn, name); + new_switch(&switches[n_switches++], vconn); continue; } else if (retval == EAFNOSUPPORT) { struct pvconn *pvconn; @@ -121,13 +129,15 @@ main(int argc, char *argv[]) } die_if_already_running(); - daemonize(); + daemonize_start(); - retval = unixctl_server_create(NULL, &unixctl); + retval = unixctl_server_create(unixctl_path, &unixctl); if (retval) { - ovs_fatal(retval, "Could not listen for unixctl connections"); + exit(EXIT_FAILURE); } + daemonize_complete(); + while (n_switches > 0 || n_listeners > 0) { int iteration; int i; @@ -140,7 +150,7 @@ main(int argc, char *argv[]) retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn); if (!retval || retval == EAGAIN) { if (!retval) { - new_switch(&switches[n_switches++], new_vconn, "tcp"); + new_switch(&switches[n_switches++], new_vconn); } i++; } else { @@ -198,11 +208,13 @@ main(int argc, char *argv[]) } static void -new_switch(struct switch_ *sw, struct vconn *vconn, const char *name) +new_switch(struct switch_ *sw, struct vconn *vconn) { - sw->rconn = rconn_new_from_vconn(name, vconn); - sw->lswitch = lswitch_create(sw->rconn, learn_macs, - setup_flows ? max_idle : -1); + sw->rconn = rconn_create(60, 0); + rconn_connect_unreliably(sw->rconn, vconn, NULL); + sw->lswitch = lswitch_create(sw->rconn, learn_macs, exact_flows, + set_up_flows ? max_idle : -1, + action_normal); } static int @@ -234,19 +246,23 @@ 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[] = { {"hub", no_argument, 0, 'H'}, {"noflow", no_argument, 0, 'n'}, + {"normal", no_argument, 0, 'N'}, + {"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 - VCONN_SSL_LONG_OPTIONS + STREAM_SSL_LONG_OPTIONS {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT}, #endif {0, 0, 0, 0}, @@ -268,13 +284,21 @@ parse_options(int argc, char *argv[]) break; case 'n': - setup_flows = false; + set_up_flows = false; break; case OPT_MUTE: mute = true; break; + case 'N': + action_normal = true; + break; + + case 'w': + exact_flows = false; + break; + case OPT_MAX_IDLE: if (!strcmp(optarg, "permanent")) { max_idle = OFP_FLOW_PERMANENT; @@ -287,6 +311,10 @@ parse_options(int argc, char *argv[]) } break; + case OPT_UNIXCTL: + unixctl_path = optarg; + break; + case 'h': usage(); @@ -298,10 +326,10 @@ parse_options(int argc, char *argv[]) DAEMON_OPTION_HANDLERS #ifdef HAVE_OPENSSL - VCONN_SSL_OPTION_HANDLERS + STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: - vconn_ssl_set_peer_ca_cert_file(optarg); + stream_ssl_set_peer_ca_cert_file(optarg); break; #endif @@ -329,6 +357,9 @@ usage(void) " -H, --hub act as hub instead of learning switch\n" " -n, --noflow pass traffic, but don't add flows\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);