Diff: ip6/ip6.c

Revision:

172:9bc3c7b2cca1

Parent:

136:8a65abb0dc63

Child:

187:122fc1996c86

--- a/ip6/ip6.c	Sat Dec 12 20:10:02 2020 +0000
+++ b/ip6/ip6.c	Wed Dec 16 17:33:22 2020 +0000
@@ -7,7 +7,7 @@
 #include   "icmp6.h"
 #include "udptcp6.h"
 #include     "ar6.h"
-#include     "nr6.h"
+#include      "nr.h"
 #include   "slaac.h"
 #include     "eth.h"
 #include      "ip.h"
@@ -29,17 +29,17 @@
         LogF("  Payload length    %d\r\n",          Ip6HdrGetPayloadLen(pPacket));
         LogF("  Hop limit         %d\r\n",          Ip6HdrGetHopLimit  (pPacket));
         LogF("  Protocol          "); IpProtocolLog(Ip6HdrGetProtocol  (pPacket)); Log("\r\n");
-        Log ("  Source IP         "); Ip6AddressLog(Ip6HdrPtrSrc       (pPacket)); Log("\r\n");
-        Log ("  Destination IP    "); Ip6AddressLog(Ip6HdrPtrDst       (pPacket)); Log("\r\n");
+        Log ("  Source IP         "); Ip6AddrLog   (Ip6HdrPtrSrc       (pPacket)); Log("\r\n");
+        Log ("  Destination IP    "); Ip6AddrLog   (Ip6HdrPtrDst       (pPacket)); Log("\r\n");
     }
     else
     {
         Log("IP6   header ");
         IpProtocolLog(Ip6HdrGetProtocol(pPacket));
         Log(" ");
-        Ip6AddressLog(Ip6HdrPtrSrc     (pPacket));
+        Ip6AddrLog   (Ip6HdrPtrSrc     (pPacket));
         Log(" >>> ");
-        Ip6AddressLog(Ip6HdrPtrDst     (pPacket));
+        Ip6AddrLog   (Ip6HdrPtrDst     (pPacket));
         Log("\r\n");
     }
 }
@@ -63,8 +63,8 @@
     
     static char srcIp[16];
     static char dstIp[16];
-    Ip6AddressCopy(srcIp, Ip6HdrPtrSrc (pPacketRx));
-    Ip6AddressCopy(dstIp, Ip6HdrPtrDst (pPacketRx));
+    Ip6AddrCopy(srcIp, Ip6HdrPtrSrc (pPacketRx));
+    Ip6AddrCopy(dstIp, Ip6HdrPtrDst (pPacketRx));
     
     int dataLengthRx = sizeRx - IP6_HEADER_LENGTH;
     if (dataLengthRx > payloadLengthRx) dataLengthRx = payloadLengthRx; //Choose the lesser of the data length and the payload length
@@ -83,9 +83,9 @@
         if (Ip6Trace)
         {
             LogTime("IP6 filtered out ip ");
-            Ip6AddressLog(dstIp);
+            Ip6AddrLog(dstIp);
             LogF(" from ");
-            Ip6AddressLog(srcIp);
+            Ip6AddrLog(srcIp);
             Log("\r\n");
         }
         return DO_NOTHING;
@@ -94,7 +94,7 @@
     NetTraceHostCheckIp6(srcIp);
     
     int remArIndex = Ar6AddIpRecord(trace, macRemote, srcIp);
-    Nr6MakeRequestForNameFromIp(srcIp);
+    NrMakeRequestForNameFromAddress6(srcIp);
 
     int action = DO_NOTHING;
     switch (protocol)
@@ -125,8 +125,8 @@
     Ip6HdrSetProtocol  (pPacketTx, protocol    );
     Ip6HdrSetHopLimit  (pPacketTx, hoplimit    );
     
-    Ip6AddressCopy(Ip6HdrPtrSrc(pPacketTx), srcIp);
-    Ip6AddressCopy(Ip6HdrPtrDst(pPacketTx), dstIp);
+    Ip6AddrCopy(Ip6HdrPtrSrc(pPacketTx), srcIp);
+    Ip6AddrCopy(Ip6HdrPtrDst(pPacketTx), dstIp);
       
     *pSizeTx = IP6_HEADER_LENGTH + dataLengthTx;
     
@@ -186,8 +186,8 @@
     Ip6HdrSetPayloadLen(pPacket, dataLength);
     Ip6HdrSetProtocol  (pPacket, protocol  );
     Ip6HdrSetHopLimit  (pPacket, hoplimit  );
-    Ip6AddressCopy(Ip6HdrPtrSrc(pPacket), srcIp);
-    Ip6AddressCopy(Ip6HdrPtrDst(pPacket), dstIp);
+    Ip6AddrCopy(Ip6HdrPtrSrc(pPacket), srcIp);
+    Ip6AddrCopy(Ip6HdrPtrDst(pPacket), dstIp);
 
     *pSize = IP6_HEADER_LENGTH + dataLength;