From 4803b56e658ce660d2bf2f3aef44acc732f0b171 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Mon, 24 Jun 2019 13:11:12 +0200
Subject: [PATCH] s/p/hdr/, add settings.h

---
 netpfga/minip4/src/minip4_solution-nat64.p4 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/netpfga/minip4/src/minip4_solution-nat64.p4 b/netpfga/minip4/src/minip4_solution-nat64.p4
index 55c1526..b26a372 100644
--- a/netpfga/minip4/src/minip4_solution-nat64.p4
+++ b/netpfga/minip4/src/minip4_solution-nat64.p4
@@ -1,6 +1,7 @@
 #include <core.p4>
 #include <sume_switch.p4>
 #include "headers.p4"
+#include "settings.p4"
 
 /********************************************************************************
  * Possible bugs / things to fix:
@@ -53,7 +54,7 @@ parser TopParser(packet_in b,
 /********************************************************************************
  * Main
  */
-control TopPipe(inout Parsed_packet p,
+control TopPipe(inout Parsed_packet hdr,
                 inout metadata meta,
                 inout digest_data_t digest_data,
                 inout sume_metadata_t sume_metadata) {
@@ -568,9 +569,9 @@ control TopPipe(inout Parsed_packet p,
 
 
     action swap_eth_addresses() {
-        EthAddr_t temp = p.ethernet.dstAddr;
-        p.ethernet.dstAddr = p.ethernet.srcAddr;
-        p.ethernet.srcAddr = temp;
+        EthAddr_t temp = hdr.ethernet.dstAddr;
+        hdr.ethernet.dstAddr = hdr.ethernet.srcAddr;
+        hdr.ethernet.srcAddr = temp;
 
         /* set egress port */
         sume_metadata.dst_port = sume_metadata.src_port;
@@ -594,7 +595,7 @@ control TopPipe(inout Parsed_packet p,
     // }
 
     action do_nothing() {
-        EthAddr_t temp = p.ethernet.dstAddr;
+        EthAddr_t temp = hdr.ethernet.dstAddr;
     }
 
     table lookup_table {
@@ -625,12 +626,12 @@ control TopPipe(inout Parsed_packet p,
 
 @Xilinx_MaxPacketRegion(1024)
 control TopDeparser(packet_out b,
-                    in Parsed_packet p,
+                    in Parsed_packet hdr,
                     in metadata meta,
                     inout digest_data_t digest_data,
                     inout sume_metadata_t sume_metadata) {
     apply {
-        b.emit(p.ethernet);
+        b.emit(hdr.ethernet);
     }
 }