Diff: resolve/ar6.c

Revision:

172:9bc3c7b2cca1

Parent:

167:3ba4e3c49631

Child:

193:47a953ab571b

--- a/resolve/ar6.c	Sat Dec 12 20:10:02 2020 +0000
+++ b/resolve/ar6.c	Wed Dec 16 17:33:22 2020 +0000
@@ -35,7 +35,7 @@
 {
     for (int i = 0; i < RECORDS_COUNT; i++)
     {
-        if (records[i].state && Ip6AddressIsSame(records[i].ip, ip)) return i;
+        if (records[i].state && Ip6AddrIsSame(records[i].ip, ip)) return i;
     }
     return -1;
 }
@@ -69,7 +69,7 @@
         if (Ar6Trace)
         {
             LogTime("AR6 Updated request for MAC of ");
-            Ip6AddressLog(ip);
+            Ip6AddrLog(ip);
             Log("\r\n");
         }
         records[i].state    = STATE_WANT;
@@ -82,11 +82,11 @@
     if (Ar6Trace)
     {
         LogTime("AR6 Made request for MAC of ");
-        Ip6AddressLog(ip);
+        Ip6AddrLog(ip);
         Log("\r\n");
     }
     i = getOldest();
-    Ip6AddressCopy(records[i].ip, ip);
+    Ip6AddrCopy(records[i].ip, ip);
     records[i].state    = STATE_WANT;
     records[i].tries    = 0;
     records[i].elapsed  = MsTimerCount;
@@ -128,7 +128,7 @@
     //Otherwise find the first empty slot and add the MAC, IP and date
     i = getOldest();
     MacCopy(records[i].mac, mac);
-    Ip6AddressCopy(records[i].ip, ip);
+    Ip6AddrCopy(records[i].ip, ip);
     records[i].elapsed   = MsTimerCount;
     records[i].state = STATE_VALID;
     return i;
@@ -137,7 +137,7 @@
 {
     for (int i = 0; i < RECORDS_COUNT; i++)
     {
-        if (records[i].state == STATE_VALID && Ip6AddressIsSame(records[i].ip, ip))
+        if (records[i].state == STATE_VALID && Ip6AddrIsSame(records[i].ip, ip))
         {
             MacCopy(mac, records[i].mac);
             return;
@@ -149,13 +149,13 @@
 {
     for (int i = 0; i < RECORDS_COUNT; i++)
     {
-        if (records[i].state == STATE_VALID && Ip6AddressIsSame(records[i].ip, ip)) return true;
+        if (records[i].state == STATE_VALID && Ip6AddrIsSame(records[i].ip, ip)) return true;
     }
     return false;
 }
 void Ar6IndexToIp(int i, char* ip)
 {
-    Ip6AddressCopy(ip, records[i].ip);
+    Ip6AddrCopy(ip, records[i].ip);
 }
 void Ar6SendHttp()
 {
@@ -165,7 +165,7 @@
         {
             HttpAddF("%4u ", (MsTimerCount - records[i].elapsed) / 1000 / 60);
             
-            int ipLen = Ip6AddressHttp(records[i].ip);
+            int ipLen = Ip6AddrHttp(records[i].ip);
             HttpAddFillChar(' ', 40 - ipLen);
             
             MacHttp(records[i].mac);
@@ -225,10 +225,10 @@
             if (Ar6Trace)
             {
                 LogTime("AR6 Send request for MAC from IP6 ");
-                Ip6AddressLog(pr->ip);
+                Ip6AddrLog(pr->ip);
                 Log("\r\n");
             }
-            Ip6AddressCopy(NsAddressToResolve, pr->ip);
+            Ip6AddrCopy(NsAddressToResolve, pr->ip);
             NsResolveRequestFlag = true;
             pr->state   = STATE_SENT;
             pr->elapsed = MsTimerCount;