Add methods to resolve mac in ipv6 mode

Signed-off-by: Leo Ma <[email protected]>

Author: leomaatEric

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

@@ -126,6 +126,53 @@ public EthernetPacket sendIcmpV6Echo(int portIdx, String dstIp,  int icmpId, int
 
     }
 
+    public EthernetPacket sendNeighborSolicitation(int portIdx, int timeout, String dstIp) throws ServiceModeRequiredException {
+        endTs = System.currentTimeMillis() + timeout * 1000;
+        PortStatus portStatus = tRexClient.getPortStatus(portIdx).get();
+        
+        srcMac = portStatus.getAttr().getLayerConiguration().getL2Configuration().getSrc();
+        
+        Packet icmpv6NSPkt = buildICMPV6NSPkt(multicastMacFromIPv6(dstIp).toString(), dstIp, null);
+
+        tRexClient.startStreamsIntermediate(portIdx, Arrays.asList(buildStream(icmpv6NSPkt)));
+
+        Predicate<EthernetPacket> ipV6NAPktFilter = etherPkt -> {
+            if (!etherPkt.contains(IcmpV6NeighborAdvertisementPacket.class)) {
+                return false;
+            }
+            IcmpV6NeighborAdvertisementHeader icmpV6NaHdr = etherPkt.get(IcmpV6NeighborAdvertisementPacket.class).getHeader();
+
+            String nodeIp = icmpV6NaHdr.getTargetAddress().toString().substring(1);
+
+            IpV6Packet.IpV6Header ipV6Header = etherPkt.get(IpV6Packet.class).getHeader();
+            String dstAddr = ipV6Header.getDstAddr().toString().substring(1);
+
+            try {
+                Inet6Address dstIPv6Addr = (Inet6Address) Inet6Address.getByName(dstAddr);
+                Inet6Address srcIPv6Addr = (Inet6Address) Inet6Address.getByName(generateIPv6AddrFromMAC(srcMac));
+                
+                Inet6Address nodeIpv6 = (Inet6Address) Inet6Address.getByName(nodeIp);
+                Inet6Address targetIpv6inNS = (Inet6Address) Inet6Address.getByName(dstIp);
+                return icmpV6NaHdr.getSolicitedFlag() && nodeIpv6.equals(targetIpv6inNS) && dstIPv6Addr.equals(srcIPv6Addr);
+            } catch (UnknownHostException ignored) {}
+            return false;
+        };
+        
+        EthernetPacket na = null;
+        while (endTs > System.currentTimeMillis() && na == null) {
+            List<EthernetPacket> pkts = tRexClient.getRxQueue(portIdx, ipV6NAPktFilter);
+            if (!pkts.isEmpty()) {
+                na = pkts.get(0);
+            }
+        }
+        tRexClient.removeRxQueue(portIdx);
+        if (tRexClient.getPortStatus(portIdx).get().getState().equals("TX")) {
+            tRexClient.stopTraffic(portIdx);
+        }
+        tRexClient.removeAllStreams(portIdx);
+        return na;
+    }
+
     private Map<String, EthernetPacket> sendNSandIcmpV6Req(int portIdx, int timeDuration, String dstIp)  throws ServiceModeRequiredException {
         endTs = System.currentTimeMillis() + timeDuration * 1000;
         TRexClientResult<PortStatus> portStatusResult = tRexClient.getPortStatus(portIdx);

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

@@ -25,6 +25,7 @@
 import org.pcap4j.packet.IcmpV4CommonPacket;
 import org.pcap4j.packet.IcmpV4EchoPacket;
 import org.pcap4j.packet.IcmpV4EchoReplyPacket;
+import org.pcap4j.packet.IcmpV6NeighborAdvertisementPacket;
 import org.pcap4j.packet.IllegalRawDataException;
 import org.pcap4j.packet.IpV4Packet;
 import org.pcap4j.packet.IpV4Rfc791Tos;
@@ -513,6 +514,18 @@ private static Stream build1PktSingleBurstStream(Packet pkt) {
                 -1);
     }
 
+    public String resolveIpv6(int portIndex, String dstIp) throws ServiceModeRequiredException {
+        removeRxQueue(portIndex);
+        setRxQueue(portIndex, 1000);
+        
+        EthernetPacket naPacket = new IPv6NeighborDiscoveryService(this).sendNeighborSolicitation(portIndex, 5, dstIp);
+        if (naPacket != null) {
+            return naPacket.getHeader().getSrcAddr().toString();
+        }
+        
+        return null;
+    }
+
     public List<EthernetPacket> getRxQueue(int portIndex, Predicate<EthernetPacket> filter) {
 
         Map<String, Object> payload = createPayload(portIndex);