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

Resolve name conflict

Browse source
This commit is contained in:
Nico Schottelius 2019-03-27 20:08:49 +01:00
parent 3b558f84d1
commit b12d5d41ee
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
p4src/static-mapping.p4
View file

@ -51,21 +51,21 @@ control MyIngress(inout headers hdr,
/* if replacing actions */ /* if replacing actions */
action nat64_icmp6_echo_request(ipv6_addr_t v6_src, ipv4_addr_t v4_dst, ipv6_addr_t nat64_prefix) { action nat64_icmp6_echo_request(ipv6_addr_t v6_src, ipv4_addr_t v4_dst, ipv6_addr_t nat64_prefix) {
nat64_static(v6_src, v4_dst, nat64_prefix); nat64_static(v6_src, v4_dst, nat64_prefix);
nat64_icmp6(); nat64_icmp6_generic();
hdr.icmp.type = ICMP_ECHO_REQUEST; hdr.icmp.type = ICMP_ECHO_REQUEST;
} }
action nat64_icmp6_echo_reply(ipv6_addr_t v6_src, ipv4_addr_t v4_dst, ipv6_addr_t nat64_prefix) { action nat64_icmp6_echo_reply(ipv6_addr_t v6_src, ipv4_addr_t v4_dst, ipv6_addr_t nat64_prefix) {
nat64_static(v6_src, v4_dst, nat64_prefix); nat64_static(v6_src, v4_dst, nat64_prefix);
nat64_icmp6(); nat64_icmp6_generic();
hdr.icmp.type = ICMP_ECHO_REPLY; hdr.icmp.type = ICMP_ECHO_REPLY;
} }
/* changes for icmp6 -> icmp */ /* changes for icmp6 -> icmp */
action nat64_icmp6() action nat64_icmp6_generic()
{ {
hdr.icmp.setValid(); hdr.icmp.setValid();
hdr.ipv4.protocol = PROTO_ICMP; // overwrite generic same protocol assumption hdr.ipv4.protocol = PROTO_ICMP; // overwrite generic same protocol assumption