Diff: ip6/icmp/ndp/ndp.cpp

Revision:

49:1a6336f2b3f9

Parent:

47:73af5c0b0dc2

Child:

51:007bd938f2c3

--- a/ip6/icmp/ndp/ndp.cpp	Tue Oct 31 21:25:09 2017 +0000
+++ b/ip6/icmp/ndp/ndp.cpp	Thu Nov 02 08:10:55 2017 +0000
@@ -2,7 +2,7 @@
 #include "log.h"
 #include "net.h"
 #include "mac.h"
-#include "ip6.h"
+#include "ip6addr.h"
 #include "slaac.h"
 #include "clock.h"
 #include "rs.h"
@@ -68,7 +68,7 @@
             NdpPrefixPreferredLifetime = decodeUint32(p);
             p += 4;
             p += 4; //Skip gracefully past the Reserved2 field
-            Ip6Copy(NdpPrefix, p);
+            Ip6AddressCopy(NdpPrefix, p);
             SlaacMakeGlobal(NdpPrefix);
             break;
         case 5:
@@ -79,7 +79,7 @@
             p += 2; //Skip past the reserved field
             NdpDnsLifetime = decodeUint32(p);
             p += 4;
-            Ip6Copy(NdpDnsServer, p);
+            Ip6AddressCopy(NdpDnsServer, p);
             break;
         default:
             LogF("    Unknown option %d\r\n", type);
@@ -223,9 +223,9 @@
         if (NetTraceNewLine) Log("\r\n");
         LogTime("NDP lifetime has expired\r\n");
         NdpLifetime = 0;
-        Ip6Clear(NdpPrefix);
+        Ip6AddressClear(NdpPrefix);
         SlaacMakeGlobal(NdpPrefix);
-        Ip6Clear(NdpDnsServer);
+        Ip6AddressClear(NdpDnsServer);
     }
     
     delayTime = REPEAT_DELAY;