From 6497db857c69dc6789574687ac3989fb1c69e0d0 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 6 Mar 2019 13:59:41 +0100 Subject: [PATCH] & remove checksumming again --- doc/plan.org | 6 ++++-- p4src/checksums.p4 | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/doc/plan.org b/doc/plan.org index 510d168..0c27703 100644 --- a/doc/plan.org +++ b/doc/plan.org @@ -81,8 +81,10 @@ | | - Answering icmp6 echo request *in* in the switch | | | | - Translate icmp6 to icmp | | | | - Translate icmp to icmp6 | | -| | | | -| | | | +| | - Multiple branches: | | +| | * Work on checksumming / p4 | | +| | * Work on metadata passing / p4 | | +| | * Work on static mapping (w/ incorrect checksum) | | | | | | | | | | | 2019-03-08 | NAT46 1:1 table ICMP, ICMPv6 working | | diff --git a/p4src/checksums.p4 b/p4src/checksums.p4 index 6ebc5f5..231c65c 100644 --- a/p4src/checksums.p4 +++ b/p4src/checksums.p4 @@ -21,18 +21,18 @@ control MyVerifyChecksum(inout headers hdr, inout metadata meta) { control MyComputeChecksum(inout headers hdr, inout metadata meta) { apply { - update_checksum_with_payload(meta.do_cksum, - { - hdr.ipv6.src_addr, /* 128 */ - hdr.ipv6.dst_addr, /* 128 */ - 16w0, /* 16 try implicit cast */ - hdr.ipv6.payload_length, /* 16 */ - 24w0, /* 24 0's */ - PROTO_ICMP6 /* 8 */ - }, - hdr.icmp6.checksum, - HashAlgorithm.csum16 - ); + // GRRRRR update_checksum_with_payload(meta.do_cksum, + // GRRRRR { + // GRRRRR hdr.ipv6.src_addr, /* 128 */ + // GRRRRR hdr.ipv6.dst_addr, /* 128 */ + // GRRRRR 16w0, /* 16 try implicit cast */ + // GRRRRR hdr.ipv6.payload_length, /* 16 */ + // GRRRRR 24w0, /* 24 0's */ + // GRRRRR PROTO_ICMP6 /* 8 */ + // GRRRRR }, + // GRRRRR hdr.icmp6.checksum, + // GRRRRR HashAlgorithm.csum16 + // GRRRRR ); } }