/*
- * 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.
/* -Q, --port-queue: map from port name to port number (cast to void *). */
static struct shash port_queues = SHASH_INITIALIZER(&port_queues);
-/* --with-flows: File with flows to send to switch, or null to not load
- * any default flows. */
-static struct ovs_queue default_flows = OVS_QUEUE_INITIALIZER;
+/* --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);
/* --unixctl: Name of unixctl socket, or null to use the default. */
static char *unixctl_path = NULL;
ovs_fatal(0, "no active or passive switch connections");
}
- die_if_already_running();
daemonize_start();
retval = unixctl_server_create(unixctl_path, &unixctl);
: learn_macs ? LSW_LEARN
: LSW_FLOOD);
cfg.max_idle = set_up_flows ? max_idle : -1;
- cfg.default_flows = default_flows.head;
+ cfg.default_flows = &default_flows;
cfg.default_queue = default_queue;
cfg.port_queues = &port_queues;
sw->lswitch = lswitch_create(sw->rconn, &cfg);
static void
read_flow_file(const char *name)
{
- struct ofpbuf *b;
+ enum nx_flow_format flow_format;
FILE *stream;
stream = fopen(optarg, "r");
ovs_fatal(errno, "%s: open", name);
}
- while ((b = parse_ofp_add_flow_file(stream)) != NULL) {
- queue_push_tail(&default_flows, b);
+ flow_format = NXFF_OPENFLOW10;
+ while (parse_ofp_flow_mod_file(&default_flows, &flow_format, stream,
+ OFPFC_ADD)) {
+ continue;
}
fclose(stream);
OPT_MUTE,
OPT_WITH_FLOWS,
OPT_UNIXCTL,
- VLOG_OPTION_ENUMS
+ VLOG_OPTION_ENUMS,
+ DAEMON_OPTION_ENUMS
};
static struct option long_options[] = {
{"hub", no_argument, 0, 'H'},