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

fix wrong merge request

Browse source
This commit is contained in:
Your Name 2019-03-26 21:18:05 +00:00
commit ee1d6da3e1
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
p4src/static-mapping.p4
View file

@ -336,17 +336,18 @@ control MyIngress(inout headers hdr,
if(hdr.ipv6.isValid()) { if(hdr.ipv6.isValid()) {
icmp6.apply(); /* icmp6 echo, icmp6 ndp */ icmp6.apply(); /* icmp6 echo, icmp6 ndp */
if(nat64.apply().hit) { /* translating */ if(nat64.apply().hit) { /* translating */
v4_networks.apply(); /* apply egress */ // v4_networks.apply(); /* apply egress */
exit; /* no further v6 processing */ // exit; /* no further v6 processing */
} }
v6_networks.apply(); /* egress / routing */ v6_networks.apply(); /* egress / routing */
} else if(hdr.ipv4.isValid()) {
if(nat46.apply().hit) { /* v4->v6 */
v6_networks.apply(); /* Now apply v6 egress */
exit; /* no further v4 processing */
}
v4_networks.apply(); /* routing, egress */
} }
// else if(hdr.ipv4.isValid()) {
// if(nat46.apply().hit) { /* v4->v6 */
// v6_networks.apply(); /* Now apply v6 egress */
// exit; /* no further v4 processing */
// }
// v4_networks.apply(); /* routing, egress */
// }
} }
} }