From c1953aab5c51364c8424345a8f86c044d44b453d Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Wed, 27 Mar 2019 13:32:14 +0100
Subject: [PATCH] Re-enable standard IPv4 processing

---
 p4src/static-mapping.p4 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/p4src/static-mapping.p4 b/p4src/static-mapping.p4
index 0713858..af00b49 100644
--- a/p4src/static-mapping.p4
+++ b/p4src/static-mapping.p4
@@ -341,14 +341,13 @@ control MyIngress(inout headers hdr,
                 exit; /* no further v6 processing */
             }
             v6_networks.apply(); /* egress / routing */
+        } else if(hdr.ipv4.isValid()) {
+            if(nat46.apply().hit) {       /* v4->v6 */
+                v6_networks.apply();      /* Now apply v6 egress */
+                exit; /* no further v4 processing */
+            }
+            v4_networks.apply(); /* routing, egress */
         }
-        // else if(hdr.ipv4.isValid()) {
-        //     if(nat46.apply().hit) {       /* v4->v6 */
-        //         v6_networks.apply();      /* Now apply v6 egress */
-        //         exit; /* no further v4 processing */
-        //     }
-        //     v4_networks.apply(); /* routing, egress */
-        // }
     }
 }