Diff: ip6/ip6.cpp

Revision:

48:952dddb74b8b

Parent:

47:73af5c0b0dc2

Child:

49:1a6336f2b3f9

--- a/ip6/ip6.cpp	Thu Oct 26 14:50:24 2017 +0000
+++ b/ip6/ip6.cpp	Tue Oct 31 21:25:09 2017 +0000
@@ -4,7 +4,7 @@
 #include   "action.h"
 #include    "icmp6.h"
 #include  "udptcp6.h"
-#include       "ar.h"
+#include      "ar6.h"
 #include       "nr.h"
 #include    "slaac.h"
 #include      "eth.h"
@@ -16,7 +16,7 @@
 #include      "mac.h"
 #include "http-reply.h"
 
-#define SHOW_FILTERED true
+bool Ip6Trace = true;
 
 void Ip6Clear(char* ip)
 {
@@ -284,7 +284,7 @@
     
     if (!doIt)
     {
-        if (SHOW_FILTERED)
+        if (Ip6Trace)
         {
             LogTime("IP6 filtered out ip ");
             Ip6AddressLog(dstIp);
@@ -295,7 +295,7 @@
         return DO_NOTHING;
     }
     
-    ArAddIp6Record(pSrcMac, srcIp);
+    Ar6AddIpRecord(trace, pSrcMac, srcIp);
     NrMakeRequestForNameFromIp6(srcIp);
 
     int action = DO_NOTHING;
@@ -351,7 +351,7 @@
         case UNICAST_DHCP:
         case UNICAST_NTP:
             if (NdpIpNeedsToBeRouted(dstIp)) MacCopy   (pDstMac, NdpRouterMac); //Send to the router MAC
-            else                             ArIpToMac6(dstIp,        pDstMac); //Make the remote MAC from NP
+            else                             Ar6IpToMac(dstIp,        pDstMac); //Make the remote MAC from NP
             break;
         case MULTICAST_NODE:
         case MULTICAST_ROUTER: