Merge pull request #27 from stockholmuniversity/v3withv2respond

Handle servers that responds with a v2 packet to a v3 request.
stockholmuniversity · Nov 23, 2018 · 1546e65 · 1546e65
2 parents 1b8590f + a620bba
commit 1546e65
Showing 1 changed file with 35 additions and 21 deletions.
diff --git a/lib/Nagios/NRPE/Client.pm b/lib/Nagios/NRPE/Client.pm
@@ -253,34 +253,48 @@ sub run
     }
     close($socket);
 
-    if (!$response)
+    if($response)
     {
-        $socket = $self->create_socket();
-        if (ref $socket eq "REF")
+        my $responsePacket = $packet->disassemble($response);
+        if ($responsePacket->{packet_version})
         {
-            return ($socket);
+            if ($responsePacket->{packet_version} == 3)
+            {
+                return $responsePacket;
+            }
         }
-        $packet   = Nagios::NRPE::Packet->new();
-        $response = undef;
-        $assembled = $packet->assemble(
-                                       type    => NRPE_PACKET_QUERY,
-                                       check   => $check,
-                                       version => NRPE_PACKET_VERSION_2
-                                      );
-
-        print $socket $assembled;
-        while (<$socket>)
+        else
         {
-            $response .= $_;
-        }
-        close($socket);
-
-        if (!$response)
-        {
-            my $reason = "No output from remote host";
+            my $reason = "Unknown response";
             return return_error($reason);
         }
     }
+
+    $socket = $self->create_socket();
+    if (ref $socket eq "REF")
+    {
+        return ($socket);
+    }
+    $packet   = Nagios::NRPE::Packet->new();
+    $response = undef;
+    $assembled = $packet->assemble(
+                                   type    => NRPE_PACKET_QUERY,
+                                   check   => $check,
+                                   version => NRPE_PACKET_VERSION_2
+                                  );
+
+    print $socket $assembled;
+    while (<$socket>)
+    {
+        $response .= $_;
+    }
+    close($socket);
+
+    if (!$response)
+    {
+        my $reason = "No output from remote host";
+        return return_error($reason);
+    }
     return $packet->disassemble($response);
 }