Fix for Issue #14

metaregistrar · Oct 31, 2022 · d635cda · d635cda
1 parent 05990b4
commit d635cda
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/DNS/dnsProtocol.php b/DNS/dnsProtocol.php
@@ -205,7 +205,7 @@ function Query($question,$type='A')
             }
 
             $this->rawheader=substr($this->rawbuffer,0,12); // first 12 bytes is the header
-            $this->rawresponse=substr($this->rawbuffer,12); // after that the response
+            #$this->rawresponse=substr($this->rawbuffer,12); // after that the response
             #$this->DebugBinary($this->rawbuffer);
             $this->header=unpack("nid/nflags/nqdcount/nancount/nnscount/narcount",$this->rawheader);
             $flags = sprintf("%016b\n",$this->header['flags']);
@@ -232,7 +232,7 @@ function Query($question,$type='A')
                     $c=1;
                     while ($c!=0)
                     {
-                        $c=hexdec(bin2hex($response->ReadResponse($this->rawbuffer, 1)));
+                        $c=hexdec(bin2hex($response->ReadResponse($this->rawbuffer)));
                         $q .= $c;
                     }
                     $response->addQuery($q);
@@ -331,23 +331,20 @@ function algorithm($code)
                     # Diffie-Helman
                     return 'dh';
                 case 3:
-                    return 'sha1';
-                case 4:
-                    return 'reserved';
                 case 5:
                     return 'sha1';
+                case 4:
+                case 9:
+                case 11:
+                return 'reserved';
                 case 6:
                     return 'dsansec3sha1';
                 case 7:
                     return 'rsasha1nsec3';
                 case 8:
                     return 'sha256';
-                case 9:
-                    return 'reserved';
                 case 10:
                     return 'sha512';
-                case 11:
-                    return 'reserved';
                 case 12:
                     return 'gost';
                 case 13:

diff --git a/DNS/dnsResponses/dnsResponse.php b/DNS/dnsResponses/dnsResponse.php
@@ -285,7 +285,6 @@ public function ReadRecord($buffer, $resulttype = '')
             $result->setClass($ans_header['class']);
             $result->setTtl($ans_header['ttl']);
             $this->addResult($result, $resulttype);
-            return;
         }
 
 
@@ -297,8 +296,7 @@ private function keytag($key, $keysize)
                 $ac += (($i & 1) ? $keyp[1] : $keyp[1] << 8);
             }
             $ac += ($ac >> 16) & 0xFFFF;
-            $keytag = $ac & 0xFFFF;
-            return $keytag;
+            return $ac & 0xFFFF;
         }
 
         private function keytag2($key, $keysize)
@@ -309,8 +307,7 @@ private function keytag2($key, $keysize)
                 $ac += ($i % 2 ? $keyp[1] : 256 * $keyp[1]);
             }
             $ac += ($ac / 65536) % 65536;
-            $keytag = $ac % 65536;
-            return $keytag;
+            return $ac % 65536;
         }
 
         private function ReadDomainLabel($buffer)

diff --git a/test.php b/test.php
@@ -3,10 +3,10 @@
 
 $dns = new Metaregistrar\DNS\dnsProtocol();
 $dns->setServer('ns1.google.com');
-$result = $dns->Query('google.com','TXT');
+$result = $dns->Query('metaregistrar.com','SRV');
 /* @var $result Metaregistrar\DNS\dnsResponse */
 foreach ($result->getResourceResults() as $resource) {
-    //var_dump($resource);
+    var_dump($resource);
     if ($resource instanceof Metaregistrar\DNS\dnsAresult) {
         echo $resource->getDomain().' - '.$resource->getIpv4().' - '.$resource->getTtl()."\n";
     }