/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "daemon.h"
#include "learning-switch.h"
#include "ofp-parse.h"
+#include "ofp-version-opt.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
-#include "shash.h"
+#include "simap.h"
#include "stream-ssl.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "vconn.h"
#include "vlog.h"
+#include "socket-util.h"
+#include "ofp-util.h"
VLOG_DEFINE_THIS_MODULE(controller);
struct switch_ {
struct lswitch *lswitch;
- struct rconn *rconn;
};
/* -H, --hub: Learn the ports on which MAC addresses appear? */
/* -N, --normal: Use "NORMAL" action instead of explicit port? */
static bool action_normal = false;
-/* -w, --wildcard: 0 to disable wildcard flow entries, a OFPFW_* bitmask to
+/* -w, --wildcard: 0 to disable wildcard flow entries, an OFPFW10_* bitmask to
* enable specific wildcards, or UINT32_MAX to use the default wildcards. */
static uint32_t wildcards = 0;
/* -q, --queue: default OpenFlow queue, none if UINT32_MAX. */
static uint32_t default_queue = UINT32_MAX;
-/* -Q, --port-queue: map from port name to port number (cast to void *). */
-static struct shash port_queues = SHASH_INITIALIZER(&port_queues);
+/* -Q, --port-queue: map from port name to port number. */
+static struct simap port_queues = SIMAP_INITIALIZER(&port_queues);
-/* --with-flows: Flows to send to switch, or an empty list not to send any
- * default flows. */
-static struct list default_flows = LIST_INITIALIZER(&default_flows);
+/* --with-flows: Flows to send to switch. */
+static struct ofputil_flow_mod *default_flows;
+static size_t n_default_flows;
/* --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 *);
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
const char *name = argv[i];
struct vconn *vconn;
- retval = vconn_open(name, OFP_VERSION, &vconn);
+ retval = vconn_open(name, get_allowed_ofp_versions(), DSCP_DEFAULT,
+ &vconn);
if (!retval) {
if (n_switches >= MAX_SWITCHES) {
ovs_fatal(0, "max %d switch connections", n_switches);
continue;
} else if (retval == EAFNOSUPPORT) {
struct pvconn *pvconn;
- retval = pvconn_open(name, &pvconn);
+ retval = pvconn_open(name, get_allowed_ofp_versions(),
+ DSCP_DEFAULT, &pvconn);
if (!retval) {
if (n_listeners >= MAX_LISTENERS) {
ovs_fatal(0, "max %d passive connections", n_listeners);
}
}
if (retval) {
- VLOG_ERR("%s: connect: %s", name, strerror(retval));
+ VLOG_ERR("%s: connect: %s", name, ovs_strerror(retval));
}
}
if (n_switches == 0 && n_listeners == 0) {
daemonize_complete();
while (n_switches > 0 || n_listeners > 0) {
- int iteration;
-
/* Accept connections on listening vconns. */
for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) {
struct vconn *new_vconn;
- retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
+ retval = pvconn_accept(listeners[i], &new_vconn);
if (!retval || retval == EAGAIN) {
if (!retval) {
new_switch(&switches[n_switches++], new_vconn);
}
}
- /* Do some switching work. Limit the number of iterations so that
- * callbacks registered with the poll loop don't starve. */
- for (iteration = 0; iteration < 50; iteration++) {
- bool progress = false;
- for (i = 0; i < n_switches; ) {
- struct switch_ *this = &switches[i];
-
- retval = do_switching(this);
- if (!retval || retval == EAGAIN) {
- if (!retval) {
- progress = true;
- }
- i++;
- } else {
- rconn_destroy(this->rconn);
- lswitch_destroy(this->lswitch);
- switches[i] = switches[--n_switches];
- }
- }
- if (!progress) {
- break;
- }
- }
- for (i = 0; i < n_switches; i++) {
+ /* Do some switching work. . */
+ for (i = 0; i < n_switches; ) {
struct switch_ *this = &switches[i];
lswitch_run(this->lswitch);
+ if (lswitch_is_alive(this->lswitch)) {
+ i++;
+ } else {
+ lswitch_destroy(this->lswitch);
+ switches[i] = switches[--n_switches];
+ }
}
unixctl_server_run(unixctl);
}
for (i = 0; i < n_switches; i++) {
struct switch_ *sw = &switches[i];
- rconn_run_wait(sw->rconn);
- rconn_recv_wait(sw->rconn);
lswitch_wait(sw->lswitch);
}
unixctl_server_wait(unixctl);
new_switch(struct switch_ *sw, struct vconn *vconn)
{
struct lswitch_config cfg;
+ struct rconn *rconn;
- sw->rconn = rconn_create(60, 0);
- rconn_connect_unreliably(sw->rconn, vconn, NULL);
+ rconn = rconn_create(60, 0, DSCP_DEFAULT, get_allowed_ofp_versions());
+ rconn_connect_unreliably(rconn, vconn, NULL);
cfg.mode = (action_normal ? LSW_NORMAL
: learn_macs ? LSW_LEARN
: LSW_FLOOD);
cfg.wildcards = wildcards;
cfg.max_idle = set_up_flows ? max_idle : -1;
- cfg.default_flows = &default_flows;
+ cfg.default_flows = default_flows;
+ cfg.n_default_flows = n_default_flows;
cfg.default_queue = default_queue;
cfg.port_queues = &port_queues;
- sw->lswitch = lswitch_create(sw->rconn, &cfg);
-}
-
-static int
-do_switching(struct switch_ *sw)
-{
- unsigned int packets_sent;
- struct ofpbuf *msg;
-
- packets_sent = rconn_packets_sent(sw->rconn);
-
- msg = rconn_recv(sw->rconn);
- if (msg) {
- if (!mute) {
- lswitch_process_packet(sw->lswitch, sw->rconn, msg);
- }
- ofpbuf_delete(msg);
- }
- rconn_run(sw->rconn);
-
- return (!rconn_is_alive(sw->rconn) ? EOF
- : rconn_packets_sent(sw->rconn) != packets_sent ? 0
- : EAGAIN);
-}
-
-static void
-read_flow_file(const char *name)
-{
- enum nx_flow_format flow_format;
- bool flow_mod_table_id;
- FILE *stream;
-
- stream = fopen(optarg, "r");
- if (!stream) {
- ovs_fatal(errno, "%s: open", name);
- }
-
- flow_format = NXFF_OPENFLOW10;
- flow_mod_table_id = false;
- while (parse_ofp_flow_mod_file(&default_flows,
- &flow_format, &flow_mod_table_id,
- stream, OFPFC_ADD)) {
- continue;
- }
-
- fclose(stream);
+ cfg.mute = mute;
+ sw->lswitch = lswitch_create(rconn, &cfg);
}
static void
"\"<port-name>:<queue-id>\"");
}
- if (!shash_add_once(&port_queues, port_name,
- (void *) (uintptr_t) atoi(queue_id))) {
+ if (!simap_put(&port_queues, port_name, atoi(queue_id))) {
ovs_fatal(0, "<port-name> arguments for -Q or --port-queue must "
"be unique");
}
OPT_WITH_FLOWS,
OPT_UNIXCTL,
VLOG_OPTION_ENUMS,
- DAEMON_OPTION_ENUMS
+ DAEMON_OPTION_ENUMS,
+ OFP_VERSION_OPTION_ENUMS
};
- static struct option long_options[] = {
+ static const struct option long_options[] = {
{"hub", no_argument, NULL, 'H'},
{"noflow", no_argument, NULL, 'n'},
{"normal", no_argument, NULL, 'N'},
{"with-flows", required_argument, NULL, OPT_WITH_FLOWS},
{"unixctl", required_argument, NULL, OPT_UNIXCTL},
{"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'V'},
DAEMON_LONG_OPTIONS,
+ OFP_VERSION_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS,
{"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
break;
case OPT_WITH_FLOWS:
- read_flow_file(optarg);
+ parse_ofp_flow_mod_file(optarg, OFPFC_ADD, &default_flows,
+ &n_default_flows);
break;
case OPT_UNIXCTL:
case 'h':
usage();
- case 'V':
- ovs_print_version(OFP_VERSION, OFP_VERSION);
- exit(EXIT_SUCCESS);
-
VLOG_OPTION_HANDLERS
+ OFP_VERSION_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
STREAM_SSL_OPTION_HANDLERS
}
free(short_options);
- if (!shash_is_empty(&port_queues) || default_queue != UINT32_MAX) {
+ if (!simap_is_empty(&port_queues) || default_queue != UINT32_MAX) {
if (action_normal) {
ovs_error(0, "queue IDs are incompatible with -N or --normal; "
"not using OFPP_NORMAL");
program_name, program_name);
vconn_usage(true, true, false);
daemon_usage();
+ ofp_version_usage();
vlog_usage();
printf("\nOther options:\n"
" -H, --hub act as hub instead of learning switch\n"
git://git.onelab.eu / sliver-openvswitch.git / blobdiff