net-ping 1.7.4-universal-mingw32 → 1.7.5-universal-mingw32

data/lib/net/ping/tcp.rb

@@ -1,102 +1,107 @@
-require File.join(File.dirname(__FILE__), 'ping')
-
-# The Net module serves as a namespace only.
-module Net
-
-  # With a TCP ping simply try to open a connection. If we are successful,
-  # assume success. In either case close the connection to be polite.
-  #
-  class Ping::TCP < Ping
-    @@service_check = false
-
-    # Returns whether or not Errno::ECONNREFUSED is considered a successful
-    # ping. The default is false.
-    #
-    def self.service_check
-      @@service_check
-    end
-
-    # Sets whether or not an Errno::ECONNREFUSED should be considered a
-    # successful ping.
-    #
-    def self.service_check=(bool)
-      unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
-        raise ArgumentError, 'argument must be true or false'
-      end
-      @@service_check = bool
-    end
-
-    # This method attempts to ping a host and port using a TCPSocket with
-    # the host, port and timeout values passed in the constructor.  Returns
-    # true if successful, or false otherwise.
-    #
-    # Note that, by default, an Errno::ECONNREFUSED return result will be
-    # considered a failed ping.  See the documentation for the
-    # Ping::TCP.service_check= method if you wish to change this behavior.
-    #
-    def ping(host=@host)
-      super(host)
-
-      bool = false
-      start_time = Time.now
-
-      # Failure here most likely means bad host, so just bail.
-      begin
-        addr = Socket.getaddrinfo(host, port)
-      rescue SocketError => err
-        @exception = err
-        return false
-      end
-
-      begin
-        # Where addr[0][0] is likely AF_INET.
-        sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
-
-        # This may not be entirely necessary
-        sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-
-        begin
-          # Where addr[0][3] is an IP address
-          sock.connect_nonblock(Socket.pack_sockaddr_in(port, addr[0][3]))
-        rescue Errno::EINPROGRESS
-          # No-op, continue below
-        rescue Exception => err
-          # Something has gone horribly wrong
-          @exception = err
-          return false
-        end
-
-        resp = IO.select(nil, [sock], nil, timeout)
-
-        # Assume ECONNREFUSED at this point
-        if resp.nil?
-          if @@service_check
-            bool = true
-          else
-            @exception = Errno::ECONNREFUSED
-          end
-        else
-          bool = true
-        end
-      ensure
-        sock.close if sock
-      end
-
-      # There is no duration if the ping failed
-      @duration = Time.now - start_time if bool
-
-      bool
-    end
-
-    alias ping? ping
-    alias pingecho ping
-
-    # Class method aliases. DEPRECATED.
-    class << self
-      alias econnrefused service_check
-      alias econnrefused= service_check=
-      alias ecr service_check
-      alias ecr= service_check=
-    end
-  end
-end
+require File.join(File.dirname(__FILE__), 'ping')
+
+# The Net module serves as a namespace only.
+module Net
+
+  # With a TCP ping simply try to open a connection. If we are successful,
+  # assume success. In either case close the connection to be polite.
+  #
+  class Ping::TCP < Ping
+    @@service_check = false
+
+    # Returns whether or not Errno::ECONNREFUSED is considered a successful
+    # ping. The default is false.
+    #
+    def self.service_check
+      @@service_check
+    end
+
+    # Sets whether or not an Errno::ECONNREFUSED should be considered a
+    # successful ping.
+    #
+    def self.service_check=(bool)
+      unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
+        raise ArgumentError, 'argument must be true or false'
+      end
+      @@service_check = bool
+    end
+
+    # This method attempts to ping a host and port using a TCPSocket with
+    # the host, port and timeout values passed in the constructor.  Returns
+    # true if successful, or false otherwise.
+    #
+    # Note that, by default, an Errno::ECONNREFUSED return result will be
+    # considered a failed ping.  See the documentation for the
+    # Ping::TCP.service_check= method if you wish to change this behavior.
+    #
+    def ping(host=@host)
+      super(host)
+
+      bool = false
+      start_time = Time.now
+
+      # Failure here most likely means bad host, so just bail.
+      begin
+        addr = Socket.getaddrinfo(host, port)
+      rescue SocketError => err
+        @exception = err
+        return false
+      end
+
+      begin
+        # Where addr[0][0] is likely AF_INET.
+        sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+
+        # This may not be entirely necessary
+        sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+        begin
+          # Where addr[0][3] is an IP address
+          sock.connect_nonblock(Socket.pack_sockaddr_in(port, addr[0][3]))
+        rescue Errno::EINPROGRESS
+          # No-op, continue below
+        rescue Exception => err
+          # Something has gone horribly wrong
+          @exception = err
+          return false
+        end
+
+        resp = IO.select(nil, [sock], nil, timeout)
+
+        if @@service_check
+          bool = true
+        elsif resp.nil?
+          # Assume ECONNREFUSED at this point
+          @exception = Errno::ECONNREFUSED
+        else
+          sockopt = sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR)
+
+          # Check to see if ECONNREFUSED actually occurred.
+          if sockopt.int == Errno::ECONNREFUSED::Errno
+            @exception = Errno::ECONNREFUSED
+          else
+            bool = true
+          end
+        end
+      ensure
+        sock.close if sock
+      end
+
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
+
+      bool
+    end
+
+    alias ping? ping
+    alias pingecho ping
+
+    # Class method aliases. DEPRECATED.
+    class << self
+      alias econnrefused service_check
+      alias econnrefused= service_check=
+      alias ecr service_check
+      alias ecr= service_check=
+    end
+  end
+end

data/lib/net/ping/udp.rb

@@ -1,119 +1,119 @@
-require File.join(File.dirname(__FILE__), 'ping')
-
-# The Net module serves as a namespace only.
-module Net
-
-  # The Ping::UDP class encapsulates methods for UDP pings.
-  class Ping::UDP < Ping
-    @@service_check = true
-      
-    # Returns whether or not the connect behavior should enforce remote
-    # service availability as well as reachability. The default is true.
-    #
-    def self.service_check
-      @@service_check
-    end
-      
-    # Set whether or not the connect behavior should enforce remote
-    # service availability as well as reachability. If set to false
-    # then Errno::ECONNREFUSED or Errno::ECONNRESET will be considered
-    # a successful ping, meaning no actual data handshaking is required.
-    # By default, if either of those errors occurs it is considered a failed
-    # ping.
-    #
-    def self.service_check=(bool)
-      unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
-        raise ArgumentError, 'argument must be true or false'
-      end
-      @@service_check = bool         
-    end
-      
-    # The maximum data size that can be sent in a UDP ping.
-    MAX_DATA = 64
-      
-    # The data to send to the remote host. By default this is 'ping'.
-    # This should be MAX_DATA size characters or less.
-    # 
-    attr_reader :data
-      
-    # Creates and returns a new Ping::UDP object.  This is effectively
-    # identical to its superclass constructor.
-    # 
-    def initialize(host=nil, port=nil, timeout=5)
-      @data = 'ping'
-
-      super(host, port, timeout)
-
-      @bind_host = nil
-      @bind_port = nil
-    end
-      
-    # Sets the data string sent to the remote host. This value cannot have
-    # a size greater than MAX_DATA.
-    # 
-    def data=(string)
-       if string.size > MAX_DATA
-         err = "cannot set data string larger than #{MAX_DATA} characters"
-         raise ArgumentError, err
-       end
-         
-       @data = string
-    end
-
-    # Associates the local end of the UDP connection with the given +host+
-    # and +port+. This is essentially a wrapper for UDPSocket#bind.
-    #
-    def bind(host, port)
-      @bind_host = host
-      @bind_port = port
-    end
-
-    # Sends a simple text string to the host and checks the return string. If
-    # the string sent and the string returned are a match then the ping was
-    # successful and true is returned. Otherwise, false is returned.
-    #
-    def ping(host = @host)
-      super(host)
-
-      bool  = false
-      udp   = UDPSocket.open
-      array = []
-
-      if @bind_host
-        udp.bind(@bind_host, @bind_port)
-      end
-
-      start_time = Time.now
-
-      begin
-        Timeout.timeout(@timeout){
-          udp.connect(host, @port)
-          udp.send(@data, 0)
-          array = udp.recvfrom(MAX_DATA)
-        }
-      rescue Errno::ECONNREFUSED, Errno::ECONNRESET => err
-        if @@service_check
-          @exception = err
-        else
-          bool = true
-        end
-      rescue Exception => err
-        @exception = err
-      else
-        if array[0] == @data
-          bool = true
-        end
-      ensure
-        udp.close if udp
-      end
-
-      # There is no duration if the ping failed
-      @duration = Time.now - start_time if bool
-
-      bool
-    end
-
-    alias ping? ping
-    alias pingecho ping
-  end
-end
+require File.join(File.dirname(__FILE__), 'ping')
+
+# The Net module serves as a namespace only.
+module Net
+
+  # The Ping::UDP class encapsulates methods for UDP pings.
+  class Ping::UDP < Ping
+    @@service_check = true
+      
+    # Returns whether or not the connect behavior should enforce remote
+    # service availability as well as reachability. The default is true.
+    #
+    def self.service_check
+      @@service_check
+    end
+      
+    # Set whether or not the connect behavior should enforce remote
+    # service availability as well as reachability. If set to false
+    # then Errno::ECONNREFUSED or Errno::ECONNRESET will be considered
+    # a successful ping, meaning no actual data handshaking is required.
+    # By default, if either of those errors occurs it is considered a failed
+    # ping.
+    #
+    def self.service_check=(bool)
+      unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
+        raise ArgumentError, 'argument must be true or false'
+      end
+      @@service_check = bool         
+    end
+      
+    # The maximum data size that can be sent in a UDP ping.
+    MAX_DATA = 64
+      
+    # The data to send to the remote host. By default this is 'ping'.
+    # This should be MAX_DATA size characters or less.
+    # 
+    attr_reader :data
+      
+    # Creates and returns a new Ping::UDP object.  This is effectively
+    # identical to its superclass constructor.
+    # 
+    def initialize(host=nil, port=nil, timeout=5)
+      @data = 'ping'
+
+      super(host, port, timeout)
+
+      @bind_host = nil
+      @bind_port = nil
+    end
+      
+    # Sets the data string sent to the remote host. This value cannot have
+    # a size greater than MAX_DATA.
+    # 
+    def data=(string)
+       if string.size > MAX_DATA
+         err = "cannot set data string larger than #{MAX_DATA} characters"
+         raise ArgumentError, err
+       end
+         
+       @data = string
+    end
+
+    # Associates the local end of the UDP connection with the given +host+
+    # and +port+. This is essentially a wrapper for UDPSocket#bind.
+    #
+    def bind(host, port)
+      @bind_host = host
+      @bind_port = port
+    end
+
+    # Sends a simple text string to the host and checks the return string. If
+    # the string sent and the string returned are a match then the ping was
+    # successful and true is returned. Otherwise, false is returned.
+    #
+    def ping(host = @host)
+      super(host)
+
+      bool  = false
+      udp   = UDPSocket.open
+      array = []
+
+      if @bind_host
+        udp.bind(@bind_host, @bind_port)
+      end
+
+      start_time = Time.now
+
+      begin
+        Timeout.timeout(@timeout){
+          udp.connect(host, @port)
+          udp.send(@data, 0)
+          array = udp.recvfrom(MAX_DATA)
+        }
+      rescue Errno::ECONNREFUSED, Errno::ECONNRESET => err
+        if @@service_check
+          @exception = err
+        else
+          bool = true
+        end
+      rescue Exception => err
+        @exception = err
+      else
+        if array[0] == @data
+          bool = true
+        end
+      ensure
+        udp.close if udp
+      end
+
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
+
+      bool
+    end
+
+    alias ping? ping
+    alias pingecho ping
+  end
+end

data/lib/net/ping/wmi.rb

@@ -1,118 +1,118 @@
-require File.join(File.dirname(__FILE__), 'ping')
-require 'win32ole'
-
-# The Net module serves as a namespace only.
-#
-module Net
-   
-   # The Ping::WMI class encapsulates the Win32_PingStatus WMI class for
-   # MS Windows.
-   #
-   class Ping::WMI < Ping
-
-      PingStatus = Struct.new(
-         'PingStatus',
-         :address,
-         :buffer_size,
-         :no_fragmentation,
-         :primary_address_resolution_status,
-         :protocol_address,
-         :protocol_address_resolved,
-         :record_route,
-         :reply_inconsistency,
-         :reply_size,
-         :resolve_address_names,
-         :response_time,
-         :response_time_to_live,
-         :route_record,
-         :route_record_resolved,
-         :source_route,
-         :source_route_type,
-         :status_code,
-         :timeout,
-         :timestamp_record,
-         :timestamp_record_address,
-         :timestamp_record_address_resolved,
-         :timestamp_route,
-         :time_to_live,
-         :type_of_service
-      )
-
-      # Unlike the ping method for other Ping subclasses, this version returns
-      # a PingStatus struct which contains various bits of information about
-      # the results of the ping itself, such as response time.
-      #
-      # In addition, this version allows you to pass certain options that are
-      # then passed on to the underlying WQL query. See the MSDN documentation
-      # on Win32_PingStatus for details.
-      #
-      # Examples:
-      #
-      #  # Ping with no options
-      #  Ping::WMI.ping('www.perl.com')
-      #
-      #  # Ping with options
-      #  Ping::WMI.ping('www.perl.com', :BufferSize => 64, :NoFragmentation => true)
-      #--
-      # The PingStatus struct is a wrapper for the Win32_PingStatus WMI class.
-      #
-      def ping(host = @host, options = {})
-         super(host)
-
-         lhost = Socket.gethostname
-
-         cs = "winmgmts:{impersonationLevel=impersonate}!//#{lhost}/root/cimv2"
-         wmi = WIN32OLE.connect(cs)
-
-         query = "select * from win32_pingstatus where address = '#{host}'"
-
-         unless options.empty?
-            options.each{ |key, value|
-               if value.is_a?(String)
-                  query << " and #{key} = '#{value}'"
-               else
-                  query << " and #{key} = #{value}"
-               end
-            }
-         end
-
-         status = Struct::PingStatus.new
-
-         wmi.execquery(query).each{ |obj|
-            status.address                           = obj.Address
-            status.buffer_size                       = obj.BufferSize
-            status.no_fragmentation                  = obj.NoFragmentation
-            status.primary_address_resolution_status = obj.PrimaryAddressResolutionStatus
-            status.protocol_address                  = obj.ProtocolAddress
-            status.protocol_address_resolved         = obj.ProtocolAddressResolved
-            status.record_route                      = obj.RecordRoute 
-            status.reply_inconsistency               = obj.ReplyInconsistency
-            status.reply_size                        = obj.ReplySize
-            status.resolve_address_names             = obj.ResolveAddressNames
-            status.response_time                     = obj.ResponseTime
-            status.response_time_to_live             = obj.ResponseTimeToLive
-            status.route_record                      = obj.RouteRecord
-            status.route_record_resolved             = obj.RouteRecordResolved
-            status.source_route                      = obj.SourceRoute
-            status.source_route_type                 = obj.SourceRouteType
-            status.status_code                       = obj.StatusCode
-            status.timeout                           = obj.Timeout
-            status.timestamp_record                  = obj.TimeStampRecord
-            status.timestamp_record_address          = obj.TimeStampRecordAddress
-            status.timestamp_record_address_resolved = obj.TimeStampRecordAddressResolved
-            status.timestamp_route                   = obj.TimeStampRoute
-            status.time_to_live                      = obj.TimeToLive
-            status.type_of_service                   = obj.TypeOfService
-         }
-
-         status.freeze # Read-only data
-      end      
-
-      # Unlike Net::Ping::WMI#ping, this method returns true or false to
-      # indicate whether or not the ping was successful.
-      #
-      def ping?(host = @host, options = {})
-         ping(host, options).status_code == 0
-      end
-   end   
-end
+require File.join(File.dirname(__FILE__), 'ping')
+require 'win32ole'
+
+# The Net module serves as a namespace only.
+#
+module Net
+   
+   # The Ping::WMI class encapsulates the Win32_PingStatus WMI class for
+   # MS Windows.
+   #
+   class Ping::WMI < Ping
+
+      PingStatus = Struct.new(
+         'PingStatus',
+         :address,
+         :buffer_size,
+         :no_fragmentation,
+         :primary_address_resolution_status,
+         :protocol_address,
+         :protocol_address_resolved,
+         :record_route,
+         :reply_inconsistency,
+         :reply_size,
+         :resolve_address_names,
+         :response_time,
+         :response_time_to_live,
+         :route_record,
+         :route_record_resolved,
+         :source_route,
+         :source_route_type,
+         :status_code,
+         :timeout,
+         :timestamp_record,
+         :timestamp_record_address,
+         :timestamp_record_address_resolved,
+         :timestamp_route,
+         :time_to_live,
+         :type_of_service
+      )
+
+      # Unlike the ping method for other Ping subclasses, this version returns
+      # a PingStatus struct which contains various bits of information about
+      # the results of the ping itself, such as response time.
+      #
+      # In addition, this version allows you to pass certain options that are
+      # then passed on to the underlying WQL query. See the MSDN documentation
+      # on Win32_PingStatus for details.
+      #
+      # Examples:
+      #
+      #  # Ping with no options
+      #  Ping::WMI.ping('www.perl.com')
+      #
+      #  # Ping with options
+      #  Ping::WMI.ping('www.perl.com', :BufferSize => 64, :NoFragmentation => true)
+      #--
+      # The PingStatus struct is a wrapper for the Win32_PingStatus WMI class.
+      #
+      def ping(host = @host, options = {})
+         super(host)
+
+         lhost = Socket.gethostname
+
+         cs = "winmgmts:{impersonationLevel=impersonate}!//#{lhost}/root/cimv2"
+         wmi = WIN32OLE.connect(cs)
+
+         query = "select * from win32_pingstatus where address = '#{host}'"
+
+         unless options.empty?
+            options.each{ |key, value|
+               if value.is_a?(String)
+                  query << " and #{key} = '#{value}'"
+               else
+                  query << " and #{key} = #{value}"
+               end
+            }
+         end
+
+         status = Struct::PingStatus.new
+
+         wmi.execquery(query).each{ |obj|
+            status.address                           = obj.Address
+            status.buffer_size                       = obj.BufferSize
+            status.no_fragmentation                  = obj.NoFragmentation
+            status.primary_address_resolution_status = obj.PrimaryAddressResolutionStatus
+            status.protocol_address                  = obj.ProtocolAddress
+            status.protocol_address_resolved         = obj.ProtocolAddressResolved
+            status.record_route                      = obj.RecordRoute 
+            status.reply_inconsistency               = obj.ReplyInconsistency
+            status.reply_size                        = obj.ReplySize
+            status.resolve_address_names             = obj.ResolveAddressNames
+            status.response_time                     = obj.ResponseTime
+            status.response_time_to_live             = obj.ResponseTimeToLive
+            status.route_record                      = obj.RouteRecord
+            status.route_record_resolved             = obj.RouteRecordResolved
+            status.source_route                      = obj.SourceRoute
+            status.source_route_type                 = obj.SourceRouteType
+            status.status_code                       = obj.StatusCode
+            status.timeout                           = obj.Timeout
+            status.timestamp_record                  = obj.TimeStampRecord
+            status.timestamp_record_address          = obj.TimeStampRecordAddress
+            status.timestamp_record_address_resolved = obj.TimeStampRecordAddressResolved
+            status.timestamp_route                   = obj.TimeStampRoute
+            status.time_to_live                      = obj.TimeToLive
+            status.type_of_service                   = obj.TypeOfService
+         }
+
+         status.freeze # Read-only data
+      end      
+
+      # Unlike Net::Ping::WMI#ping, this method returns true or false to
+      # indicate whether or not the ping was successful.
+      #
+      def ping?(host = @host, options = {})
+         ping(host, options).status_code == 0
+      end
+   end   
+end