hoptracker 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e943633142712cddfbc966d763ce5c39f8bc7e6a7ff19f3684be188607f65c19
-  data.tar.gz: 7753455c2d0b7da8fc1d4dd779f15a6b66394816700bbbe76ab1856c1c81b653
+  metadata.gz: dcab614c297cd2e8d0d256b65b6443fc16dd7e04661b571d1857aad5a1b3f526
+  data.tar.gz: 73607ff160dc26977f502965bc2b8ce5a55a610201ef2ee96cbfb4c319924795
 SHA512:
-  metadata.gz: 4bdcf2c492bd372a45b34c1b3363704d6d723a248d062565c0cfc912107055523cf5bf80299616a02fe8fe3ca0c2c8d951b48ce15909bee81ebf2ea8dff5d833
-  data.tar.gz: ba8e1a201c6c9ceaed1f5e9ff592e04b7bd50e3f13cc77dad975f1d51ab081b08d50f5cc9a4e0ffdf583261a297dbe339f7f14a5f4b6e9d62bca6bfde4bc399f
+  metadata.gz: ed96cc43e561c069b79bd3fee6b7083ee51ea00e9653d97c2d9f6d0f5df18d68eecf169bc3eb26e8929cb5b761b999e75fdf400f1ca412ebd2804533eaabb30b
+  data.tar.gz: faee9e84f34268c8389a899c01c9ed1163fc1d5c402a8f404a21b56a19734edad938a6de66d2d46bd7f2090fd7cd963223b315e3de2fae0af2ebf7d23d9c0f8e

data/bin/hoptracker

@@ -4,6 +4,37 @@
 
 require 'hoptracker/prober'
 
+# Remove this when Ruby 3.4 is released
+if ! (defined?(Socket::IPV6_RECVERR) && defined?(Socket::IPV6_MTU_DISCOVER))
+  warn 'Your Ruby version seems to be outdated. hoptracker requires a Ruby version that has fixed bug #20258.'
+  warn 'Try to use fallback ... this may affect the functionality of hoptracker.'
+  class Socket
+    IPV6_RECVERR = 25
+    IPV6_MTU_DISCOVER = 23
+    ResolutionError = SocketError
+  end
+end
+
+if ! (
+  defined?(Socket::IPPROTO_IP) &&
+  defined?(Socket::IP_RECVERR) &&
+  defined?(Socket::IP_MTU_DISCOVER) &&
+  defined?(Socket::IP_RECVTTL)
+)
+  warn 'Your Ruby version does not seem to support the required IPv4 functionalities. hoptracker can therefore not be executed.'
+  exit 1
+end
+
+if ! (
+  defined?(Socket::IPPROTO_IPV6) &&
+  defined?(Socket::IPV6_RECVERR) &&
+  defined?(Socket::IPV6_MTU_DISCOVER) &&
+  defined?(Socket::IPV6_RECVHOPLIMIT)
+)
+  warn 'Your Ruby version does not seem to support the required IPv6 functionalities. hoptracker can therefore not be executed.'
+  exit 1
+end
+
 prober = HopTracker::Prober.new ARGV[0]
 
 # Set the MTU to the maximum and the TTL counter to 1

data/lib/hoptracker/prober.rb

@@ -46,20 +46,9 @@ module HopTracker
       @socket = @destination.connect
 
       # Next, we allow errors to be received, which means that we will later have ICMP error messages. Furthermore, we set the flag for MTU Discover so that packets are not fragmented. We also want to know the TTL of the packet we are receiving.
-      # Requires patch  for IPv6
       if @destination.ipv6?
-        # Some constants are currently missing for IPv6. I have created both a bug report [1] and a PR [2] for this.
-        # [1] https://bugs.ruby-lang.org/issues/20258
-        # [2] https://github.com/ruby/ruby/pull/9930
-        if defined?(Socket::IPV6_RECVERR) && defined?(Socket::IPV6_MTU_DISCOVER)
-          @socket.setsockopt Socket::IPPROTO_IPV6, Socket::IPV6_RECVERR, 1
-          @socket.setsockopt Socket::IPPROTO_IPV6, Socket::IPV6_MTU_DISCOVER, 3
-        else
-          # Since the program should still try to work, we use frequently used numbers as a fallback.
-          warn "Please use a Ruby version that includes PR#9930 on GitHub or has closed bug #20258. Using fallback numbers... This can lead to errors."
-          @socket.setsockopt Socket::IPPROTO_IPV6, 25, 1
-          @socket.setsockopt Socket::IPPROTO_IPV6, 23, 3
-        end
+        @socket.setsockopt Socket::IPPROTO_IPV6, Socket::IPV6_RECVERR, 1
+        @socket.setsockopt Socket::IPPROTO_IPV6, Socket::IPV6_MTU_DISCOVER, 3
         @socket.setsockopt Socket::IPPROTO_IPV6, Socket::IPV6_RECVHOPLIMIT, 1
       else
         @socket.setsockopt Socket::IPPROTO_IP, Socket::IP_RECVERR, 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoptracker
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Marek Küthe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack