From 34b65c2425c6c761707bb877c0783c1a133fee07 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Mon, 29 Jan 2024 21:05:49 +0000 Subject: [PATCH] Change deparser header struct to direction inout --- PNA.mdk | 4 ++-- examples/ipsec-acc.p4 | 2 +- examples/pna-demo-L2-one-table.p4 | 2 +- examples/pna-demo-L2-two-tables.p4 | 2 +- examples/pna-demo-last-forwarding-action-wins.p4 | 2 +- .../pna-example-tcp-connection-state-tracking-simplified.p4 | 2 +- examples/pna-example-tcp-connection-state-tracking.p4 | 2 +- examples/pna-example-tcp-connection-tracking.p4 | 2 +- examples/pna-example-template.p4 | 2 +- pna.p4 | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/PNA.mdk b/PNA.mdk index 70ec63c..a959dbb 100644 --- a/PNA.mdk +++ b/PNA.mdk @@ -763,7 +763,7 @@ the places mentioned in Table [#table-extern-usage]. |-------------------|----------------------------------------------| | `ActionSelector` | MainControl | |-------------------|----------------------------------------------| -| `Checksum` | MainParser, MainDeparser | +| `Checksum` | MainParser, MainControl, MainDeparser | |-------------------|----------------------------------------------| | `Counter` | MainControl | |-------------------|----------------------------------------------| @@ -775,7 +775,7 @@ the places mentioned in Table [#table-extern-usage]. |-------------------|----------------------------------------------| | `Hash` | MainControl | |-------------------|----------------------------------------------| -| `InternetChecksum` | MainParser, MainDeparser | +| `InternetChecksum` | MainParser, MainControl, MainDeparser | |-------------------|----------------------------------------------| | `Meter` | MainControl | |-------------------|----------------------------------------------| diff --git a/examples/ipsec-acc.p4 b/examples/ipsec-acc.p4 index fc2dd1a..7fb201c 100644 --- a/examples/ipsec-acc.p4 +++ b/examples/ipsec-acc.p4 @@ -449,7 +449,7 @@ control MainControlImpl( control MainDeparserImpl( packet_out pkt, - in headers_t hdr, // from main control + inout headers_t hdr, // from main control in main_metadata_t user_meta, // from main control in pna_main_output_metadata_t ostd) { diff --git a/examples/pna-demo-L2-one-table.p4 b/examples/pna-demo-L2-one-table.p4 index 45617aa..a3e607a 100644 --- a/examples/pna-demo-L2-one-table.p4 +++ b/examples/pna-demo-L2-one-table.p4 @@ -97,7 +97,7 @@ control MainControlImpl( control MainDeparserImpl( packet_out pkt, - in headers_t hdr, + inout headers_t hdr, in metadata_t meta, in pna_main_output_metadata_t ostd) { diff --git a/examples/pna-demo-L2-two-tables.p4 b/examples/pna-demo-L2-two-tables.p4 index bafe8fa..bf972ab 100644 --- a/examples/pna-demo-L2-two-tables.p4 +++ b/examples/pna-demo-L2-two-tables.p4 @@ -104,7 +104,7 @@ control MainControlImpl( control MainDeparserImpl( packet_out pkt, - in headers_t hdr, + inout headers_t hdr, in metadata_t meta, in pna_main_output_metadata_t ostd) { diff --git a/examples/pna-demo-last-forwarding-action-wins.p4 b/examples/pna-demo-last-forwarding-action-wins.p4 index f480d33..05d60ee 100644 --- a/examples/pna-demo-last-forwarding-action-wins.p4 +++ b/examples/pna-demo-last-forwarding-action-wins.p4 @@ -137,7 +137,7 @@ control MainControlImpl( control MainDeparserImpl( packet_out pkt, - in headers_t hdr, + inout headers_t hdr, in metadata_t meta, in pna_main_output_metadata_t ostd) { diff --git a/examples/pna-example-tcp-connection-state-tracking-simplified.p4 b/examples/pna-example-tcp-connection-state-tracking-simplified.p4 index eb64035..4f5dcb7 100644 --- a/examples/pna-example-tcp-connection-state-tracking-simplified.p4 +++ b/examples/pna-example-tcp-connection-state-tracking-simplified.p4 @@ -231,7 +231,7 @@ control MainControlImpl( control MainDeparserImpl( packet_out pkt, - in headers_t hdr, + inout headers_t hdr, in metadata_t meta, in pna_main_output_metadata_t ostd) { diff --git a/examples/pna-example-tcp-connection-state-tracking.p4 b/examples/pna-example-tcp-connection-state-tracking.p4 index a5a36be..3973f35 100644 --- a/examples/pna-example-tcp-connection-state-tracking.p4 +++ b/examples/pna-example-tcp-connection-state-tracking.p4 @@ -284,7 +284,7 @@ control MainControlImpl( control MainDeparserImpl( packet_out pkt, - in headers_t hdr, + inout headers_t hdr, in metadata_t meta, in pna_main_output_metadata_t ostd) { diff --git a/examples/pna-example-tcp-connection-tracking.p4 b/examples/pna-example-tcp-connection-tracking.p4 index 8faf9fb..6e8e1a5 100644 --- a/examples/pna-example-tcp-connection-tracking.p4 +++ b/examples/pna-example-tcp-connection-tracking.p4 @@ -337,7 +337,7 @@ control MainControlImpl( control MainDeparserImpl( packet_out pkt, - in headers_t hdr, + inout headers_t hdr, in metadata_t meta, in pna_main_output_metadata_t ostd) { diff --git a/examples/pna-example-template.p4 b/examples/pna-example-template.p4 index b06dbe5..335b661 100644 --- a/examples/pna-example-template.p4 +++ b/examples/pna-example-template.p4 @@ -137,7 +137,7 @@ control MainControlImpl( control MainDeparserImpl( packet_out pkt, - in headers_t hdr, // from main control + inout headers_t hdr, // from main control in main_metadata_t user_meta, // from main control in pna_main_output_metadata_t ostd) { diff --git a/pna.p4 b/pna.p4 index c1b7666..5076d50 100644 --- a/pna.p4 +++ b/pna.p4 @@ -864,7 +864,7 @@ control MainControlT( control MainDeparserT( packet_out pkt, - in MH main_hdr, + inout MH main_hdr, in MM main_user_meta, in pna_main_output_metadata_t ostd);