[Dns] Cleanup

Author: igorw

BinaryDumper.php

@@ -43,18 +43,18 @@ private function headerToBinary(HeaderBag $header)
         return $data;
     }
 
-    private function questionToBinary(array $question)
+    private function questionToBinary(array $questions)
     {
         $data = '';
 
-        foreach ($question as $q) {
-            $labels = explode('.', $q['name']);
+        foreach ($questions as $question) {
+            $labels = explode('.', $question['name']);
             foreach ($labels as $label) {
                 $data .= chr(strlen($label)).$label;
             }
             $data .= "\x00";
 
-            $data .= pack('n*', $q['type'], $q['class']);
+            $data .= pack('n*', $question['type'], $question['class']);
         }
 
         return $data;

Query.php

@@ -7,4 +7,11 @@ class Query
     public $name;
     public $type;
     public $class;
+
+    public function __construct($name, $type, $class)
+    {
+        $this->name = $name;
+        $this->type = $type;
+        $this->class = $class;
+    }
 }

Resolver.php

@@ -13,7 +13,8 @@ public function resolve($domain, $callback)
         $query = new Query($domain, 'A', 'IN');
 
         $this->query($nameserver, $query, function (Message $response) use ($callback) {
-            $answer = $response->answers[array_rand($response->answers)]->data;
+            $answer = $response->answers[array_rand($response->answers)];
+            $address = $answer->data;
             $callback($address);
         });
     }
@@ -26,7 +27,7 @@ public function query($nameserver, Query $query, $callback)
         $request = new Message();
         $request->headers->set('id', rand());
         $request->headers->set('rd', 1);
-        $request->question = (array) $query;
+        $request->questions[] = (array) $query;
 
         $response = new Message();