#include "compiler.h"
#include "daemon.h"
#include "learning-switch.h"
+#include "ofp-parse.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
/* -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
+/* --with-flows: File with flows to send to switch, or null to not load
* any default flows. */
-static FILE *flow_file = NULL;
+static struct ovs_queue default_flows = OVS_QUEUE_INITIALIZER;
/* --unixctl: Name of unixctl socket, or null to use the default. */
static char *unixctl_path = NULL;
for (i = optind; i < argc; i++) {
const char *name = argv[i];
struct vconn *vconn;
- int retval;
retval = vconn_open(name, OFP_VERSION, &vconn);
if (!retval) {
while (n_switches > 0 || n_listeners > 0) {
int iteration;
- int i;
/* Accept connections on listening vconns. */
for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) {
struct vconn *new_vconn;
- int retval;
retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
if (!retval || retval == EAGAIN) {
bool progress = false;
for (i = 0; i < n_switches; ) {
struct switch_ *this = &switches[i];
- int retval = do_switching(this);
+
+ retval = do_switching(this);
if (!retval || retval == EAGAIN) {
if (!retval) {
progress = true;
}
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);
{
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);
+ action_normal, default_flows.head);
lswitch_set_queue(sw->lswitch, queue_id);
}
: EAGAIN);
}
+static void
+read_flow_file(const char *name)
+{
+ struct ofpbuf *b;
+ FILE *stream;
+
+ stream = fopen(optarg, "r");
+ if (!stream) {
+ ovs_fatal(errno, "%s: open", name);
+ }
+
+ while ((b = parse_ofp_add_flow_file(stream)) != NULL) {
+ queue_push_tail(&default_flows, b);
+ }
+
+ fclose(stream);
+}
+
static void
parse_options(int argc, char *argv[])
{
break;
case OPT_WITH_FLOWS:
- flow_file = fopen(optarg, "r");
- if (flow_file == NULL) {
- ovs_fatal(errno, "%s: open", optarg);
- }
+ read_flow_file(optarg);
break;
case OPT_UNIXCTL: