Move Autoconf's macro definitions into config.h.

[sliver-openvswitch.git] / switch / switch-flow.c

diff --git a/switch/switch-flow.c b/switch/switch-flow.c
index e146dbb..732cea5 100644 (file)
--- a/switch/switch-flow.c
+++ b/switch/switch-flow.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "switch-flow.h"
 #include <arpa/inet.h>
 #include <assert.h>
@@ -81,17 +82,47 @@ int flow_del_matches(const struct sw_flow_key *t, const struct sw_flow_key *d, i
 void flow_extract_match(struct sw_flow_key* to, const struct ofp_match* from)
 {
     to->wildcards = ntohs(from->wildcards) & OFPFW_ALL;
-    to->flow.in_port   = from->in_port;
-    to->flow.dl_vlan   = from->dl_vlan;
+    to->flow.reserved = 0;
+    to->flow.in_port = from->in_port;
+    to->flow.dl_vlan = from->dl_vlan;
     memcpy(to->flow.dl_src, from->dl_src, ETH_ADDR_LEN);
     memcpy(to->flow.dl_dst, from->dl_dst, ETH_ADDR_LEN);
-    to->flow.dl_type   = from->dl_type;
-    to->flow.nw_src   = from->nw_src;
-    to->flow.nw_dst   = from->nw_dst;
-    to->flow.nw_proto  = from->nw_proto;
-    to->flow.tp_src   = from->tp_src;
-    to->flow.tp_dst   = from->tp_dst;
-    to->flow.reserved = 0;
+    to->flow.dl_type = from->dl_type;
+
+    to->flow.nw_src = to->flow.nw_dst = to->flow.nw_proto = 0;
+    to->flow.tp_src = to->flow.tp_dst = 0;
+
+#define OFPFW_TP (OFPFW_TP_SRC | OFPFW_TP_DST)
+#define OFPFW_NW (OFPFW_NW_SRC | OFPFW_NW_DST | OFPFW_NW_PROTO)
+    if (to->wildcards & OFPFW_DL_TYPE) {
+        /* Can't sensibly match on network or transport headers if the
+         * data link type is unknown. */
+        to->wildcards |= OFPFW_NW | OFPFW_TP;
+    } else if (from->dl_type == htons(ETH_TYPE_IP)) {
+        to->flow.nw_src   = from->nw_src;
+        to->flow.nw_dst   = from->nw_dst;
+        to->flow.nw_proto = from->nw_proto;
+
+        if (to->wildcards & OFPFW_NW_PROTO) {
+            /* Can't sensibly match on transport headers if the network
+             * protocol is unknown. */
+            to->wildcards |= OFPFW_TP;
+        } else if (from->nw_proto == IPPROTO_TCP 
+                || from->nw_proto == IPPROTO_UDP) {
+            to->flow.tp_src = from->tp_src;
+            to->flow.tp_dst = from->tp_dst;
+        } else {
+            /* Transport layer fields are undefined.  Mark them as
+             * exact-match to allow such flows to reside in table-hash,
+             * instead of falling into table-linear. */
+            to->wildcards &= ~OFPFW_TP;
+        }
+    } else {
+        /* Network and transport layer fields are undefined.  Mark them
+         * as exact-match to allow such flows to reside in table-hash,
+         * instead of falling into table-linear. */
+        to->wildcards &= ~(OFPFW_NW | OFPFW_TP);
+    }
 }
 
 void flow_fill_match(struct ofp_match* to, const struct sw_flow_key* from)