Diff: udp/dns/dnsquery.cpp

Revision:

47:73af5c0b0dc2

Parent:

43:bc028d5a6424

Child:

49:1a6336f2b3f9

diff -r 40d33e9037e4 -r 73af5c0b0dc2 udp/dns/dnsquery.cpp
--- a/udp/dns/dnsquery.cpp	Tue Oct 24 07:01:35 2017 +0000
+++ b/udp/dns/dnsquery.cpp	Thu Oct 26 14:50:24 2017 +0000
@@ -34,18 +34,15 @@
     
     if (elapsed - started >= TIME_OUT_SENT)
     {
-        char text[100];
         LogTimeF("DNS reaped ongoing request for ");
         if (DnsQueryName[0]) LogF("name %s", DnsQueryName);
         if (DnsQueryIp4)
         {
-            Ip4AddressToString(DnsQueryIp4, sizeof(text), text);
-            LogF("ip4 %s", text);
+            Log("ip4 "); Ip4AddressLog(DnsQueryIp4);
         }
         if (DnsQueryIp6[0])
         {
-            Ip6AddressToString(DnsQueryIp6, sizeof(text), text);
-            LogF("ip6 %s", text);
+            Log("ip6 "); Ip6AddressLog(DnsQueryIp6);
         }
         LogF("\r\n");
         
@@ -108,26 +105,25 @@
 }
 static void logQuery()
 {
-    char text[60];
-    DnsProtocolToString(DnsQueryProtocol, sizeof(text), text);
     if (NetTraceNewLine) Log("\r\n");
-    LogTimeF("DnsQuery sent %s request for ", text);
-    DnsRecordTypeToString(DnsQueryRecordType, sizeof(text), text);
-    LogF("%s ", text);
+    LogTimeF("DnsQuery sent ");
+    DnsProtocolLog(DnsQueryProtocol);
+    Log(" request for ");
+    DnsRecordTypeLog(DnsQueryRecordType);
+    Log(" ");
     if (DnsQueryIp4) //Reverse
     {
-        Ip4AddressToString(DnsQueryIp4, sizeof(text), text);
-        LogF("%s\r\n", text);
+        Ip4AddressLog(DnsQueryIp4);
     }
     else if (DnsQueryIp6[0])
     {
-        Ip6AddressToString(DnsQueryIp6, sizeof(text), text);
-        LogF("%s\r\n", text);
+        Ip6AddressLog(DnsQueryIp6);
     }
     else //Forward
     {
-        LogF("%s\r\n", DnsQueryName);
+        Log(DnsQueryName);
     }
+    Log("\r\n");
 }
 int DnsQueryPoll(int* pSize)
 {