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

Merge branch 'master' of gitlab.ethz.ch:nicosc/master-thesis

Browse source
This commit is contained in:
Your Name 2019-03-27 12:34:50 +00:00
commit 6522cfb501
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
p4src/static-mapping.p4
View file

@ -50,6 +50,8 @@ control MyIngress(inout headers hdr,
/* NAT64 protocol unspecific changes */ /* NAT64 protocol unspecific changes */
action nat64_generic(ipv4_addr_t src, ipv4_addr_t dst) { action nat64_generic(ipv4_addr_t src, ipv4_addr_t dst) {
hdr.ipv4.setValid();
/* Stuff that might need to be fixed */ /* Stuff that might need to be fixed */
hdr.ipv4.version = (bit<4>)4; hdr.ipv4.version = (bit<4>)4;
hdr.ipv4.diff_serv = (bit<6>)0; // no ToS hdr.ipv4.diff_serv = (bit<6>)0; // no ToS
@ -72,11 +74,11 @@ control MyIngress(inout headers hdr,
hdr.ipv4.protocol = hdr.ipv6.next_header; hdr.ipv4.protocol = hdr.ipv6.next_header;
hdr.ipv6.setInvalid(); hdr.ipv6.setInvalid();
hdr.ipv4.setValid();
} }
/* NAT46: protocol unspecific changes */ /* NAT46: protocol unspecific changes */
action nat46_generic(ipv6_addr_t src, ipv6_addr_t dst) { action nat46_generic(ipv6_addr_t src, ipv6_addr_t dst) {
hdr.ipv6.setValid();
hdr.ethernet.ethertype = TYPE_IPV6; hdr.ethernet.ethertype = TYPE_IPV6;
hdr.ipv6.dst_addr = dst; hdr.ipv6.dst_addr = dst;
@ -91,7 +93,6 @@ control MyIngress(inout headers hdr,
hdr.ipv6.hop_limit = hdr.ipv4.ttl; hdr.ipv6.hop_limit = hdr.ipv4.ttl;
hdr.ipv4.setInvalid(); hdr.ipv4.setInvalid();
hdr.ipv6.setValid();
} }
@ -336,18 +337,17 @@ 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 */
// }
} }
} }