odp: Enable parsing ipv4_tunnel key.

We can format ipv4_tunnel keys from the kernel but can't currently
parse them.  Userspace doesn't know how to do anything with this
information but this support enables utilities like ovs-dpctl and
ovs-appctl ofproto/trace to show useful information.

Bug #13785

Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/lib/odp-util.c b/lib/odp-util.c
index 9ed17ed89343b6f62c44d230500dd0454e59de9f..4084e55d626835a8c96bf158dd37a67fad217fd5 100644 (file)
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -924,6 +924,30 @@ parse_odp_key_attr(const char *s, const struct simap *port_names,
         }
     }
 
+    {
+        char tun_id_s[32];
+        unsigned long long int flags;
+        int tos, ttl;
+        struct ovs_key_ipv4_tunnel tun_key;
+        int n = -1;
+
+        if (sscanf(s, "ipv4_tunnel(tun_id=%31[x0123456789abcdefABCDEF],"
+                   "flags=%lli,src="IP_SCAN_FMT",dst="IP_SCAN_FMT
+                   ",tos=%i,ttl=%i)%n", tun_id_s, &flags,
+                    IP_SCAN_ARGS(&tun_key.ipv4_src),
+                    IP_SCAN_ARGS(&tun_key.ipv4_dst), &tos, &ttl,
+                    &n) > 0 && n > 0) {
+            tun_key.tun_id = htonll(strtoull(tun_id_s, NULL, 0));
+            tun_key.tun_flags = flags;
+            tun_key.ipv4_tos = tos;
+            tun_key.ipv4_ttl = ttl;
+            memset(&tun_key.pad, 0, sizeof tun_key.pad);
+            nl_msg_put_unspec(key, OVS_KEY_ATTR_IPV4_TUNNEL, &tun_key,
+                              sizeof tun_key);
+            return n;
+        }
+    }
+
     {
         unsigned long long int in_port;
         int n = -1;

diff --git a/tests/odp.at b/tests/odp.at
index 9617af266e04b879daa998425badbccf272c7ae9..505e4c83d21c21ebe252773bde9adab9cb6346ab 100644 (file)
--- a/tests/odp.at
+++ b/tests/odp.at
@@ -91,6 +91,7 @@ push_vlan(tpid=0x9100,vid=13,pcp=5)
 push_vlan(tpid=0x9100,vid=13,pcp=5,cfi=0)
 pop_vlan
 sample(sample=9.7%,actions(1,2,3,push_vlan(vid=1,pcp=2)))
+set(ipv4_tunnel(tun_id=0xabcdef1234567890,flags=0x0,src=1.1.1.1,dst=2.2.2.2,tos=0x0,ttl=64))
 ])
 AT_CHECK_UNQUOTED([test-odp parse-actions < actions.txt], [0],
   [`cat actions.txt`