Merge remote-tracking branch 'ryan/master'

llarp/dns.cpp

@@ -212,6 +212,7 @@ extern "C"
     }
     */
     question->name = m_qName;
+  
     question->type = get16bits(moveable);
     (*pos) += 2;
     // printf("Now1 at [%d]\n", buffer - start);
@@ -241,13 +242,12 @@ extern "C"
     // llarp::LogDebug("Advancing to pos ", std::to_string(*pos));
     moveable += (*pos);  // advance to position
 
-    if(*moveable == '\xc0')
-    {
     //hexDump(moveable, 12);
     //hexDumpAt(buffer, *pos, 12);
       
+    if(*moveable == '\xc0')
+    {
       // hexDump(moveable, 2);
-
       moveable++;
       (*pos)++;
       uint8_t readAt    = *moveable;
@@ -330,6 +330,11 @@ extern "C"
       // FIXME: move this out of here, this shouldn't be responsible for decode
       switch(answer->type)
       {
+        case 2: // NS
+          // don't really need to do anything here
+          moveable += answer->rdLen;
+          (*pos) += answer->rdLen;  // advance the length
+        break;
           case 5:
           moveable += answer->rdLen;
           (*pos) += answer->rdLen;  // advance the length

llarp/dnsc.cpp

@@ -230,7 +230,7 @@ generic_handle_dnsc_recvfrom(dnsc_answer_request *request,
     // castBuf += question->name.length() + 1 + 4;
     // castBuf += 2;  // skip answer label
   }
-  llarp::LogInfo("Question ", std::to_string(question->type), " ", question->name);
+  llarp::LogDebug("Question ", std::to_string(question->type), " ", question->name);
 
   // FIXME: only handling one atm
   std::vector< dns_msg_answer * > answers;
@@ -352,9 +352,9 @@ generic_handle_dnsc_recvfrom(dnsc_answer_request *request,
     request->resolved(request);
     return;
   }
-  if(answer->type == 5)
+  if(answer->type == 5 || answer->type == 2)
   {
-    llarp::LogInfo("Last answer is a cname, advancing to first");
+    llarp::LogDebug("Last answer is a cname/NS, reverting to first");
     answer = answers.front();
   }