Diff: ip6/icmp/ndp/ns.c

Revision:

172:9bc3c7b2cca1

Parent:

136:8a65abb0dc63

diff -r f708d6776752 -r 9bc3c7b2cca1 ip6/icmp/ndp/ns.c
--- a/ip6/icmp/ndp/ns.c	Sat Dec 12 20:10:02 2020 +0000
+++ b/ip6/icmp/ndp/ns.c	Wed Dec 16 17:33:22 2020 +0000
@@ -6,7 +6,7 @@
 #include  "action.h"
 #include "ip6addr.h"
 #include     "mac.h"
-#include     "nr6.h"
+#include      "nr.h"
 #include     "ar6.h"
 #include     "ip6.h"
 #include   "slaac.h"
@@ -33,13 +33,13 @@
     {
         Log("NS header\r\n");
         LogF("  Size        %d\r\n", size);
-        LogF("  Target      "); Ip6AddressLog(hdrPtrTarget(pPacket)); Log("\r\n");
+        LogF("  Target      "); Ip6AddrLog(hdrPtrTarget(pPacket)); Log("\r\n");
         NdpLogOptionsVerbose(pData, dataLength);
     }
     else
     {
         Log("NS    header ");
-        Ip6AddressLog(hdrPtrTarget(pPacket));
+        Ip6AddrLog(hdrPtrTarget(pPacket));
         NdpLogOptionsQuiet(pData, dataLength); 
         Log("\r\n");
     }
@@ -74,7 +74,7 @@
     *pType = 136;
     *pCode = 0;
     hdrSetReserved(pPacketTx, 0x60000000); //R=0 (not a router); S=1 (solicited); O=1 (override)
-    Ip6AddressCopy(hdrPtrTarget(pPacketTx), hdrPtrTarget(pPacketRx)); //Target does not change
+    Ip6AddrCopy(hdrPtrTarget(pPacketTx), hdrPtrTarget(pPacketRx)); //Target does not change
     
     //Add target MAC
     char* pDataTx = pPacketTx + HEADER_LENGTH;
@@ -105,7 +105,7 @@
     NdpDecodeOptions(pData, dataLength, NULL, tgtMac);
     
     Ar6AddIpRecord(trace, tgtMac, hdrPtrTarget(pPacket));
-    Nr6MakeRequestForNameFromIp(  hdrPtrTarget(pPacket));
+    NrMakeRequestForNameFromAddress6(hdrPtrTarget(pPacket));
     
     return DO_NOTHING;
 }
@@ -119,7 +119,7 @@
     *pCode = 0;
         
     hdrSetReserved(pPacket, 0);
-    Ip6AddressCopy(hdrPtrTarget(pPacket), NsAddressToResolve);
+    Ip6AddrCopy(hdrPtrTarget(pPacket), NsAddressToResolve);
     
     char* pData = pPacket + HEADER_LENGTH;
     char* p = pData;