nico/master-thesis
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Try fixing shift errors (precendence!)

Browse source
This commit is contained in:
Nico Schottelius 2019-07-21 10:48:35 +02:00
commit 266ab1d036
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
p4src/actions_delta_checksum.p4
View file

@ -132,9 +132,9 @@ action delta_ipv4_from_v6_to_v4()
Does NOT contain payload! -> can be done manually */
shift_tmp = ((bit<16>) hdr.ipv4.version) << 12 +
((bit<16>) hdr.ipv4.ihl) << 8 +
((bit<16>) hdr.ipv4.diff_serv) << 2 +
shift_tmp = (bit<16>) (hdr.ipv4.version << 12) +
(bit<16>) (hdr.ipv4.ihl << 8) +
(bit<16>) (hdr.ipv4.diff_serv << 2) +
((bit<16>) hdr.ipv4.ecn);
tmp = tmp + shift_tmp;
@ -148,14 +148,14 @@ action delta_ipv4_from_v6_to_v4()
tmp = tmp + (bit<16>) hdr.ipv4.identification; /* 16 bit */
shift_tmp = ((bit<16>) hdr.ipv4.flags) << 13 +
shift_tmp = ((bit<16>) (hdr.ipv4.flags) << 13) +
((bit<16>) hdr.ipv4.fragOffset);
tmp = tmp + shift_tmp;
// tmp = tmp + (bit<16>) hdr.ipv4.flags; /* 3 bit */
// tmp = tmp + (bit<16>) hdr.ipv4.fragOffset; /* 13 bit */
shift_tmp = ((bit<16>) hdr.ipv4.ttl) << 8 +
shift_tmp = ((bit<16>) (hdr.ipv4.ttl) << 8) +
((bit<16>) hdr.ipv4.protocol);
tmp = tmp + shift_tmp;