[ovs-dev] [mirror 08/13] odp-util: New function ovs_key_attr_to_string().

[Ben Pfaff]

This seems like a worthwhile improvement in itself, but it will also see
additional users in upcoming commits.
---
 lib/odp-util.c |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/lib/odp-util.c b/lib/odp-util.c
index 1f6f33d..9959662 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -75,6 +75,31 @@ odp_action_len(uint16_t type)
     return -1;
 }
 
+static const char *
+ovs_key_attr_to_string(enum ovs_key_attr attr)
+{
+    switch (attr) {
+       case OVS_KEY_ATTR_UNSPEC: return "unspec";
+       case OVS_KEY_ATTR_TUN_ID: return "tun_id";
+       case OVS_KEY_ATTR_IN_PORT: return "in_port";
+       case OVS_KEY_ATTR_ETHERNET: return "eth";
+       case OVS_KEY_ATTR_8021Q: return "vlan";
+       case OVS_KEY_ATTR_ETHERTYPE: return "eth_type";
+       case OVS_KEY_ATTR_IPV4: return "ipv4";
+       case OVS_KEY_ATTR_IPV6: return "ipv6";
+       case OVS_KEY_ATTR_TCP: return "tcp";
+       case OVS_KEY_ATTR_UDP: return "udp";
+       case OVS_KEY_ATTR_ICMP: return "icmp";
+       case OVS_KEY_ATTR_ICMPV6: return "icmpv6";
+       case OVS_KEY_ATTR_ARP: return "arp";
+       case OVS_KEY_ATTR_ND: return "nd";
+
+    case __OVS_KEY_ATTR_MAX:
+    default:
+        return "<unknown>";
+    }
+}
+
 static void
 format_generic_odp_action(struct ds *ds, const struct nlattr *a)
 {
@@ -163,6 +188,15 @@ format_odp_userspace_action(struct ds *ds, const struct 
nlattr *attr)
     ds_put_char(ds, ')');
 }
 
+static void
+format_odp_pop_action(uint16_t type, struct ds *ds)
+{
+    if (type <= OVS_KEY_ATTR_MAX) {
+        ds_put_format(ds, "pop(%s)", ovs_key_attr_to_string(type));
+    } else {
+        ds_put_format(ds, "pop(key%"PRIu16")", type);
+    }
+}
 
 static void
 format_odp_action(struct ds *ds, const struct nlattr *a)
@@ -197,11 +231,7 @@ format_odp_action(struct ds *ds, const struct nlattr *a)
         ds_put_cstr(ds, ")");
         break;
     case OVS_ACTION_ATTR_POP:
-        if (nl_attr_get_u16(a) == OVS_KEY_ATTR_8021Q) {
-            ds_put_cstr(ds, "pop(vlan)");
-        } else {
-            ds_put_format(ds, "pop(key%"PRIu16")", nl_attr_get_u16(a));
-        }
+        format_odp_pop_action(nl_attr_get_u16(a), ds);
         break;
     case OVS_ACTION_ATTR_SET_PRIORITY:
         ds_put_format(ds, "set_priority(%#"PRIx32")", nl_attr_get_u32(a));
-- 
1.7.2.5

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev