scriptroute 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d192161acfbf508dfd7d953bc7ec1a219930d15
-  data.tar.gz: a3c7cbd73442f9aa4cc263830a71b62023f08355
+  metadata.gz: e286d4b4fa4a450c8a2aaac1fe6987ae1ac8ed8b
+  data.tar.gz: af98fdafbc90ad8b9b528b0104851f3e5465e88e
 SHA512:
-  metadata.gz: 3a98db9cec4c8d90da6c8958e68d063d3049c68d88ac612184abfef44a789f8b57120b2325625f3704c770db3a6557aa2ad6336d36655be28067426b0fff69f0
-  data.tar.gz: 77be1bb191576fa8890c8395c1d93577e060cfe4a846989c74c51ae24797e3dbf1c78f091dbedc33ef72c3aa78c373ba391cfe1ee1eed3dd88c70815dee82425
+  metadata.gz: ab994b7c31ffdc3b72622689776bd70cd3545bd8abfe6c046112130cbae57874773b3c28b399206e1fbf59079bd1cefd1573bcaa5eee244f2f88d6826884a5f0
+  data.tar.gz: f8f93fc4ef3c998d1a622e476ff1a414bce2fd3ace0720ac7a83f8e2ad44c8bb006d895c7aeced6cad670eeeea07f8c0eca8a534827d5404e5465199845a8ff9

data/bin/sr-traceroute6

@@ -0,0 +1,37 @@
+#! /usr/bin/env ruby
+
+require 'scriptroute'
+require 'scriptroute/packets'
+
+if ARGV.empty? then
+  puts "usage: #{$0} address_or_hostname"
+  exit 1
+end
+
+probe = Scriptroute::UDP6.new(12) 
+
+probe.ip6_dst = ARGV[0]
+
+unreach = false
+
+puts "Traceroute to #{ARGV[0]} (#{probe.ip6_dst})"
+
+catch(:unreachable) do 
+  ( 1..64 ).each { |ttl|
+    ( 1..3 ).each { |rep|
+      probe.ip_ttl = ttl
+      packets = Scriptroute::send_train([ Struct::DelayedPacket.new(0,probe) ])
+      response = (packets[0].response) ?  packets[0].response.packet : nil
+      if(response) then
+        puts '%d %s %5.3f ms' % [ ttl, response.ip6_src, packets[0].rtt * 1000.0 ]
+        if(response.is_a?(Scriptroute::ICMP6)) then
+          unreach = true if(response.icmp_type == Scriptroute::ICMP6::ICMP6_DST_UNREACH)
+        end
+      else
+        puts ttl.to_s + ' *' 
+      end
+      $stdout.flush
+    }
+    throw :unreachable if(unreach)
+  }
+end

data/lib/scriptroute.rb

@@ -105,15 +105,15 @@ end
     #   useful value in calculating rtt when NTP's adjustments
     #   via skew cause trouble.
     attr_accessor :tsc
-    # @return [IPv4]
+    # @return [IP]
     attr_accessor :packet
 
     # @param time [Float,nil] Seconds since the epoch, or nil if we didn't see the packet leave due to pcap (happens)
     # @param tsc [Fixnum,nil] Value of the cycle counter (rdtsc) or nil if not supported
-    # @param packet [IPv4] The packet received.
+    # @param packet [IP] The packet received.
     def initialize(time, tsc, packet)
       raise ArgumentError, "no packet" unless packet
-      raise ArgumentError, "packet of the wrong class" unless packet.is_a?(IPv4)
+      raise ArgumentError, "packet of the wrong class" unless packet.is_a?(IP)
       @time = time
       @tsc = tsc
       @packet = packet
@@ -225,15 +225,20 @@ end
   def Scriptroute::dns_lookup(name)
     Resolv.getaddress name
   end
+  private 
+  @@config = nil
+  public
   # @return [Hash] the configuration of the running daemon,
   #  useful for checking rate limiting parameters or filters
   #  if a specially configured daemon is needed.
   def Scriptroute::DaemonConfig
     ret = nil
-    with_scriptroute_connection do |c|
-      ret = c.get_config
+    unless @@config then
+      with_scriptroute_connection do |c|
+        @@config = c.get_config
+      end
     end
-    ret
+    @@config
   end
   # no op for backward compatibility with the srinterpreter version
   # that had a dedicated packet instance
@@ -266,7 +271,7 @@ end
         delay = boxcar[:delay]
         packet = boxcar[:packet]
         raise "no packet" unless packet
-        if packet.is_a?(Scriptroute::IPv4) then
+        if packet.is_a?(Scriptroute::IP) then
           packet = packet.marshal
         end
         raise "packet is #{packet.class}, not a string" unless packet.is_a?(String)
@@ -300,7 +305,7 @@ end
                 io = ($4 == '>') ? 0 : 1
                 st = $5
                 packet_string = Base64.strict_decode64(st)
-                p = IPv4.creator(packet_string)
+                p = IP.creator(packet_string)
                 tv_s = nil if tv_s < 0 # didn't see it leave.
                 tp = TimedPacket.new(tv_s, rdtsc, p)
                 if io == 0 then

data/lib/scriptroute/ally.rb

@@ -111,7 +111,7 @@ class Ally
   # a helper function to handle comparing ipid's, as they are
   # unsigned short counters that can wrap. 
   # @return [Boolean]
-  def before
+  def before(seq1,seq2)
     Ally.before(seq1,seq2)
   end
 

data/lib/scriptroute/ipaddr4.rb

@@ -0,0 +1,58 @@
+require 'ipaddr'
+# require 'my-ipaddr'
+
+class IPAddr4 < IPAddr
+  # subclass that trusts its initializer and assumes IPv4
+  def in_addr(addr)
+    if addr =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
+      (($1.to_i << 24) + ($2.to_i << 16) + ($3.to_i << 8) + ($4.to_i))
+    else
+      nil
+    end
+  end
+  def initialize(addr)
+    @family = Socket::AF_INET
+    if( addr.kind_of?(String) ) then
+      prefix, len = addr.split('/')
+      @addr = in_addr(prefix)
+      if(len) then
+        mask_len!(len.to_i)
+      else
+        @mask_addr = IN4MASK 
+      end
+    else
+      @addr = addr
+      @mask_addr = IN4MASK 
+    end
+  end
+  # faster include method that only works for ipv4.
+  def include?(other)
+    if other.kind_of?(IPAddr)
+      other_addr = other.to_i
+    else # Not IPAddr - assume integer in same family as us
+      other_addr   = other.to_i
+    end
+    return ((@addr & @mask_addr) == (other_addr & @mask_addr))
+  end
+  def eql?(other)
+    if other.kind_of?(IPAddr4) && @family != other.family
+      return false
+    end
+    return (@addr == other.to_i)
+  end
+  def hash
+    @addr.to_i
+  end
+  def to_s
+    # about twice as fast as the map/join based to_s.
+    # appears slightly faster than mask then shift.
+    "%d.%d.%d.%d" % [ (@addr >> 24) & 0xff, (@addr >> 16) & 0xff, (@addr >> 8) & 0xff, (0xff&@addr) ]   
+  end
+  def ==(other)
+    if other.kind_of?(IPAddr4)
+      @addr == other.addr
+    else
+      @addr == other.to_i # dunno why.
+    end
+  end
+end

data/lib/scriptroute/packets.rb

@@ -2,10 +2,140 @@ module Scriptroute
 # a small library of routines for constructing packets
 # as strings to hand off to the interpreter.
   
-  class IPv4
-    IPPROTO_ICMP = 1
-    IPPROTO_TCP = 6
+  class IP
+    IPPROTO_TCP = 6   # apply to both 4 and 6.
     IPPROTO_UDP = 17
+    def to_bytes 
+      marshal
+    end
+    def IP.creator(str) 
+      ip_vhl = str.unpack("c")[0]
+      ip_v = ((ip_vhl & 0xf0) >> 4)
+      if(ip_v == 4) then
+        IPv4.creator(str)
+      elsif(ip_v == 6) then
+        IPv6.creator(str)
+      else
+        raise "unknown IP version #%d in %s" % [ ip_v, str.unpack("C*").map { |c| "%x" % c }.join(' ') ]
+      end
+    end
+  end
+
+  class IPv4 < IP
+    IPPROTO_ICMP = 1
+  end
+
+  class IPv6 < IP
+    IPPROTO_ICMP6 = 58
+    attr_accessor :ip6_src, :ip6_hlim, :ip6_flow
+    attr_reader :ip6_dst
+    @@creators = Hash.new
+    def IPv6.creator(str)
+      flow, plen, nxt, hlim, saddr, daddr = str.unpack("Nncca16a16")
+      if(@@creators[nxt]) then
+        pkt = (@@creators[nxt]).call(str[40..40+plen])
+        pkt.ipv6_unmarshal(str)
+        pkt
+      else
+        raise "unknown IPv6 next header #%d in %s" % [ nxt, str.unpack("H*") ]
+      end
+    end
+    def ipv6_unmarshal(str)
+      @ip6_flow, @ip6_plen, @ip6_nxt, @ip6_hlim, ip6_saddr, ip6_daddr = str.unpack("Nncca16a16")
+      @ip6_src, @ip6_dst = [ip6_saddr, ip6_daddr].map { |addr| IPAddr.new_ntoh(addr) }
+    end
+    def initialize(p) 
+      if(p.is_a?(Fixnum)) then
+        @ip6_src = @ip6_dst = @ip6flow = nil
+        @ip6_hlim = 64
+        @ip6_nxt = p
+        # actually, unlikely 7 or 13 are at the moment
+        # either, but let's start here.
+        $stderr.puts "unlikely v6 protocol header type #{p} is supported" unless [ 7, 13, 58 ].include?(p) 
+      else
+        raise "need a next header type for constructing a v6 packet"
+      end
+    end
+    # for simplicity.
+    def ip_ttl=(ttl)
+      @ip6_hlim = ttl
+    end
+    def ip6_dst=(name_or_address)
+      if name_or_address.is_a?(IPAddr) then
+        if name_or_address.ipv4? then
+          @ip6_dst = name_or_address.ipv4_mapped # try to use it.
+        else
+          @ip6_dst = name_or_address
+        end
+      elsif Resolv::IPv6::Regex =~ name_or_address then
+        @ip6_dst = IPAddr.new(name_or_address, Socket::AF_INET6)
+      else
+        r = Resolv::DNS.new.getresource(name_or_address, Resolv::DNS::Resource::IN::AAAA)
+        if r then
+          @ip6_dst = IPAddr.new(r.address.to_s, Socket::AF_INET6)
+        else
+          raise "failed to lookup #{name_or_address} into a v6 address"
+        end
+      end
+    end
+    def marshal
+      # probably should force src/dst internal
+      # representation to be IPAddr via accessor methods
+      # rather than reconvert here.
+      puts "unlikely you wanted zero hlim" unless @ip6_hlim and @ip6_hlim > 0
+      puts "unlikely you wanted no next protocol" unless @ip6_nxt and @ip6_nxt > 0
+      puts "unlikely you wanted nil payload len" unless ip_payload_len
+      v6packet = [ 6 << 4, 0, 0, ip_payload_len, @ip6_nxt, @ip6_hlim, 
+        IPAddr.new(@ip6_src, Socket::AF_INET6).hton, 
+        IPAddr.new(@ip6_dst, Socket::AF_INET6).hton ].pack("ccnncca16a16")
+    end
+    def to_s 
+      "%s -> %s hlim=%d" % [ (@ip6_src or "::0"), (@ip6_dst or "::0"), @ip6_hlim ]
+    end
+  end
+  class ICMP6 < IPv6 
+    attr_reader :icmp_type, :icmp_code, :icmp_cksum
+    attr_reader :ip_payload_len
+    # type
+    ICMP6_ECHO = 128
+    ICMP6_ECHOREPLY = 129
+    ICMP6_DST_UNREACH = 1
+    ICMP6_PACKET_TOO_BIG = 2
+    ICMP6_TIME_EXCEEDED = 3
+    ICMP6_PARAM_PROB = 4
+
+    @@icmp6_creators = Hash.new
+    @@creators[IPPROTO_ICMP6] = lambda { |hdr| 
+      icmp_type, icmp_code, icmp_cksum = hdr.unpack("CCn")
+      if(@@icmp6_creators[icmp_type]) then
+        pkt = @@icmp6_creators[icmp_type].call(hdr)
+      else
+        raise "unknown icmp6 type #%d" % icmp_type
+      end
+    }
+    def initialize(type_or_str) 
+      if(type_or_str.is_a?(Fixnum)) then
+        @icmp_type = type_or_str
+        @icmp_code = 0
+        @icmp_cksum = 0
+        super(IPPROTO_ICMP6) 
+      else
+        @icmp_type, @icmp_code, @icmp_cksum = type_or_str.unpack("CCn")
+      end
+    end
+    # @return [String] The packet in string form
+    def marshal
+      @icmp_type or raise "type is nil"
+      @icmp_code or raise "code is nil"
+      @icmp_cksum = 0
+      super + [ @icmp_type, @icmp_code, @icmp_cksum ].pack("CCn")
+    end
+    # @return [String]
+    def to_s
+      super + ": ICMP6: type %d code %d cksum %d" %[ @icmp_type, @icmp_code, @icmp_cksum ]
+    end
+    #instantiate echo instead.
+    private :marshal 
   end
 
   class ICMP < IPv4
@@ -227,14 +357,22 @@ module Scriptroute
         ip_id, ip_off,
         ip_ttl, ip_p, ip_sum,
         ip_src, ip_dst = str.unpack("ccn" + "nn" + "ccn" + "N" + "N");
-      ip_hl = ip_vhl & 0xf;
-      if(@@creators[ip_p]) then
-        pkt = (@@creators[ip_p]).call(str[(ip_hl * 4) .. ip_len])
-
-        pkt.ipv4_unmarshal(str)
-        pkt
+      ip_v = ((ip_vhl & 0xf0) >> 4)
+      if(ip_v == 4) then
+        ip_hl = ip_vhl & 0xf;
+        if(@@creators[ip_p]) then
+          pkt = (@@creators[ip_p]).call(str[(ip_hl * 4) .. ip_len])
+          pkt.ipv4_unmarshal(str)
+          pkt
+        else
+          raise "unknown IPv4 protocol #%d in %s" % [ ip_p, str.unpack("C*").map { |c| "%x" % c }.join(' ') ]
+        end
+      elsif(ip_v == 6) then
+        # probably should do this someplace above IPv4 creator.
+        puts "received v6 packet %s" % [ str.unpack("H*") ]
+        str
       else
-        raise "unknown protocol #%d in %s" % [ ip_p, str.unpack("C*").map { |c| "%x" % c }.join(' ') ]
+        raise "unknown IP version #%d in %s" % [ ip_v, str.unpack("C*").map { |c| "%x" % c }.join(' ') ]
       end
     end
 
@@ -398,24 +536,14 @@ module Scriptroute
     end
   end
 
-  class UDP < IPv4
+  module UDPgeneric
     # @return [Fixnum]
     attr_reader :uh_sport, :uh_dport, :uh_ulen, :uh_sum
     attr_writer :uh_dport, :uh_sum
 
-    @@creators[IPPROTO_UDP] = lambda { |hdr|
-      uh_sport, uh_dport, uh_ulen, uh_sum = hdr.unpack("nnnn")
-      if uh_sport==123 || uh_dport==123  then
-    	p = NTP.new(hdr[8..hdr.length])
-    	p.udp_unmarshal(hdr)
-      else 
-    	p = UDP.new(hdr)
-      end
-      p
-    }
-    
     # @return [Fixnum] the udp data plus header length, uh_ulen 
     def ip_payload_len 
+      raise "ip_payload_len was nil when asked" unless @uh_ulen
       @uh_ulen
     end
 
@@ -431,7 +559,7 @@ module Scriptroute
         @uh_sport = 32945
         @uh_dport = 33434
         @uh_sum = 0
-        super( IPPROTO_UDP )
+        super( Scriptroute::IP::IPPROTO_UDP )
       else
         @uh_sport, @uh_dport, @uh_ulen, @uh_sum = paylen_or_str.unpack("nnnn")
       end
@@ -445,12 +573,11 @@ module Scriptroute
       array_of_elements = [ @uh_sport, @uh_dport, @uh_ulen, @uh_sum ]
       raise "a UDP header field was unset" if array_of_elements.include?(nil)
       super + [ @uh_sport, @uh_dport, @uh_ulen, @uh_sum ].pack("nnnn")  + 
-        if ( self.class == UDP ) then
+        if ( self.class == UDP or self.class == UDP6 ) then
           "\0" * ( @uh_ulen - 8 )
         else
           "" # the subclass will take care of it
         end
-      
     end
 
     # Used for subclasses to set the UDP header fields.
@@ -468,6 +595,29 @@ module Scriptroute
 
   end
 
+  class UDP < IPv4
+    include UDPgeneric
+
+    @@creators[IPPROTO_UDP] = lambda { |hdr|
+      uh_sport, uh_dport, uh_ulen, uh_sum = hdr.unpack("nnnn")
+      if uh_sport==123 || uh_dport==123  then
+    	p = NTP.new(hdr[8..hdr.length])
+    	p.udp_unmarshal(hdr)
+      else 
+    	p = UDP.new(hdr)
+      end
+      p
+    }
+  end
+
+  class UDP6 < IPv6
+    include UDPgeneric
+
+    @@creators[IPPROTO_UDP] = lambda { |hdr|
+      UDP6.new(hdr)
+    }
+  end
+
   class TCP < IPv4
     attr_reader :th_sport, :th_dport, :th_sum, :th_seq, :th_ack,
       :th_win, :th_flags, :th_win, :th_sum, :th_urp
@@ -584,6 +734,38 @@ module Scriptroute
       super + ": ECHO: id %d seq %d len %d" % [ @icmp_id, @icmp_seq, @ip_payload_len ] 
     end
   end
+  # Class for ping packets (echo and echo reply)  much duplicated with ICMPecho
+  class ICMP6echo < ICMP6
+    # @return [Fixnum]
+    attr_reader :icmp_id, :icmp_seq
+    attr_writer :icmp_seq
+    @@icmp6_creators[ICMP6_ECHO] = 
+      @@icmp6_creators[ICMP6_ECHOREPLY] = lambda { |hdr|
+      ICMP6echo.new(hdr)
+    }
+    def initialize(paylen_or_str = 0)
+      if(paylen_or_str.is_a?(Fixnum)) then
+        if( paylen_or_str < 0) then raise "payload length must be >= 0" end
+        @ip_payload_len = paylen_or_str + 4 + 4
+        @icmp_id = 666
+        @icmp_seq = 1
+        super(ICMP6_ECHO)
+      else
+        # x is skip forward a character.
+        @ip_payload_len = paylen_or_str.length - 8
+        @icmp_id, @icmp_seq = paylen_or_str.unpack("xxxxnn")
+        super(paylen_or_str)
+      end
+    end
+    # @return [String] The packet in string form
+    def marshal
+      super + [ @icmp_id, @icmp_seq ].pack("nn") + "\0" * ( @ip_payload_len - 4 - 4 )
+    end
+    # @return [String]
+    def to_s
+      super + ": ECHO6: id %d seq %d len %d" % [ @icmp_id, @icmp_seq, @ip_payload_len ] 
+    end
+  end
 
   class ICMPtstamp < ICMP
     # @return [Fixnum]
@@ -666,6 +848,33 @@ module Scriptroute
     end
   end
 
+  class ICMP6unreach< ICMP6
+    # @return [IPv4] The packet header embedded within the ICMP unreachable error message.
+    attr_reader :contents
+    @@icmp6_creators[ICMP6_DST_UNREACH] = @@icmp6_creators[ICMP6_TIME_EXCEEDED] = 
+      lambda { |hdr|
+      ICMP6unreach.new(hdr)
+    }
+    # Can create an unreachable only from string contents, never from filling in fields given a size.
+    # param string [String] the contents of the received packet.
+    def initialize(string) 
+      # first four are code, type, checksum.
+      # second four are undefined
+      @contents = IPv6.creator(string[8..-1])
+      super(string)
+    end
+    # Cannot marshal an unreachable packet for transmission; raises an exception.
+    # @return [void]
+    def marshal
+      raise "not supported"
+    end
+    # @return [String] formats the packet and the embedded packet as a string.
+    def to_s
+      super + " ( " + @contents.to_s + " )"
+    end
+  end
+
+
   class NTP < UDP
     # @return [Fixnum]
     attr_accessor :leap_indicator, :version_number, :mode, :stratum
@@ -790,7 +999,15 @@ module Scriptroute
     # this method implemented in pure ruby regardless of interpreter state.
     # @return [String]
     def to_s
-      "%s @%5.6f -> %s +%5.6f" % [@probe, @probe.time, (@response or "<none>"), (rtt or "-1")]
+      if @probe then
+        if(@probe.time)  then
+          "%s @%5.6f -> %s +%5.6f" % [@probe.packet, @probe.time, (@response ? @response.packet : "<none>"), (rtt or "-1")]
+        else
+          "%s (not seen leaving) -> %s" % [@probe.packet, (@response or "<none>")]
+        end
+      else
+        "bizarre nothingness.  no probe."
+      end
     end
   end
 end

data/test/test_commando.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby -w  
+
+require 'test/unit'
+require 'scriptroute/commando'
+
+$SAFE = 2
+
+
+class ScriptrouteCommandoTest < Test::Unit::TestCase
+
+def test_one
+
+c = Commando.new([ "--start-speed", 3 ],  
+                 [ CommandoVar.new( "--start-speed",  "Kbps rate to start" ,  "$StartSpeedKbps", 20),
+                   CommandoVar.new( "--train-length", "Filler packets in train" , "$TrainLength", 20),
+                   CommandoVar.new( "--hop", "Specific hop to study (ttl=hop and hop-1), 0 for e2e", "$Hop", 0 ),
+                   CommandoVar.new( [ "--verbose", "-v" ], "print gobs of messages" , "$VERBOSE", false) ],
+                 "destination-host")
+
+raise "failed to set dollar startspeedkbps" unless($StartSpeedKbps == 3)
+raise "failed to default dollar TrainLength" unless($TrainLength == 20)
+raise "failed to construct Commando c" unless c
+
+end
+end
+

data/test/test_scriptroute.rb

@@ -2,10 +2,11 @@
 require 'test/unit'
 require 'scriptroute'
 require 'scriptroute/nameify'
+require 'ipaddr'
 
 class ScriptrouteTest < Test::Unit::TestCase
   def test_abba # be first
-    unless Scriptroute::is_daemon_running? 
+    unless Scriptroute.is_daemon_running? 
       exit
     end
     
@@ -21,8 +22,8 @@ class ScriptrouteTest < Test::Unit::TestCase
   end
   def test_abc_get_config
     raise "no config returned" unless Scriptroute::DaemonConfig() 
-    raise "config not a hash" unless Scriptroute::DaemonConfig.is_a?(Hash)
-    raise "config lacks an expected key" unless Scriptroute::DaemonConfig['Filter.listenfilter']
+    raise "config not a hash" unless Scriptroute::DaemonConfig().is_a?(Hash)
+    raise "config lacks an expected key" unless Scriptroute::DaemonConfig().has_key?('Filter.listen_filter')
   end
   def test_ally
     verdict = Scriptroute::Ally.new('128.8.126.92', '128.8.126.104')
@@ -34,6 +35,7 @@ class ScriptrouteTest < Test::Unit::TestCase
   end
 
   def test_forbidden
+    $stderr.puts "the next line should be 'ERROR: packet administratively filtered'..."
     i = Scriptroute::ICMPecho.new(0)
     # an address ending with .255 seems more likely to be broadcast. 
     i.ip_dst = 0x805f02ff 
@@ -87,31 +89,35 @@ class ScriptrouteTest < Test::Unit::TestCase
     puts m.length.to_s + " " + m.gsub(/./) { |b| "%x " % b[0].to_i }
     puts m.length.to_s + " " + m.bytes.map { |b| "%x " % b }.join if has_bytes ## 1.9
     # puts "decode: " + Scriptroute::stringpacket(m)
-    puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    q = Scriptroute::pkt_from_string(m)
     
     m = Scriptroute::ICMPtstamp.new.marshal
     puts m.length.to_s + " " + m.gsub(/./) { |b| "%x " % b[0].to_i }
     puts m.length.to_s + " " + m.bytes.map { |b| "%x " % b }.join if has_bytes ## 1.9
     #  puts "decode: " + Scriptroute::stringpacket(m)
-    puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    q = Scriptroute::pkt_from_string(m)
+    # garbage. puts "encode: " + Scriptroute::pkt_from_string(m).to_s
     
     m = Scriptroute::TCP.new.marshal
     puts m.length.to_s + " " + m.gsub(/./) { |b| "%x " % b[0].to_i }
     puts m.length.to_s + " " + m.bytes.map { |b| "%x " % b }.join if has_bytes ## 1.9
     #  puts "decode: " + Scriptroute::stringpacket(m)
-    puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    # garbage. puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    q = Scriptroute::pkt_from_string(m)
     
     m = Scriptroute::UDP.new.marshal
     puts m.length.to_s + " " + m.gsub(/./) { |b| "%x " % b[0].to_i }
     puts m.length.to_s + " " + m.bytes.map { |b| "%x " % b }.join if has_bytes ## 1.9
     #  puts "decode: " + Scriptroute::stringpacket(m)
-    puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    # garbage. puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    q = Scriptroute::pkt_from_string(m)
 
     m = Scriptroute::UDP.new(8).marshal
     puts m.length.to_s + " " + m.gsub(/./) { |b| "%x " % b[0].to_i }
     puts m.length.to_s + " " + m.bytes.map { |b| "%x " % b }.join if has_bytes ## 1.9
-    puts "decode: " + Scriptroute::IPv4.creator(m).to_s
-    puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    # garbage. puts "decode: " + Scriptroute::IPv4.creator(m).to_s
+    q = Scriptroute::pkt_from_string(m)
+    # garbage. puts "encode: " + Scriptroute::pkt_from_string(m).to_s
 
     t = Scriptroute::TCP.new
     opt = Scriptroute::Timestamp_option.new(1)
@@ -125,7 +131,8 @@ class ScriptrouteTest < Test::Unit::TestCase
     puts m.length.to_s + " " + m.gsub(/./) { |b| "%x " % b[0].to_i }
     puts m.length.to_s + " " + m.bytes.map { |b| "%x " % b }.join if has_bytes ## 1.9
     # puts "decode: " + Scriptroute::stringpacket(m)
-    puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    # garbage. puts "encode: " + Scriptroute::pkt_from_string(m).to_s
+    q = Scriptroute::pkt_from_string(m)
     
     #1.times { |i|
     #  m=t.marshal
@@ -148,8 +155,157 @@ class ScriptrouteTest < Test::Unit::TestCase
   def test_nameify
     puts Scriptroute.nameify("12.123.203.170")
   end
+
+  # pretty much checks whether the packet gets filled in.
+  # manually constructed with pack, rather than via
+  # scriptroute/packets
+  def test_v6
+    daddr = IPAddr.new "ff02::fb" # "fd00::230:67ff:febb:7d18"
+    # daddr = IPAddr.new "fe80::60c:ceff:fee4:a62" # wlp
+    daddr = IPAddr.new "fd00::60c:ceff:fee4:a62" # wlp
+    saddr = IPAddr.new "::0"
+#     saddr = IPAddr.new "fd00::230:67ff:febb:7d18"   # zar
+    # saddr = IPAddr.new "fe80::230:67ff:febb:7d18" # fd00::230:67ff:febb:7d18"
+    payload_len = 40 # 
+
+    # hard coded the cksum.
+    icmp = [ Scriptroute::ICMP6::ICMP6_ECHO, 0, 0xc12b, 0, 1 ].pack("ccnnn") + ( "\0" * 56 )
+    v6packet = [ 6 << 4, 0, 0, icmp.length, Scriptroute::IPv6::IPPROTO_ICMP6, 
+      64, saddr.hton, daddr.hton ].pack("ccnncca16a16") + icmp
+
+    raise "too short (#{v6packet.length})" unless v6packet.length >= 40 
+    puts v6packet.length
+    puts v6packet.unpack("H*")
+      
+    p = Scriptroute::send_train([ Struct::DelayedPacket.new(0, v6packet) ])
+    puts p
+    
+    p[0].probe or raise "couldn't manage sending a v6 probe"
+    p[0].probe.packet or raise "couldn't manage sending a v6 probe packet"
+    p[0].probe.packet.ip6_src or raise "v6 probe packet lacks a source"
+    p[0].probe.packet.ip6_src != IPAddr.new("::0") or raise "v6 probe packet source seems to be unset."
+    p[0].probe.packet.icmp_cksum != 0 or raise "v6 probe packet 99.99% likely unset checksum."
+  end
+
+  # tries to build an medium level of easiness ipv6 ping.
+  def test_v6_lookup
+    daddr = nil
+    Resolv::DNS.open do |dns|
+      ress = dns.getresources "www.google.com", Resolv::DNS::Resource::IN::AAAA
+      ress.each { |r| daddr = r.address.to_s }
+    end
+    raise "no address" unless daddr
+    p = Scriptroute::ICMP6echo.new(20)
+    p.ip6_dst = daddr
+    begin 
+      r = Scriptroute::send_train([ Struct::DelayedPacket.new(0, p) ])
+      puts r
+    rescue Scriptroute::ScriptrouteError => e
+      if e.to_s =~ /unreachable/ then
+        puts "Expected ERROR when host supports v6 but lacks routes to the outside world."
+      else
+        puts "rescued unexpected error: " + e.to_s
+      end
+    end  
+  end
+  def test_v6_localhost
+    p = Scriptroute::ICMP6echo.new(20)
+    p.ip6_dst = IPAddr.new("::1")
+    p.ip6_dst = "::1"
+    r = Scriptroute::send_train([ Struct::DelayedPacket.new(0, p) ])
+  rescue Scriptroute::ScriptrouteError => e
+    puts "Expected ERROR because localhost is filtered."
+  end
+  def test_v6_implicit_lookup
+    p = Scriptroute::UDP6.new(20)
+    p.ip6_dst = "www.google.com"
+    puts p.ip6_dst
+  end
+
+  # I don't know whether I want to be able to send to all-routesr 
+  def test_v6_mcast
+    failure = false
+    begin
+      p = Scriptroute::ICMP6echo.new(20)
+      p.ip6_dst = IPAddr.new("ff02::1")  # all nodes.
+      r = Scriptroute::send_train([ Struct::DelayedPacket.new(0, p) ])
+      failure = true if r[0].probe 
+    rescue Scriptroute::ScriptrouteError => e
+      puts "Expected ERROR because multicast is filtered or source cannot be set."
+    end
+    begin
+      p = Scriptroute::ICMP6echo.new(20)
+      p.ip6_dst = IPAddr.new("ff02::2")  # all routers.
+      r = Scriptroute::send_train([ Struct::DelayedPacket.new(0, p) ])
+      failure = true if r[0].probe 
+    rescue Scriptroute::ScriptrouteError => e
+      puts "Expected ERROR because multicast is filtered or source cannot be set."
+    end
+    failure
+  end
+
+  def test_v6_onehop
+    daddr = nil
+    Resolv::DNS.open do |dns|
+      ress = dns.getresources "www.google.com", Resolv::DNS::Resource::IN::AAAA
+      ress.each { |r| daddr = r.address.to_s }
+    end
+    raise "no address" unless daddr
+    p = Scriptroute::ICMP6echo.new(20)
+    p.ip6_dst = daddr
+    p.ip6_hlim = 1
+    begin 
+      r = Scriptroute::send_train([ Struct::DelayedPacket.new(0, p) ])
+      if r[0].response then
+        puts "success from first hop: %s:" % r[0].response.packet.ip6_src
+        puts r[0].response.packet
+        true
+      else
+        puts "failed: expected to see a response to the one-hop ttl limited probe"
+        false
+      end
+    rescue Scriptroute::ScriptrouteError => e
+      if e.to_s =~ /unreachable/ then
+        puts "Expected ERROR when host supports v6 but lacks routes to the outside world."
+      else
+        puts "rescued unexpected error: " + e.to_s
+      end
+    end  
+  end
+
+  def test_v6_udp_tr
+    daddr = nil
+    Resolv::DNS.open do |dns|
+      ress = dns.getresources "www.google.com", Resolv::DNS::Resource::IN::AAAA
+      ress.each { |r| daddr = r.address.to_s }
+    end
+    raise "no address" unless daddr
+    p = Scriptroute::UDP6.new(20)
+    p.ip6_dst = daddr
+    puts p.to_s
+    begin 
+      [4,5,6,20].each { |ttl|
+        p.ip6_hlim = ttl
+        r = Scriptroute::send_train([ Struct::DelayedPacket.new(0, p) ])
+        if r[0].response then
+          puts "success from hop %d: %s:" % [ ttl, r[0].response.packet.ip6_src ]
+          puts r[0].response.packet
+          true
+        else
+          puts "failed: expected to see a response to the one-hop ttl limited probe"
+          false
+        end
+      }
+    rescue Scriptroute::ScriptrouteError => e
+      if e.to_s =~ /unreachable/ then
+        puts "Expected ERROR when host supports v6 but lacks routes to the outside world."
+      else
+        puts "rescued unexpected error: " + e.to_s
+      end
+    end
+  end  
 end
 
 # Local Variables:
-# compile-command: "rake test"
+# compile-command: "ruby -I ../lib ./test_scriptroute.rb"
 # End:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scriptroute
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - Neil Spring
@@ -27,11 +27,13 @@ files:
 - bin/sr-ping-T
 - bin/sr-rockettrace
 - bin/sr-traceroute
+- bin/sr-traceroute6
 - bin/tulip
 - lib/scriptroute.rb
 - lib/scriptroute/ally.rb
 - lib/scriptroute/commando.rb
 - lib/scriptroute/fixclock
+- lib/scriptroute/ipaddr4.rb
 - lib/scriptroute/liveness.rb
 - lib/scriptroute/nameify.rb
 - lib/scriptroute/packets.rb
@@ -41,6 +43,7 @@ files:
 - lib/scriptroute/tulip/queuing.rb
 - lib/scriptroute/tulip/reordering.rb
 - test/test_bins.rb
+- test/test_commando.rb
 - test/test_scriptroute.rb
 homepage: http://www.scriptroute.org/
 licenses: