Merge pull request #81 from enxxjmn/MJE-15951

TRex sends IPv6 neighbor solicitation packets with incorrect source IP

Author: Emil-Gustafsson

src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java

@@ -11,6 +11,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.apache.commons.lang3.StringUtils;
 import org.pcap4j.packet.*;
 import org.pcap4j.packet.IcmpV6CommonPacket.IpV6NeighborDiscoveryOption;
 import org.pcap4j.packet.IcmpV6NeighborAdvertisementPacket.IcmpV6NeighborAdvertisementHeader;
@@ -566,7 +567,7 @@ private static String expandIPv6Address(String shortAddress) {
     return Arrays.stream(addressArray).collect(Collectors.joining(":"));
   }
 
-  private static String generateIPv6AddrFromMAC(String mac) {
+  static String generateIPv6AddrFromMAC(String mac) {
     String prefix = "fe80";
     List<Integer> macOctets =
         Arrays.stream(mac.split(":"))
@@ -583,7 +584,8 @@ private static String generateIPv6AddrFromMAC(String mac) {
       strOctets.add(
           String.format(
               "%s%s",
-              Integer.toHexString(macOctets.get(i)), Integer.toHexString(macOctets.get(i + 1))));
+              StringUtils.leftPad(Integer.toHexString(macOctets.get(i)), 2, "0"),
+              StringUtils.leftPad(Integer.toHexString(macOctets.get(i + 1)), 2, "0")));
     }
     return String.format("%s::%s", prefix, String.join(":", strOctets));
   }

src/test/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryServiceTest.java

@@ -0,0 +1,14 @@
+package com.cisco.trex.stateless;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class IPv6NeighborDiscoveryServiceTest {
+
+  @Test
+  public void generateIPv6AddrFromMACTest() {
+    String ipV6Address = IPv6NeighborDiscoveryService.generateIPv6AddrFromMAC("10:62:E5:09:A0:64");
+    assertEquals("fe80::1262:e5ff:fe09:a064", ipV6Address);
+  }
+}