learning-switch: Introduce struct for configuration.

This should make extensions easier.

1 files changed, 28 insertions, 4 deletions

diff --git a/lib/learning-switch.h b/lib/learning-switch.h
index edb31549..2ce49e61 100644
--- a/lib/learning-switch.h
+++ b/lib/learning-switch.h
@@ -24,10 +24,34 @@
 struct ofpbuf;
 struct rconn;
 
-struct lswitch *lswitch_create(struct rconn *, bool learn_macs,
-                               bool exact_flows, int max_idle,
-                               bool action_normal,
-                               const struct ofpbuf *default_flows);
+enum lswitch_mode {
+    LSW_NORMAL,                 /* Always use OFPP_NORMAL. */
+    LSW_FLOOD,                  /* Always use OFPP_FLOOD. */
+    LSW_LEARN                   /* Learn MACs at controller. */
+};
+
+struct lswitch_config {
+    enum lswitch_mode mode;
+
+    /* Set up only exact-match flows? */
+    bool exact_flows;
+
+    /* <0: Process every packet at the controller.
+     * >=0: Expire flows after they are unused for 'max_idle' seconds.
+     * OFP_FLOW_PERMANENT: Set up permanent flows. */
+    int max_idle;
+
+    /* Optionally, a chain of one or more OpenFlow messages to send to the
+     * switch at time of connection.  Presumably these will be OFPT_FLOW_MOD
+     * requests to set up the flow table. */
+    const struct ofpbuf *default_flows;
+
+    /* The OpenFlow queue used by packets and flows set up by 'sw'.  Use
+     * UINT32_MAX to avoid specifying a particular queue. */
+    uint32_t queue_id;
+};
+
+struct lswitch *lswitch_create(struct rconn *, const struct lswitch_config *);
 void lswitch_set_queue(struct lswitch *sw, uint32_t queue);
 void lswitch_run(struct lswitch *);
 void lswitch_wait(struct lswitch *);