fix wrong merge request
This commit is contained in:
commit
ee1d6da3e1
1 changed files with 9 additions and 8 deletions
|
@ -336,17 +336,18 @@ control MyIngress(inout headers hdr,
|
|||
if(hdr.ipv6.isValid()) {
|
||||
icmp6.apply(); /* icmp6 echo, icmp6 ndp */
|
||||
if(nat64.apply().hit) { /* translating */
|
||||
v4_networks.apply(); /* apply egress */
|
||||
exit; /* no further v6 processing */
|
||||
// v4_networks.apply(); /* apply egress */
|
||||
// exit; /* no further v6 processing */
|
||||
}
|
||||
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 */
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue