commit ed88f2b6fee0111e39af2fe147cf6b9d853af155
author Carmelo Cascone <carmelo@opennetworking.org> Fri Jan 26 17:36:34 2018 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Sat Jan 27 02:27:36 2018 +0000
tree ef0ca8a499a3b92e4665eb6a6e377c64f6b220e9
parent aaa9f111d6f1d30525884a6d9ffff6b5bee87d61

Do not compile with IPv6 support in fabric.p4 by default

Change-Id: I5194ccb0ab78ec4388106cea14c96884f5d16b0f

pipelines/fabric/src/main/resources/include/parser.p4

diff --git a/pipelines/fabric/src/main/resources/include/parser.p4 b/pipelines/fabric/src/main/resources/include/parser.p4
index 8355c12..2b50505 100644
--- a/pipelines/fabric/src/main/resources/include/parser.p4
+++ b/pipelines/fabric/src/main/resources/include/parser.p4
@@ -45,7 +45,9 @@
             ETHERTYPE_MPLS: parse_mpls;
             ETHERTYPE_ARP: parse_arp;
             ETHERTYPE_IPV4: parse_ipv4;
+#ifdef WITH_IPV6
             ETHERTYPE_IPV6: parse_ipv6;
+#endif // WITH_IPV6
             default: accept;
         }
     }
@@ -55,7 +57,9 @@
         transition select(hdr.vlan_tag.ether_type){
             ETHERTYPE_ARP: parse_arp;
             ETHERTYPE_IPV4: parse_ipv4;
+#ifdef WITH_IPV6
             ETHERTYPE_IPV6: parse_ipv6;
+#endif // WITH_IPV6
             ETHERTYPE_MPLS: parse_mpls;
             default: accept;
         }
@@ -69,7 +73,9 @@
         transition select(packet.lookahead<bit<4>>()) {
             //The packet should be either IPv4 or IPv6.
             IP_VERSION_4: parse_ipv4;
+#ifdef WITH_IPV6
             IP_VERSION_6: parse_ipv6;
+#endif // WITH_IPV6
             default: parse_ethernet;
         }
     }
@@ -86,6 +92,7 @@
         }
     }
 
+#ifdef WITH_IPV6
     state parse_ipv6 {
         packet.extract(hdr.ipv6);
         fabric_metadata.ip_proto = hdr.ipv6.next_hdr;
@@ -96,6 +103,7 @@
             default: accept;
         }
     }
+#endif // WITH_IPV6
 
     state parse_arp {
         packet.extract(hdr.arp);
@@ -168,7 +176,9 @@
         packet.emit(hdr.gtpu);
 #endif // WITH_SPGW
         packet.emit(hdr.ipv4);
+#ifdef WITH_IPV6
         packet.emit(hdr.ipv6);
+#endif // WITH_IPV6
         packet.emit(hdr.tcp);
         packet.emit(hdr.udp);
         packet.emit(hdr.icmp);