Commit broken in between state

This commit is contained in:
Nico Schottelius 2019-07-24 23:22:14 +02:00
parent c3f540795b
commit 28f985d9ce
2 changed files with 13 additions and 13 deletions

View File

@ -77,11 +77,11 @@ action delta_udp_from_v6_to_v4()
tmp = tmp + 1; tmp = tmp + 1;
tmp[16:16] = 0; tmp[16:16] = 0;
} }
tmp = tmp + (bit<17>) (0xffff - meta.v6sum); // tmp = tmp + (bit<17>) (0xffff - meta.v6sum);
if (tmp[16:16] == 1) { // if (tmp[16:16] == 1) {
tmp = tmp + 1; // tmp = tmp + 1;
tmp[16:16] = 0; // tmp[16:16] = 0;
} // }
hdr.udp.checksum = (bit<16>) tmp; hdr.udp.checksum = (bit<16>) tmp;
} }

View File

@ -140,13 +140,13 @@ control RealMain(
hdr.icmp.type = ICMP_ECHO_REQUEST; hdr.icmp.type = ICMP_ECHO_REQUEST;
hdr.icmp.code = 0; hdr.icmp.code = 0;
} }
// if(hdr.udp.isValid()) { }
// #ifdef USE_NICO_DELTA_CHECKSUM
// delta_udp_from_v6_to_v4(); if(hdr.udp.isValid()) {
// #else //delta_prepare();
// meta.chk_udp_v4 = 1; delta_udp_from_v6_to_v4();
// #endif //stupid();
// } }
// if(hdr.tcp.isValid()) { // if(hdr.tcp.isValid()) {
// #ifdef USE_NICO_DELTA_CHECKSUM // #ifdef USE_NICO_DELTA_CHECKSUM
// delta_tcp_from_v6_to_v4(); // delta_tcp_from_v6_to_v4();
@ -158,7 +158,7 @@ control RealMain(
v4_networks.apply(); /* apply egress for IPv4 */ v4_networks.apply(); /* apply egress for IPv4 */
exit; /* no further v6 processing */ exit; /* no further v6 processing */
}
} }
} }