Format tunnel IDs consistently.

[openvswitch] / lib / odp-util.c

diff --git a/lib/odp-util.c b/lib/odp-util.c
index b497538d522af9e490ac241789aeec83dc9c89a9..6b4f5fada567e7c7c9a28e300f6c3d0cf718faf3 100644 (file)
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -42,7 +42,8 @@ odp_actions_add(struct odp_actions *actions, uint16_t type)
 void
 format_odp_flow_key(struct ds *ds, const struct odp_flow_key *key)
 {
-    ds_put_format(ds, "in_port%04x tci(", key->in_port);
+    ds_put_format(ds, "tun_id%#"PRIx32" in_port%d tci(",
+                  ntohl(key->tun_id), key->in_port);
     if (key->dl_tci) {
         ds_put_format(ds, "vlan%"PRIu16",pcp%d",
                       vlan_tci_to_vid(key->dl_tci),
@@ -69,29 +70,12 @@ format_odp_action(struct ds *ds, const union odp_action *a)
         ds_put_format(ds, "ctl(%"PRIu32")", a->controller.arg);
         break;
     case ODPAT_SET_TUNNEL:
-        ds_put_format(ds, "set_tunnel(0x%08"PRIx32")", ntohl(a->tunnel.tun_id));
+        ds_put_format(ds, "set_tunnel(%#"PRIx32")", ntohl(a->tunnel.tun_id));
         break;
-    case ODPAT_SET_DL_TCI: {
-        int vid = vlan_tci_to_vid(a->dl_tci.tci);
-        int pcp = vlan_tci_to_pcp(a->dl_tci.tci);
-
-        ds_put_cstr(ds, "set_tci(");
-        switch (ntohs(a->dl_tci.mask)) {
-        case VLAN_VID_MASK:
-            ds_put_format(ds, "set_tci(vlan=%d)", vid);
-            break;
-        case VLAN_PCP_MASK:
-            ds_put_format(ds, "set_tci(pcp=%d)", pcp);
-            break;
-        case VLAN_VID_MASK | VLAN_PCP_MASK:
-            ds_put_format(ds, "set_tci(vlan=%d,pcp=%d)", vid, pcp);
-            break;
-        default:
-            ds_put_format(ds, "set_tci(tci=%04"PRIx16",mask=%04"PRIx16")",
-                          ntohs(a->dl_tci.tci), ntohs(a->dl_tci.mask));
-            break;
-        }
-    }
+    case ODPAT_SET_DL_TCI:
+        ds_put_format(ds, "set_tci(vid=%"PRIu16",pcp=%d)",
+                      vlan_tci_to_vid(a->dl_tci.tci),
+                      vlan_tci_to_pcp(a->dl_tci.tci));
         break;
     case ODPAT_STRIP_VLAN:
         ds_put_format(ds, "strip_vlan");
@@ -183,14 +167,7 @@ odp_flow_key_from_flow(struct odp_flow_key *key, const struct flow *flow)
     key->nw_src = flow->nw_src;
     key->nw_dst = flow->nw_dst;
     key->in_port = flow->in_port;
-    if (flow->dl_vlan == htons(OFP_VLAN_NONE)) {
-        key->dl_tci = htons(0);
-    } else {
-        uint16_t vid = flow->dl_vlan & htons(VLAN_VID_MASK);
-        uint16_t pcp = htons((flow->dl_vlan_pcp << VLAN_PCP_SHIFT)
-                             & VLAN_PCP_MASK);
-        key->dl_tci = vid | pcp | htons(ODP_TCI_PRESENT);
-    }
+    key->dl_tci = flow->vlan_tci;
     key->dl_type = flow->dl_type;
     key->tp_src = flow->tp_src;
     key->tp_dst = flow->tp_dst;
@@ -203,17 +180,12 @@ odp_flow_key_from_flow(struct odp_flow_key *key, const struct flow *flow)
 void
 odp_flow_key_to_flow(const struct odp_flow_key *key, struct flow *flow)
 {
+    memset(flow->regs, 0, sizeof flow->regs);
     flow->tun_id = key->tun_id;
     flow->nw_src = key->nw_src;
     flow->nw_dst = key->nw_dst;
     flow->in_port = key->in_port;
-    if (key->dl_tci) {
-        flow->dl_vlan = htons(vlan_tci_to_vid(key->dl_tci));
-        flow->dl_vlan_pcp = vlan_tci_to_pcp(key->dl_tci);
-    } else {
-        flow->dl_vlan = htons(OFP_VLAN_NONE);
-        flow->dl_vlan_pcp = 0;
-    }
+    flow->vlan_tci = key->dl_tci;
     flow->dl_type = key->dl_type;
     flow->tp_src = key->tp_src;
     flow->tp_dst = key->tp_dst;