Allow tests to be qualified IPv4/IPv6-only.

Via "ipv6_only" and "IPv4_only"

1 files changed, 25 insertions, 5 deletions

diff --git a/lib/custodian/protocoltest/ping.rb b/lib/custodian/protocoltest/ping.rb
index 8f3911d..37722c2 100644
--- a/lib/custodian/protocoltest/ping.rb
+++ b/lib/custodian/protocoltest/ping.rb
@@ -117,17 +117,37 @@ module Custodian
 
 
         #
+        #  Both types?
+        #
+        do_ipv6 = true
+        do_ipv4 = true
+
+        #
+        # Allow the test to disable one/both
+        #
+        if ( @line =~ /ipv4_only/ )
+          do_ipv6 = false
+        end
+        if ( @line =~ /ipv6_only/ )
+          do_ipv4 = false
+        end
+
+        #
         # OK if it didn't look like an IP address then attempt to
         # look it up, as both IPv4 and IPv6.
-        # 
+        #
         begin
           timeout( period ) do
 
             Resolv::DNS.open do |dns|
-              ress = dns.getresources(@host, Resolv::DNS::Resource::IN::A)
-              ress.map { |r| ips.push( r.address.to_s ) }
-              ress = dns.getresources(@host, Resolv::DNS::Resource::IN::AAAA)
-              ress.map { |r| ips.push( r.address.to_s ) }
+              if ( do_ipv4 )
+                ress = dns.getresources(@host, Resolv::DNS::Resource::IN::A)
+                ress.map { |r| ips.push( r.address.to_s ) }
+              end
+              if ( do_ipv6 )
+                ress = dns.getresources(@host, Resolv::DNS::Resource::IN::AAAA)
+                ress.map { |r| ips.push( r.address.to_s ) }
+              end
             end
           end
         rescue Timeout::Error => e