net-ping 1.7.2-universal-mingw32 → 1.7.3-universal-mingw32

data/lib/net/ping/icmp.rb

@@ -1,178 +1,177 @@
-require File.join(File.dirname(__FILE__), 'ping')
-
-if File::ALT_SEPARATOR
-  require 'win32/security'
-end
-
-# The Net module serves as a namespace only.
-module Net
-
-  # The Net::Ping::ICMP class encapsulates an icmp ping.
-  class Ping::ICMP < Ping
-    ICMP_ECHOREPLY = 0 # Echo reply
-    ICMP_ECHO      = 8 # Echo request
-    ICMP_SUBCODE   = 0
-
-    # You cannot set or change the port value. A value of 0 is always
-    # used internally for ICMP pings.
-    #
-    undef_method :port=
-
-    # Returns the data size, i.e. number of bytes sent on the ping. The
-    # default size is 56.
-    #
-    attr_reader :data_size
-
-    # Creates and returns a new Ping::ICMP object.  This is similar to its
-    # superclass constructor, but must be created with root privileges (on
-    # UNIX systems), and the port value is ignored.
-    #
-    def initialize(host=nil, port=nil, timeout=5)
-      raise 'requires root privileges' if Process.euid > 0
-
-      if File::ALT_SEPARATOR
-        unless Win32::Security.elevated_security?
-          raise 'requires elevated security'
-        end
-      end
-
-      @seq = 0
-      @bind_port = 0
-      @bind_host = nil
-      @data_size = 56
-      @data = ''
-
-      0.upto(@data_size){ |n| @data << (n % 256).chr }
-
-      @pid  = Process.pid & 0xffff
-
-      super(host, port, timeout)
-      @port = nil # This value is not used in ICMP pings.
-    end
-
-    # Sets the number of bytes sent in the ping method.
-    #
-    def data_size=(size)
-      @data_size = size
-      @data = ''
-      0.upto(size){ |n| @data << (n % 256).chr }
-    end
-
-    # Associates the local end of the socket connection with the given
-    # +host+ and +port+.  The default port is 0.
-    #
-    def bind(host, port = 0)
-      @bind_host = host
-      @bind_port = port
-    end
-
-    # Pings the +host+ specified in this method or in the constructor.  If a
-    # host was not specified either here or in the constructor, an
-    # ArgumentError is raised.
-    #
-    def ping(host = @host)
-      super(host)
-      bool = false
-
-      socket = Socket.new(
-        Socket::PF_INET,
-        Socket::SOCK_RAW,
-        Socket::IPPROTO_ICMP
-      )
-
-      if @bind_host
-        saddr = Socket.pack_sockaddr_in(@bind_port, @bind_host)
-        socket.bind(saddr)
-      end
-
-      @seq = (@seq + 1) % 65536
-      pstring = 'C2 n3 A' << @data_size.to_s
-      timeout = @timeout
-
-      checksum = 0
-      msg = [ICMP_ECHO, ICMP_SUBCODE, checksum, @pid, @seq, @data].pack(pstring)
-
-      checksum = checksum(msg)
-      msg = [ICMP_ECHO, ICMP_SUBCODE, checksum, @pid, @seq, @data].pack(pstring)
-
-      begin
-        saddr = Socket.pack_sockaddr_in(0, host)
-      rescue Exception
-        socket.close unless socket.closed?
-        return bool
-      end
-
-      start_time = Time.now
-
-      socket.send(msg, 0, saddr) # Send the message
-
-      begin
-        Timeout.timeout(@timeout){
-          while true
-            io_array = select([socket], nil, nil, timeout)
-
-            if io_array.nil? || io_array[0].empty?
-              return false
-            end
-
-            pid = nil
-            seq = nil
-
-            data = socket.recvfrom(1500).first
-            type = data[20, 2].unpack('C2').first
-
-            case type
-              when ICMP_ECHOREPLY
-                if data.length >= 28
-                  pid, seq = data[24, 4].unpack('n3')
-                end
-              else
-                if data.length > 56
-                  pid, seq = data[52, 4].unpack('n3')
-                end
-            end
-
-            if pid == @pid && seq == @seq && type == ICMP_ECHOREPLY
-              bool = true
-              break
-            end
-          end
-        }
-      rescue Exception => err
-        @exception = err
-      ensure
-        socket.close if socket
-      end
-
-      # There is no duration if the ping failed
-      @duration = Time.now - start_time if bool
-
-      return bool
-    end
-
-    alias ping? ping
-    alias pingecho ping
-
-    private
-
-    # Perform a checksum on the message.  This is the sum of all the short
-    # words and it folds the high order bits into the low order bits.
-    #
-    def checksum(msg)
-      length    = msg.length
-      num_short = length / 2
-      check     = 0
-
-      msg.unpack("n#{num_short}").each do |short|
-        check += short
-      end
-
-      if length % 2 > 0
-        check += msg[length-1, 1].unpack('C').first << 8
-      end
-
-      check = (check >> 16) + (check & 0xffff)
-      return (~((check >> 16) + check) & 0xffff)
-    end
-  end
-end
+require File.join(File.dirname(__FILE__), 'ping')
+
+if File::ALT_SEPARATOR
+  require 'win32/security'
+end
+
+# The Net module serves as a namespace only.
+module Net
+
+  # The Net::Ping::ICMP class encapsulates an icmp ping.
+  class Ping::ICMP < Ping
+    ICMP_ECHOREPLY = 0 # Echo reply
+    ICMP_ECHO      = 8 # Echo request
+    ICMP_SUBCODE   = 0
+
+    # You cannot set or change the port value. A value of 0 is always
+    # used internally for ICMP pings.
+    #
+    undef_method :port=
+
+    # Returns the data size, i.e. number of bytes sent on the ping. The
+    # default size is 56.
+    #
+    attr_reader :data_size
+
+    # Creates and returns a new Ping::ICMP object.  This is similar to its
+    # superclass constructor, but must be created with root privileges (on
+    # UNIX systems), and the port value is ignored.
+    #
+    def initialize(host=nil, port=nil, timeout=5)
+      raise 'requires root privileges' if Process.euid > 0
+
+      if File::ALT_SEPARATOR
+        unless Win32::Security.elevated_security?
+          raise 'requires elevated security'
+        end
+      end
+
+      @seq = 0
+      @bind_port = 0
+      @bind_host = nil
+      @data_size = 56
+      @data = ''
+
+      0.upto(@data_size){ |n| @data << (n % 256).chr }
+
+      @ping_id = (Thread.current.object_id ^ Process.pid) & 0xffff
+
+      super(host, port, timeout)
+      @port = nil # This value is not used in ICMP pings.
+    end
+
+    # Sets the number of bytes sent in the ping method.
+    #
+    def data_size=(size)
+      @data_size = size
+      @data = ''
+      0.upto(size){ |n| @data << (n % 256).chr }
+    end
+
+    # Associates the local end of the socket connection with the given
+    # +host+ and +port+. The default port is 0.
+    #
+    def bind(host, port = 0)
+      @bind_host = host
+      @bind_port = port
+    end
+
+    # Pings the +host+ specified in this method or in the constructor.  If a
+    # host was not specified either here or in the constructor, an
+    # ArgumentError is raised.
+    #
+    def ping(host = @host)
+      super(host)
+      bool = false
+
+      socket = Socket.new(
+        Socket::PF_INET,
+        Socket::SOCK_RAW,
+        Socket::IPPROTO_ICMP
+      )
+
+      if @bind_host
+        saddr = Socket.pack_sockaddr_in(@bind_port, @bind_host)
+        socket.bind(saddr)
+      end
+
+      @seq = (@seq + 1) % 65536
+      pstring = 'C2 n3 A' << @data_size.to_s
+      timeout = @timeout
+
+      checksum = 0
+      msg = [ICMP_ECHO, ICMP_SUBCODE, checksum, @ping_id, @seq, @data].pack(pstring)
+
+      checksum = checksum(msg)
+      msg = [ICMP_ECHO, ICMP_SUBCODE, checksum, @ping_id, @seq, @data].pack(pstring)
+
+      begin
+        saddr = Socket.pack_sockaddr_in(0, host)
+      rescue Exception
+        socket.close unless socket.closed?
+        return bool
+      end
+
+      start_time = Time.now
+
+      socket.send(msg, 0, saddr) # Send the message
+
+      begin
+        while true
+          io_array = select([socket], nil, nil, timeout)
+
+          if io_array.nil? || io_array[0].empty?
+            @exception = "timeout" if io_array.nil?
+            return false
+          end
+
+          ping_id = nil
+          seq = nil
+
+          data = socket.recvfrom(1500).first
+          type = data[20, 2].unpack('C2').first
+
+          case type
+            when ICMP_ECHOREPLY
+              if data.length >= 28
+                ping_id, seq = data[24, 4].unpack('n3')
+              end
+            else
+              if data.length > 56
+                ping_id, seq = data[52, 4].unpack('n3')
+              end
+          end
+
+          if ping_id == @ping_id && seq == @seq && type == ICMP_ECHOREPLY
+            bool = true
+            break
+          end
+        end
+      rescue Exception => err
+        @exception = err
+      ensure
+        socket.close if socket
+      end
+
+      # There is no duration if the ping failed
+      @duration = Time.now - start_time if bool
+
+      return bool
+    end
+
+    alias ping? ping
+    alias pingecho ping
+
+    private
+
+    # Perform a checksum on the message.  This is the sum of all the short
+    # words and it folds the high order bits into the low order bits.
+    #
+    def checksum(msg)
+      length    = msg.length
+      num_short = length / 2
+      check     = 0
+
+      msg.unpack("n#{num_short}").each do |short|
+        check += short
+      end
+
+      if length % 2 > 0
+        check += msg[length-1, 1].unpack('C').first << 8
+      end
+
+      check = (check >> 16) + (check & 0xffff)
+      return (~((check >> 16) + check) & 0xffff)
+    end
+  end
+end

data/lib/net/ping/ping.rb

@@ -1,89 +1,89 @@
-require 'socket'
-require 'timeout'
-
-# The Net module serves as a namespace only.
-#
-module Net
-
-   # The Ping class serves as an abstract base class for all other Ping class
-   # types. You should not instantiate this class directly.
-   #
-   class Ping
-      # The version of the net-ping library.
-      VERSION = '1.7.2'
-
-      # The host to ping. In the case of Ping::HTTP, this is the URI.
-      attr_accessor :host
-
-      # The port to ping. This is set to the echo port (7) by default. The
-      # Ping::HTTP class defaults to port 80.
-      #
-      attr_accessor :port
-
-      # The maximum time a ping attempt is made.
-      attr_accessor :timeout
-
-      # If a ping fails, this value is set to the error that occurred which
-      # caused it to fail.
-      #
-      attr_reader :exception
-
-      # This value is set if a ping succeeds, but some other condition arose
-      # during the ping attempt which merits warning, e.g a redirect in the
-      # case of Ping::HTTP#ping.
-      #
-      attr_reader :warning
-
-      # The number of seconds (returned as a Float) that it took to ping
-      # the host. This is not a precise value, but rather a good estimate
-      # since there is a small amount of internal calculation that is added
-      # to the overall time.
-      #
-      attr_reader :duration
-
-      # The default constructor for the Net::Ping class.  Accepts an optional
-      # +host+, +port+ and +timeout+.  The port defaults to your echo port, or
-      # 7 if that happens to be undefined.  The default timeout is 5 seconds.
-      #
-      # The host, although optional in the constructor, must be specified at
-      # some point before the Net::Ping#ping method is called, or else an
-      # ArgumentError will be raised.
-      #
-      # Yields +self+ in block context.
-      #
-      # This class is not meant to be instantiated directly.  It is strictly
-      # meant as an interface for subclasses.
-      #
-      def initialize(host=nil, port=nil, timeout=5)
-         @host      = host
-         @port      = port || Socket.getservbyname('echo') || 7
-         @timeout   = timeout
-         @exception = nil
-         @warning   = nil
-         @duration  = nil
-
-         yield self if block_given?
-      end
-
-      # The default interface for the Net::Ping#ping method.  Each subclass
-      # should call super() before continuing with their own implementation in
-      # order to ensure that the @exception and @warning instance variables
-      # are reset.
-      #
-      # If +host+ is nil here, then it will use the host specified in the
-      # constructor.  If the +host+ is nil and there was no host specified
-      # in the constructor then an ArgumentError is raised.
-      #--
-      # The @duration should be set in the subclass' ping method.
-      #
-      def ping(host = @host)
-         raise ArgumentError, 'no host specified' unless host
-         @exception = nil
-         @warning   = nil
-         @duration  = nil
-      end
-
-      alias ping? ping
-      alias pingecho ping
-   end
-end
+require 'socket'
+require 'timeout'
+
+# The Net module serves as a namespace only.
+#
+module Net
+
+   # The Ping class serves as an abstract base class for all other Ping class
+   # types. You should not instantiate this class directly.
+   #
+   class Ping
+      # The version of the net-ping library.
+      VERSION = '1.7.3'
+
+      # The host to ping. In the case of Ping::HTTP, this is the URI.
+      attr_accessor :host
+
+      # The port to ping. This is set to the echo port (7) by default. The
+      # Ping::HTTP class defaults to port 80.
+      #
+      attr_accessor :port
+
+      # The maximum time a ping attempt is made.
+      attr_accessor :timeout
+
+      # If a ping fails, this value is set to the error that occurred which
+      # caused it to fail.
+      #
+      attr_reader :exception
+
+      # This value is set if a ping succeeds, but some other condition arose
+      # during the ping attempt which merits warning, e.g a redirect in the
+      # case of Ping::HTTP#ping.
+      #
+      attr_reader :warning
+
+      # The number of seconds (returned as a Float) that it took to ping
+      # the host. This is not a precise value, but rather a good estimate
+      # since there is a small amount of internal calculation that is added
+      # to the overall time.
+      #
+      attr_reader :duration
+
+      # The default constructor for the Net::Ping class.  Accepts an optional
+      # +host+, +port+ and +timeout+.  The port defaults to your echo port, or
+      # 7 if that happens to be undefined.  The default timeout is 5 seconds.
+      #
+      # The host, although optional in the constructor, must be specified at
+      # some point before the Net::Ping#ping method is called, or else an
+      # ArgumentError will be raised.
+      #
+      # Yields +self+ in block context.
+      #
+      # This class is not meant to be instantiated directly.  It is strictly
+      # meant as an interface for subclasses.
+      #
+      def initialize(host=nil, port=nil, timeout=5)
+         @host      = host
+         @port      = port || Socket.getservbyname('echo') || 7
+         @timeout   = timeout
+         @exception = nil
+         @warning   = nil
+         @duration  = nil
+
+         yield self if block_given?
+      end
+
+      # The default interface for the Net::Ping#ping method.  Each subclass
+      # should call super() before continuing with their own implementation in
+      # order to ensure that the @exception and @warning instance variables
+      # are reset.
+      #
+      # If +host+ is nil here, then it will use the host specified in the
+      # constructor.  If the +host+ is nil and there was no host specified
+      # in the constructor then an ArgumentError is raised.
+      #--
+      # The @duration should be set in the subclass' ping method.
+      #
+      def ping(host = @host)
+         raise ArgumentError, 'no host specified' unless host
+         @exception = nil
+         @warning   = nil
+         @duration  = nil
+      end
+
+      alias ping? ping
+      alias pingecho ping
+   end
+end