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

re-enable other code that might not trigger compiler bug

Browse source
This commit is contained in:
Nico Schottelius 2019-07-25 14:52:57 +02:00
parent 64a96a1336
commit 809466cf61
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/plan.org
View file

@ -6787,7 +6787,7 @@ action delta_udp_from_v6_to_v4()
#+END_CENTER
*** TODO 2019-07-25: BUG overwrite
*** TODO 2019-07-25: BUG overwrite: calling v4_networks.apply(); twice
#+BEGIN_CENTER
make -C src/
make[1]: Entering directory '/home/nico/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4/src'

32
p4src/minip4_solution.p4
View file

@ -132,23 +132,23 @@ control RealMain(
exit; /* no further v6 processing */
}
} else if(hdr.ipv4.isValid()) {
// if(nat46.apply().hit) {
// if(hdr.icmp.isValid()) {
// nat46_icmp_generic();
if(nat46.apply().hit) {
if(hdr.icmp.isValid()) {
nat46_icmp_generic();
// if(hdr.icmp.type == ICMP_ECHO_REPLY) {
// hdr.icmp6.type = ICMP6_ECHO_REPLY;
// }
// if(hdr.icmp.type == ICMP_ECHO_REQUEST) {
// hdr.icmp6.type = ICMP6_ECHO_REQUEST;
// }
// }
// if(hdr.udp.isValid()) {
// delta_udp_from_v4_to_v6
// }
// if(hdr.tcp.isValid()) {
// delta_tcp_from_v4_to_v6
// }
if(hdr.icmp.type == ICMP_ECHO_REPLY) {
hdr.icmp6.type = ICMP6_ECHO_REPLY;
}
if(hdr.icmp.type == ICMP_ECHO_REQUEST) {
hdr.icmp6.type = ICMP6_ECHO_REQUEST;
}
}
if(hdr.udp.isValid()) {
delta_udp_from_v4_to_v6
}
if(hdr.tcp.isValid()) {
delta_tcp_from_v4_to_v6
}
// v6_networks.apply();
// exit;