/*
- * 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.
#include <limits.h>
#include <signal.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.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 "stream-ssl.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn-ssl.h"
#include "vconn.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_controller
+
+VLOG_DEFINE_THIS_MODULE(controller)
#define MAX_SWITCHES 16
#define MAX_LISTENERS 16
/* Set up flows? (If not, every packet is processed at the controller.) */
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;
* of their messages (for debugging fail-open mode). */
static bool mute = false;
+/* -q, --queue: OpenFlow queue to use, or the default queue if UINT32_MAX. */
+static uint32_t queue_id = UINT32_MAX;
+
+/* --with-flows: File with flows to send to switch, or null to not load
+ * any default flows. */
+static FILE *flow_file = NULL;
+
+/* --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;
int retval;
int i;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
- register_fault_handlers();
- time_init();
- vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
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;
}
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;
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 {
}
for (i = 0; i < n_switches; i++) {
struct switch_ *this = &switches[i];
- lswitch_run(this->lswitch, this->rconn);
+ lswitch_run(this->lswitch);
}
unixctl_server_run(unixctl);
}
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,
- set_up_flows ? max_idle : -1);
+ sw->rconn = rconn_create(60, 0);
+ rconn_connect_unreliably(sw->rconn, vconn, NULL);
+
+ /* If it was set, rewind 'flow_file' to the beginning, since a
+ * previous call to lswitch_create() will leave the stream at the
+ * end. */
+ if (flow_file) {
+ rewind(flow_file);
+ }
+ sw->lswitch = lswitch_create(sw->rconn, learn_macs, exact_flows,
+ set_up_flows ? max_idle : -1,
+ action_normal, flow_file);
+
+ lswitch_set_queue(sw->lswitch, queue_id);
}
static int
OPT_MAX_IDLE = UCHAR_MAX + 1,
OPT_PEER_CA_CERT,
OPT_MUTE,
+ OPT_WITH_FLOWS,
+ 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},
+ {"queue", required_argument, 0, 'q'},
+ {"with-flows", required_argument, 0, OPT_WITH_FLOWS},
+ {"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},
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;
}
break;
+ case 'q':
+ queue_id = atoi(optarg);
+ break;
+
+ case OPT_WITH_FLOWS:
+ flow_file = fopen(optarg, "r");
+ if (flow_file == NULL) {
+ ovs_fatal(errno, "%s: open", optarg);
+ }
+ break;
+
+ case OPT_UNIXCTL:
+ unixctl_path = optarg;
+ break;
+
case 'h':
usage();
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
" -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"
+ " -q, --queue=QUEUE OpenFlow queue ID to use for output\n"
+ " --with-flows FILE use the flows from FILE\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);
git://git.onelab.eu / sliver-openvswitch.git / blobdiff