From 6e40043c71ed7446dcf5e9e63c2b1826eedc3353 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Mon, 25 Mar 2019 12:13:10 +0100
Subject: [PATCH] +,

---
 p4app/controller.py     | 2 +-
 p4src/static-mapping.p4 | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/p4app/controller.py b/p4app/controller.py
index a9fea7f..5e04fd9 100755
--- a/p4app/controller.py
+++ b/p4app/controller.py
@@ -139,7 +139,7 @@ class L2Controller(object):
                 self.nat64_map[mode].append({
                     "v6_src": v6_net['net'],
                     # "v6_dst": self.info['nat64_prefix'] # static -- not supported ATM
-                    "v6_dst": v6_dst
+                    "v6_dst": v6_dst,
                     "v4_src": v4_net['net'],
                     "v4_dst": v4_dst
                 })
diff --git a/p4src/static-mapping.p4 b/p4src/static-mapping.p4
index 0007a50..87a1dad 100644
--- a/p4src/static-mapping.p4
+++ b/p4src/static-mapping.p4
@@ -327,14 +327,13 @@ control MyIngress(inout headers hdr,
 	/********************** APPLYING TABLES ***********************************/
     apply {
         if(hdr.ipv6.isValid()) {
-
-            icmp6.apply(); /* icmp6 echo, icmp6 ndp */
-            nat64.apply(); /* v6 -> v4 */
+            icmp6.apply();       /* icmp6 echo, icmp6 ndp */
+            nat64.apply();       /* v6 -> v4 */
             v6_networks.apply(); /* routing, egress */
         }
         if(hdr.ipv4.isValid()) {
-            nat46.apply(); /* v4->v6 */
-            v4_networks.apply();
+            nat46.apply();       /* v4->v6 */
+            v4_networks.apply(); /* routing, egress */
         }
     }
 }