X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Flearning-switch.h;h=c6f347e197dd247501e2ef44594bab6d14f157aa;hb=a7675d4e56d5108c554de25e7772c2eb60470abc;hp=2ce49e6123aef0f155bf173240d0cf7e43d6a2d2;hpb=ad67e568887f56d3b70a8225c3a476d94f70c20b;p=sliver-openvswitch.git

diff --git a/lib/learning-switch.h b/lib/learning-switch.h
index 2ce49e612..c6f347e19 100644
--- a/lib/learning-switch.h
+++ b/lib/learning-switch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
@@ -33,22 +33,30 @@ enum lswitch_mode {
 struct lswitch_config {
     enum lswitch_mode mode;
 
-    /* Set up only exact-match flows? */
-    bool exact_flows;
+    /* 0 to use exact-match flow entries,
+     * a OFPFW_* bitmask to enable specific wildcards,
+     * or UINT32_MAX to use the default wildcards (wildcarding as many fields
+     * as possible.
+     *
+     * Ignored when max_idle < 0 (in which case no flows are set up). */
+    uint32_t wildcards;
 
     /* <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;
+    /* Optionally, a list of one or more "struct ofpbuf"s containing 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 list *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;
+    /* The OpenFlow queue to use by default.  Use UINT32_MAX to avoid
+     * specifying a particular queue. */
+    uint32_t default_queue;
+
+    /* Maps from a port name to a queue_id (cast to void *). */
+    const struct shash *port_queues;
 };
 
 struct lswitch *lswitch_create(struct rconn *, const struct lswitch_config *);