Merge pull request #94 from cisco-system-traffic-generator/ipv6ns

Emil-Gustafsson · web-flow · commit 1ecd6fed290e · 2019-10-28T08:45:01.000+01:00
exception handling IPv6NeighborDiscoveryService
change to correct multicast address as dst ip
diff --git a/src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java b/src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java
@@ -14,6 +14,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.net.InetAddresses;
 import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -173,7 +174,7 @@ public EthernetPacket sendIcmpV6Echo(
       while (endTimeSec > System.currentTimeMillis()) {
         List<EthernetPacket> rxQueue =
             tRexClient.getRxQueue(portIdx, pkt -> pkt.contains(IcmpV6EchoReplyPacket.class));
-        if (rxQueue.size() > 0) {
+        if (!rxQueue.isEmpty()) {
           icmpUnicastReply = rxQueue.get(0);
         }
       }
@@ -221,19 +222,18 @@ public EthernetPacket sendNeighborSolicitation(
           String dstAddr = ipV6Header.getDstAddr().toString().substring(1);
 
           try {
-            Inet6Address dstIPv6Addr = (Inet6Address) Inet6Address.getByName(dstAddr);
+            Inet6Address dstIPv6Addr = (Inet6Address) InetAddress.getByName(dstAddr);
             Inet6Address srcIPv6Addr =
-                (Inet6Address) Inet6Address.getByName(generateIPv6AddrFromMAC(srcMac));
+                (Inet6Address) InetAddress.getByName(generateIPv6AddrFromMAC(srcMac));
 
-            Inet6Address nodeIpv6 = (Inet6Address) Inet6Address.getByName(nodeIp);
-            Inet6Address targetIpv6inNS = (Inet6Address) Inet6Address.getByName(dstIp);
+            Inet6Address nodeIpv6 = (Inet6Address) InetAddress.getByName(nodeIp);
+            Inet6Address targetIpv6inNS = (Inet6Address) InetAddress.getByName(dstIp);
             return icmpV6NaHdr.getSolicitedFlag()
                 && nodeIpv6.equals(targetIpv6inNS)
                 && dstIPv6Addr.equals(srcIPv6Addr);
-          } catch (UnknownHostException ignored) {
-            // Do nothing
+          } catch (UnknownHostException e) {
+            throw new IllegalArgumentException("Invalid address", e);
           }
-          return false;
         };
 
     EthernetPacket na = null;
@@ -312,14 +312,13 @@ private Map<String, EthernetPacket> sendNSandIcmpV6Req(
           String dstAddr = ipV6Header.getDstAddr().toString().substring(1);
 
           try {
-            Inet6Address dstIPv6Addr = (Inet6Address) Inet6Address.getByName(dstAddr);
+            Inet6Address dstIPv6Addr = (Inet6Address) InetAddress.getByName(dstAddr);
             Inet6Address srcIPv6Addr =
-                (Inet6Address) Inet6Address.getByName(generateIPv6AddrFromMAC(srcMac));
+                (Inet6Address) InetAddress.getByName(generateIPv6AddrFromMAC(srcMac));
             return !naIncomingRequests.containsKey(nodeIp) && dstIPv6Addr.equals(srcIPv6Addr);
-          } catch (UnknownHostException ignored) {
-            // Do nothing
+          } catch (UnknownHostException e) {
+            throw new IllegalArgumentException("Invalid address", e);
           }
-          return false;
         };
 
     while (endTs > System.currentTimeMillis()) {
@@ -337,7 +336,7 @@ private Map<String, EthernetPacket> sendNSandIcmpV6Req(
     return naIncomingRequests;
   }
 
-  private com.cisco.trex.stateless.model.Stream buildStream(Packet pkt) {
+  private static com.cisco.trex.stateless.model.Stream buildStream(Packet pkt) {
     int streamId = (int) (Math.random() * 1000);
     return new com.cisco.trex.stateless.model.Stream(
         streamId,
@@ -360,7 +359,7 @@ private com.cisco.trex.stateless.model.Stream buildStream(Packet pkt) {
         null);
   }
 
-  private Packet buildICMPV6NSPkt(
+  private static Packet buildICMPV6NSPkt(
       PortVlan vlan, String srcMac, String dstMac, String dstIp, String srcIp) {
     EthernetPacket.Builder ethBuilder = new EthernetPacket.Builder();
     try {
@@ -375,23 +374,29 @@ private Packet buildICMPV6NSPkt(
           new IcmpV6NeighborSolicitationPacket.Builder();
       ipv6NSBuilder
           .options(Arrays.asList(sourceLLAddr))
-          .targetAddress((Inet6Address) Inet6Address.getByName(dstIp));
+          .targetAddress((Inet6Address) InetAddress.getByName(dstIp));
 
       final String specifiedSrcIP = srcIp != null ? srcIp : generateIPv6AddrFromMAC(srcMac);
 
       IcmpV6CommonPacket.Builder icmpCommonPktBuilder = new IcmpV6CommonPacket.Builder();
       icmpCommonPktBuilder
-          .srcAddr((Inet6Address) Inet6Address.getByName(specifiedSrcIP))
-          .dstAddr((Inet6Address) Inet6Address.getByName(dstIp))
+          .srcAddr((Inet6Address) InetAddress.getByName(specifiedSrcIP))
+          .dstAddr((Inet6Address) InetAddress.getByName(dstIp))
           .type(IcmpV6Type.NEIGHBOR_SOLICITATION)
           .code(IcmpV6Code.NO_CODE)
           .correctChecksumAtBuild(true)
           .payloadBuilder(ipv6NSBuilder);
 
+      // Calculate the Solicited-Node multicast address, RFC 4291 chapter 2.7.1
+      String[] destIpParts = dstIp.split(":");
+      String multicastIp =
+          String.format(
+              "FF02::1:FF%s:%s", destIpParts[6].substring(2, 4), destIpParts[7].substring(0, 4));
+
       IpV6Packet.Builder ipV6Builder = new IpV6Packet.Builder();
       ipV6Builder
-          .srcAddr((Inet6Address) Inet6Address.getByName(specifiedSrcIP))
-          .dstAddr((Inet6Address) Inet6Address.getByName(dstIp))
+          .srcAddr((Inet6Address) InetAddress.getByName(specifiedSrcIP))
+          .dstAddr((Inet6Address) InetAddress.getByName(multicastIp))
           .version(IpVersion.IPV6)
           .hopLimit((byte) -1)
           .trafficClass(IpV6SimpleTrafficClass.newInstance((byte) 0))
@@ -413,8 +418,8 @@ private Packet buildICMPV6NSPkt(
           .payloadBuilder(payload.getValue())
           .paddingAtBuild(true);
 
-    } catch (UnknownHostException ignored) {
-      // Do nothing
+    } catch (UnknownHostException e) {
+      throw new IllegalArgumentException("Invalid address", e);
     }
     return ethBuilder.build();
   }
@@ -447,7 +452,7 @@ private static String getLinkLayerAddress(IpV6Packet pkt) {
     return ByteArrays.toHexString(linkLayerAddress, ":");
   }
 
-  private Packet buildICMPV6NAPkt(
+  private static Packet buildICMPV6NAPkt(
       PortVlan vlan, String srcMac, String dstMac, String dstIp, String srcIP) {
     final String specifiedSrcIP = srcIP != null ? srcIP : generateIPv6AddrFromMAC(srcMac);
 
@@ -467,21 +472,21 @@ private Packet buildICMPV6NAPkt(
           .options(Arrays.asList(tLLAddr))
           .solicitedFlag(true)
           .overrideFlag(true)
-          .targetAddress((Inet6Address) Inet6Address.getByName(specifiedSrcIP));
+          .targetAddress((Inet6Address) InetAddress.getByName(specifiedSrcIP));
 
       IcmpV6CommonPacket.Builder icmpCommonPktBuilder = new IcmpV6CommonPacket.Builder();
       icmpCommonPktBuilder
-          .srcAddr((Inet6Address) Inet6Address.getByName(specifiedSrcIP))
-          .dstAddr((Inet6Address) Inet6Address.getByName(dstIp))
+          .srcAddr((Inet6Address) InetAddress.getByName(specifiedSrcIP))
+          .dstAddr((Inet6Address) InetAddress.getByName(dstIp))
           .type(IcmpV6Type.NEIGHBOR_ADVERTISEMENT)
           .code(IcmpV6Code.NO_CODE)
           .correctChecksumAtBuild(true)
           .payloadBuilder(ipv6NABuilder);
 
       IpV6Packet.Builder ipV6Builder = new IpV6Packet.Builder();
       ipV6Builder
-          .srcAddr((Inet6Address) Inet6Address.getByName(specifiedSrcIP))
-          .dstAddr((Inet6Address) Inet6Address.getByName(dstIp))
+          .srcAddr((Inet6Address) InetAddress.getByName(specifiedSrcIP))
+          .dstAddr((Inet6Address) InetAddress.getByName(dstIp))
           .version(IpVersion.IPV6)
           .trafficClass(IpV6SimpleTrafficClass.newInstance((byte) 0))
           .flowLabel(IpV6SimpleFlowLabel.newInstance(0))
@@ -503,8 +508,8 @@ private Packet buildICMPV6NAPkt(
           .payloadBuilder(payload.getValue())
           .paddingAtBuild(true);
 
-    } catch (UnknownHostException ignored) {
-      // Do nothing
+    } catch (UnknownHostException e) {
+      throw new IllegalArgumentException("Invalid address", e);
     }
 
     return ethBuilder.build();
@@ -527,6 +532,19 @@ public static EthernetPacket buildICMPV6EchoReq(
       String dstIp,
       int icmpId,
       int icmpSeq) {
+    PortVlan vlan = new PortVlan();
+    vlan.setTags(new ArrayList<Integer>());
+    return buildICMPV6EchoReq(vlan, srcIp, srcMacString, dstMacString, dstIp, icmpId, icmpSeq);
+  }
+
+  public static EthernetPacket buildICMPV6EchoReq(
+      PortVlan vlan,
+      String srcIp,
+      String srcMacString,
+      String dstMacString,
+      String dstIp,
+      int icmpId,
+      int icmpSeq) {
     /*
      *
      * mld_pkt = (Ether(src = self.src_mac, dst = self.dst_mld_mac) / IPv6(src = self.src_ip, dst =
@@ -544,18 +562,18 @@ public static EthernetPacket buildICMPV6EchoReq(
     IcmpV6CommonPacket.Builder icmpCommonPktBuilder = new IcmpV6CommonPacket.Builder();
     try {
       icmpCommonPktBuilder
-          .srcAddr((Inet6Address) Inet6Address.getByName(specifiedSrcIP))
+          .srcAddr((Inet6Address) InetAddress.getByName(specifiedSrcIP))
           .dstAddr(
-              (Inet6Address) Inet6Address.getByName(dstIp != null ? dstIp : "ff02:0:0:0:0:0:0:1"))
+              (Inet6Address) InetAddress.getByName(dstIp != null ? dstIp : "ff02:0:0:0:0:0:0:1"))
           .type(IcmpV6Type.ECHO_REQUEST)
           .code(IcmpV6Code.NO_CODE)
           .correctChecksumAtBuild(true)
           .payloadBuilder(icmpV6ERBuilder);
       IpV6Packet.Builder ipV6Builder = new IpV6Packet.Builder();
       ipV6Builder
-          .srcAddr((Inet6Address) Inet6Address.getByName(specifiedSrcIP))
+          .srcAddr((Inet6Address) InetAddress.getByName(specifiedSrcIP))
           .dstAddr(
-              (Inet6Address) Inet6Address.getByName(dstIp != null ? dstIp : "ff02:0:0:0:0:0:0:1"))
+              (Inet6Address) InetAddress.getByName(dstIp != null ? dstIp : "ff02:0:0:0:0:0:0:1"))
           .version(IpVersion.IPV6)
           .trafficClass(IpV6SimpleTrafficClass.newInstance((byte) 0))
           .flowLabel(IpV6SimpleFlowLabel.newInstance(0))
@@ -573,18 +591,24 @@ public static EthernetPacket buildICMPV6EchoReq(
       }
 
       EthernetPacket.Builder ethBuilder = new EthernetPacket.Builder();
+      AbstractMap.SimpleEntry<EtherType, Packet.Builder> payload =
+          new AbstractMap.SimpleEntry<>(EtherType.IPV6, ipV6Builder);
+      if (!vlan.getTags().isEmpty()) {
+        payload = buildVlan(ipV6Builder, vlan);
+      }
+
       ethBuilder
-          .type(EtherType.IPV6)
           .srcAddr(MacAddress.getByName(srcMacString))
           .dstAddr(dstMac)
-          .payloadBuilder(ipV6Builder)
+          .dstAddr(dstMac)
+          .type(payload.getKey())
+          .payloadBuilder(payload.getValue())
           .paddingAtBuild(true);
 
       return ethBuilder.build();
-    } catch (UnknownHostException ignore) {
-      // Do nothing
+    } catch (UnknownHostException e) {
+      throw new IllegalArgumentException("Invalid address", e);
     }
-    return null;
   }
 
   public static EthernetPacket buildICMPV6EchoReq(
@@ -613,10 +637,8 @@ private static MacAddress multicastMacFromIPv6(String ipV6) {
 
   private static long[] divMod(long a, long b) {
     long[] result = new long[2];
-
     result[1] = a % b;
     result[0] = (a - result[1]) / b;
-
     return result;
   }
 
