ospfv2 0.0.1 → 0.0.2

data/lib/ie/ospf_version.rb

@@ -30,14 +30,6 @@ class OspfVersion
       @ospf_version = 0
     end
   end
-  def to_s
-    case @ospf_version
-    when 2  ; '2'
-    when 3  ; '3'
-    else
-      'unknown'
-    end
-  end
   def to_hash
     to_i
   end

data/lib/ie/router_link.rb

@@ -30,10 +30,13 @@ module OSPFv2
   
   class RouterLink
     include Common
+    include CommonMetric
     
-    LinkId = Class.new(Id)
-    LinkData = Class.new(Id)
-    
+    unless const_defined?(:LinkId)
+      LinkId = Class.new(Id)
+      LinkData = Class.new(Id)
+    end
+
     attr_reader :link_id, :link_data, :router_link_type, :metric, :mt_metrics
     
     attr_writer_delegate :link_id, :link_data, :router_link_type
@@ -79,7 +82,6 @@ module OSPFv2
       rlink.join
     end
     
-    # TODO: if self.class is not RouterLink do not display RouterLinkType info....
     def to_s(ident=2)
       encode unless @router_link_type
       self.class.to_s.split('::').last + ":" +
@@ -118,23 +120,12 @@ module OSPFv2
           super arg
         end
         define_method(:to_hash) do
-          super.merge :router_link_type => x
+          super().merge :router_link_type => x
         end
       end
       self.const_set(x.to_klass, klassname)
     }
     
-    # FIXME: same as summary.rb ... mixin candidate
-    def mt_metrics=(val)
-      [val].flatten.each { |x| self << x }
-    end
-    
-    def <<(metric)
-      @mt_metrics ||=[]
-      @mt_metrics << MtMetric.new(metric)
-      self
-    end
-    
     def parse(s)
       @mt_metrics ||=[]
       link_id, link_data, router_link_type, ntos, metric, mt_metrics = s.unpack('NNCCna*')
@@ -148,20 +139,8 @@ module OSPFv2
     end
     
   end
-# 
-# require 'pp'  
-#   h = {:router_link_type=>1, :metric=>1,:mt_metrics=>[{:id=>20, :metric=>33}, {:id=>255, :metric=>34}], :link_data=>"10.254.233.233",:link_id=>"2.2.2.2"}
-# 
-# pp RouterLink.new(h)
-# 
-# puts RouterLink.new(h)
-# puts RouterLink.new(h).to_shex
-
-
-
   
 end
 
 
-
 load "../../../test/ospfv2/ie/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/lib/ie/sequence_number.rb

@@ -82,12 +82,17 @@ module OSPFv2
       self
     end
     
+    def incr(num=1)
+      seqn = (@seqn.unpack('i')[0]+num)
+      @seqn = [seqn].pack('I')
+      self
+    end
+    
     def -(num)
       self.+(-num)
     end
     
     def encode
-      #FIXME: unit-test and check if 'i' or 'I'
       [to_i].pack('N')
     end
     

data/lib/infra/ospf_common.rb

@@ -100,16 +100,7 @@ class Object
       ""
     end
   end
-  def method_missing(method, *args, &block)
-    # puts "COMMON method_missing: #{method}"
   
-    if method.to_s =~ /^to_s(\d+)/
-      to_s($1.to_i)
-    else
-      # p caller
-      super
-    end
-  end
   def define_to_s
     if defined?($style)
       self.class.class_eval { eval("alias :to_s :to_s_#{$style}") }
@@ -117,7 +108,7 @@ class Object
       self.class.class_eval { alias :to_s :to_s_default }
     else
       puts "You're screwed!"
-    end      
+    end
   end
 end
 
@@ -175,7 +166,7 @@ class IPAddr
     [to_s,mlen].join('/')
   end
     
-  def IPAddr.to_ary(prefix)
+  def IPAddr.to_arr(prefix)
     source_address,mlen = prefix.split('/')
     ip = IPAddr.new(prefix)
     network = ip.to_s
@@ -200,8 +191,6 @@ class IPAddr
     Proc.new { |n| n*(2**(max_len - mlen)) }
   end
   
-
-
 end
 
 

data/lib/infra/ospf_constants.rb

@@ -23,14 +23,14 @@
 module OSPFv2
 
   module Constant
-     V2=2
-     V3=3
-     HELLO = 1
-     DATABASE_DESCRIPTION = 2
-     LINK_STATE_REQUEST = 3
-     LINK_STATE_UPDATE = 4
-     LINK_STATE_ACKNOWLEDGEMENT = 5
-   end
+    V2=2
+    V3=3
+    HELLO = 1
+    DATABASE_DESCRIPTION = 2
+    LINK_STATE_REQUEST = 3
+    LINK_STATE_UPDATE = 4
+    LINK_STATE_ACKNOWLEDGEMENT = 5
+  end
 
   VERSION=2
   LSRefreshTime = 30*60 

data/lib/infra/ospf_io.rb

@@ -120,7 +120,7 @@ module OSPFv2
         begin
           while @continue 
             el = deq
-            @sock.send *el
+            @sock.send(*el)
           end
         rescue => e
           p e

data/lib/infra/ospf_socket.rb

@@ -34,8 +34,7 @@ module OSPFv2
     def initialize(src, options={})
       @src = src
       @sock = Socket.open(Socket::PF_INET, Socket::SOCK_RAW, IPPROTO_OSPF)
-      add_membership OSPFv2::AllSPFRouters
-      add_membership OSPFv2::AllDRouters
+      @sock.setsockopt(::Socket::IPPROTO_IP, ::Socket::IP_MULTICAST_IF,  IPAddr.new(src).hton)
     rescue Errno::EPERM
       $stderr.puts "#{e}: You are not root, cannot run: #{$0}!"
       exit(1)
@@ -50,25 +49,17 @@ module OSPFv2
     #TODO: use all_spf_routers, all_dr_routers, ...
     #     8.1      Sending protocol packets .............................. 58
     
-    def send(packet, location={:to=> :all_spf_routers})
-      case location
-      when :all_spf_routers ; send_all_spf_routers(packet)
-      when :all_dr_routers  ; send_all_dr_routers(packet)
-      else
-        send_to(packet, location[:to])
-      end
-    end
     
     def send_all_spf_routers
-      _send_ (packet.respond_to?(:encode) ? packet.encode : packet), 0, @sock_addr_all_spf_routers
+      _send_((packet.respond_to?(:encode) ? packet.encode : packet), 0, @sock_addr_all_spf_routers)
     end
     
     def send_all_dr_routers
-      _send_ (packet.respond_to?(:encode) ? packet.encode : packet), 0, @send_all_dr_routers
+      _send_((packet.respond_to?(:encode) ? packet.encode : packet), 0, @send_all_dr_routers)
     end
     
     def send_to(packet, dest)
-      _send_ (packet.respond_to?(:encode) ? packet.encode : packet), 0, Socket.pack_sockaddr_in(0, dest)
+      _send_((packet.respond_to?(:encode) ? packet.encode : packet), 0, Socket.pack_sockaddr_in(0, dest))
     end
     
     def send(packet, dest)
@@ -84,7 +75,6 @@ module OSPFv2
     
     def add_membership(group)
       @sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, (IPAddr.new(group).hton + IPAddr.new(@src).hton))
-      puts "*** ADDED #{group} membership to Send Socket ***"
     rescue Errno::EADDRNOTAVAIL
     end
 
@@ -100,8 +90,8 @@ module OSPFv2
     def initialize(src, options={})
       @src=src
       @sock = Socket.open(Socket::PF_INET, Socket::SOCK_RAW,89)
-      add_membership OSPFv2::AllSPFRouters
-      add_membership OSPFv2::AllDRouters
+      add_membership OSPFv2::AllSPFRouters, src
+      add_membership OSPFv2::AllDRouters, src
     end
     def recv(size=8192)
       begin
@@ -116,10 +106,12 @@ module OSPFv2
       begin ; @sock.close ; rescue ; end
       @sock=nil
     end
-    def add_membership(group)
-      @sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, (IPAddr.new(group).hton + IPAddr.new(@src).hton))
-      puts "*** ADDED #{group} membership to Recv Socket ***"
-    rescue Errno::EADDRNOTAVAIL
+    def add_membership(group,src)
+      optval = IPAddr.new(group).hton + IPAddr.new(src).hton
+      @sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, optval)
+    rescue Errno::EADDRNOTAVAIL => e
+      p e
+      raise
     end
   end
 

data/lib/infra/parse_options.rb

@@ -56,7 +56,7 @@ class OptParse
 
     to_ip = lambda { |id| [id].pack('N').unpack('C*').join('.') }
     to_id = lambda { |x| OSPFv2::Id.to_i(x) }
-    dead_int = lambda { @dead_int || (options.hello_int * 4)}
+    dead_int = lambda { options.dead_int || (options.hello_int * 4) }
 
     option_help = "blabla ...."
     hlp_address =    "IP Address of the OSPF Interface."
@@ -104,7 +104,7 @@ class OptParse
         options.hello_int = int.to_i
       }
       opts.on("--dead-interval [INT]", hlp_dead_int) { |int| 
-        @dead_int = int.to_i
+        options.dead_int = int.to_i
       }
       opts.on("-g", "--grid [colxrow]", hlp_grid) { |grid| 
         options.grid = grid.split('x').collect { |x| x.to_i }
@@ -124,7 +124,7 @@ class OptParse
     end
 
     optparse.parse!(args)
-    options.dead_int = @dead_int || (options.hello_int * 4)
+    options.dead_int ||= (options.hello_int * 4)
 
     options
 

data/lib/infra/timer.rb

@@ -41,6 +41,7 @@ class Timer
     @interval = interval
     @code = block if block
     add_observer observer if observer
+    @_timer_thread_ = nil
   end
 
   def start _interval=@interval, &block
@@ -69,7 +70,7 @@ class Timer
 
   def reset &block
     cancel
-    start &block
+    start(&block)
   end
 
   private

data/lib/ls_db/advertised_routers.rb

@@ -26,11 +26,10 @@ require 'ie/id'
 module OSPFv2::LSDB
   class AdvertisedRouters
     AdvertisedRouter = Class.new(OSPFv2::Id)
-    attr_reader :routers
     def initialize
       @set = Set.new
     end
-    def +(id)
+    def <<(id)
       @set << router_id(id)
     end
     def routers
@@ -40,6 +39,9 @@ module OSPFv2::LSDB
     def has?(id)
       routers.include?(router_id(id))
     end
+    def to_s
+      @set.collect { |r| IPAddr.new_ntoh([r].pack('N')).to_s  }
+    end
     def -(id)
       @set.delete router_id(id)
     end
@@ -50,29 +52,29 @@ module OSPFv2::LSDB
   end
 end
 
-if __FILE__ == $0
-
-  require "test/unit"
-
-  # require "ls_db/advertised_routers"
-
-  class TestLsDbAdvertisedRouters < Test::Unit::TestCase
-    include OSPFv2::LSDB
-    def tests
-      assert AdvertisedRouters.new
-      routers = AdvertisedRouters.new
-      routers + 1
-      routers + '0.0.0.1'
-      routers + 2
-      routers + OSPFv2::Id.new(3)
-      assert_equal [1,2,3], routers.routers
-      routers -1 
-      assert_equal [2,3], routers.routers
-      routers -3
-      assert_equal [2], routers.routers
-      routers - '0.0.0.2'
-      assert_equal [], routers.routers
-    end
-  end
-
-end
+# if __FILE__ == $0
+# 
+#   require "test/unit"
+# 
+#   # require "ls_db/advertised_routers"
+# 
+#   class TestLsDbAdvertisedRouters < Test::Unit::TestCase
+#     include OSPFv2::LSDB
+#     def tests
+#       assert AdvertisedRouters.new
+#       routers = AdvertisedRouters.new
+#       routers + 1
+#       routers + '0.0.0.1'
+#       routers + 2
+#       routers + OSPFv2::Id.new(3)
+#       assert_equal [1,2,3], routers.routers
+#       routers -1 
+#       assert_equal [2,3], routers.routers
+#       routers -3
+#       assert_equal [2], routers.routers
+#       routers - '0.0.0.2'
+#       assert_equal [], routers.routers
+#     end
+#   end
+# 
+# end

data/lib/ls_db/link_state_database.rb

@@ -77,8 +77,7 @@ require 'ls_db/advertised_routers'
 require 'infra/to_s'
 
 module OSPFv2
-
-  module LSDB
+module LSDB
 
   class LinkStateDatabase
     include OSPFv2
@@ -95,7 +94,7 @@ module OSPFv2
     
     def initialize(arg={})
       @ls_db = Hash.new
-      @area_id = nil
+      @area_id = AreaId.new
       @advertised_routers= AdvertisedRouters.new
       @ls_refresh_interval=180
       @offset=0
@@ -210,12 +209,7 @@ module OSPFv2
         raise ArgumentError, "*** Invalid argument, #{args.inspect}"
       end
     end
-    
-    
-    def refresh
-      all.find_all {|l| l.refresh(ls_refresh_time) }
-    end 
-    
+
     def reset
       each {|lsa| lsa.ack }
       @offset=0
@@ -261,10 +255,6 @@ module OSPFv2
      all.find_all { |l| ! l.ack? }
     end
     
-    def method_missing(method, *args, &block)
-      super
-    end
-    
     def refresh
       all.find_all {|l| l.refresh(advertised_routers, ls_refresh_time) }
     end 
@@ -277,11 +267,16 @@ module OSPFv2
     def recv_link_state_update(link_state_update)
       link_state_update.each do |lsa|
         if advertised_routers.has?(lsa.advertising_router)
+          puts "RECEIVING FROM *OUR* #{lsa.advertising_router}"
           if @ls_db.key? lsa.key
+            puts "AND WE HAVE KEY #{lsa.key.inspect} ALREADY ...."
             @ls_db[lsa.key].force_refresh(lsa.sequence_number)
           else
+            puts "AND WE DO NOT HAVE KEY #{lsa.key.inspect}...."
             @ls_db.store(lsa.key,lsa)
+            puts "STORE KEY #{lsa.key.inspect}...."
             lsa.maxage
+            puts "MAXAGE IT  #{lsa.key.inspect}...."
           end
         else
           if lsa.maxaged?
@@ -331,46 +326,9 @@ module OSPFv2
     
   end
 
-   #   
-   # @ls_db = []
-   # @ls_db <<  {
-   #   :sequence_number=>2147483650,
-   #   :advertising_router=>"1.2.0.0",
-   #   :ls_id=>"0.0.4.5",
-   #   :nwveb=>1, 
-   #   :ls_type=>:router_lsa,
-   #   :options=> 0x21,
-   #   :ls_age=>10,
-   #   :links=>[
-   #     {
-   #       :link_id=>"1.1.1.1", 
-   #       :link_data=>"255.255.255.255", 
-   #       :router_link_type=>:point_to_point,
-   #       :metric=>11, 
-   #       :mt_metrics=>[ {:id=>1, :metric=>11}, {:id=>2, :metric=>22} ]
-   #     },
-   #     {
-   #       :link_id=>"1.1.1.2", 
-   #       :link_data=>"255.255.255.255", 
-   #       :router_link_type=>:point_to_point,
-   #       :metric=>12, 
-   #       :mt_metrics=>[]
-   #     }
-   #   ],
-   #   }
-   #     
-   #   
-   #   ls_db = LinkStateDatabase.new :area_id=> 1, :ls_db => @ls_db
-   #   puts ""
-   #   puts ls_db.to_s_junos
-   #      
-    
-    
-
 end
 end
 
 require 'ls_db/link_state_database_build'
 
 load "../../../test/ospfv2/ls_db/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
-