Diff: ip6/icmp/icmp6.cpp

Revision:

49:1a6336f2b3f9

Parent:

48:952dddb74b8b

Child:

57:e0fb648acf48

--- a/ip6/icmp/icmp6.cpp	Tue Oct 31 21:25:09 2017 +0000
+++ b/ip6/icmp/icmp6.cpp	Thu Nov 02 08:10:55 2017 +0000
@@ -6,7 +6,7 @@
 #include     "ra.h"
 #include     "rs.h"
 #include     "ip.h"
-#include    "ip6.h"
+#include "ip6addr.h"
 #include  "slaac.h"
 #include  "echo6.h"
 
@@ -28,9 +28,9 @@
 {
     switch (type)
     {
-        case   1: Log ("Destination uneaceable" ); break;
-        case 128: Log ("Echo Request"           ); break;
-        case 129: Log ("Echo Reply"             ); break;
+        case   1: Log ("Destination unreacheable" ); break;
+        case 128: Log ("Echo Request"             ); break;
+        case 129: Log ("Echo Reply"               ); break;
         case 133: Log ("Router solicit"         ); break;
         case 134: Log ("Router advertisement"   ); break;
         case 135: Log ("Neighbour solicit"      ); break;
@@ -50,8 +50,8 @@
         uint8_t  pro;
     } pseudo;
     
-    Ip6Copy(pseudo.src, pSrcIp);
-    Ip6Copy(pseudo.dst, pDstIp);
+    Ip6AddressCopy(pseudo.src, pSrcIp);
+    Ip6AddressCopy(pseudo.dst, pDstIp);
     pseudo.len    = NetToHost32(size);
     pseudo.zer[0] = 0;
     pseudo.zer[1] = 0;
@@ -133,9 +133,9 @@
     }
     if (!action) return DO_NOTHING;
     
-    Ip6Copy(pDstIp, pSrcIp);
-    Ip6SrcIpFromScope(scope,                     pSrcIp);
-    Ip6DstIpFromDest (ActionGetDestPart(action), pDstIp);
+    Ip6AddressCopy(pDstIp, pSrcIp);
+    SlaacAddressFromScope(scope,                     pSrcIp);
+      Ip6AddressFromDest (ActionGetDestPart(action), pDstIp);
 
     *pSize = HEADER_LENGTH + dataLength;
     
@@ -154,8 +154,8 @@
     if (!action) return DO_NOTHING;
 
     int scope = SCOPE_LOCAL;
-    Ip6SrcIpFromScope(scope,                     pSrcIp);
-    Ip6DstIpFromDest (ActionGetDestPart(action), pDstIp);
+    SlaacAddressFromScope(scope,                     pSrcIp);
+      Ip6AddressFromDest (ActionGetDestPart(action), pDstIp);
 
     *pSize = HEADER_LENGTH + dataLength;