ospfv2 0.0.2 → 0.0.3

data/lib/ie/sequence_number.rb

@@ -20,13 +20,15 @@
 # along with OSPFv2.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'infra/ospf_constants'
+require_relative 'ie'
+require_relative '../infra/ospf_constants'
 
 module OSPFv2
 
   class SequenceNumber
     include OSPFv2
     include Comparable
+    include IE
     
     def SequenceNumber.initial
       [N + 1].pack('I').unpack('i')[0]
@@ -76,6 +78,10 @@ module OSPFv2
       "0x"+ sprintf("%08.8x", to_I)
     end
     
+    def to_s_ios
+      "LS Seq Number: " + sprintf("%08.8x", to_I)
+    end
+    
     def +(num)
       seqn = (@seqn.unpack('i')[0]+num)
       @seqn = [seqn].pack('I')
@@ -104,8 +110,6 @@ module OSPFv2
 
 end
 
-load "../../../test/ospfv2/ie/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
-
 __END__
 
 

data/lib/infra/ospf_common.rb

@@ -80,7 +80,6 @@ class Symbol
   end
 end
 
-
 class Object
   def to_shex(*args)
     self.respond_to?(:encode) ? self.encode(*args).unpack('H*')[0] : ""
@@ -100,16 +99,6 @@ class Object
       ""
     end
   end
-  
-  def define_to_s
-    if defined?($style)
-      self.class.class_eval { eval("alias :to_s :to_s_#{$style}") }
-    elsif respond_to?(:to_s_default)
-      self.class.class_eval { alias :to_s :to_s_default }
-    else
-      puts "You're screwed!"
-    end
-  end
 end
 
 class Time
@@ -253,7 +242,7 @@ module OSPFv2
           # p ivar
           h.store(key,ivar.to_hash)
         elsif ivar.is_a?(Array)
-          h.store(key, ivar.collect { |x| x.to_hash })
+          h.store(key, ivar.collect { |x| x.respond_to?(:to_hash) ? x.to_hash : x })
         else
           # p "#{key} don't respond to hast"
           # p ivar

data/lib/infra/ospf_io.rb

@@ -5,12 +5,12 @@
 #
 #
 # This file is part of OSPFv2.
-# 
+#
 # OSPFv2 is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # OSPFv2 is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -24,6 +24,9 @@
 require 'observer'
 require 'thread'
 
+Thread.abort_on_exception = true
+
+
 module OSPFv2
 
   class Input
@@ -40,7 +43,7 @@ module OSPFv2
     end
 
     attr_reader :thread
-    
+
     def our_address
       @neighbor.address
     end
@@ -52,13 +55,15 @@ module OSPFv2
     end
 
     def start
+
       @thread = Thread.new(@sock) do |s|
         Thread.current['name'] = self.class.to_s
         begin
           while @continue
             from, port, data = s.recv
             hdr = header(data)
-            if hdr[:ip_proto] == 89 and data[20] == 2
+
+            if hdr[:ip_proto] == 89 and (data[20] == 2 or data[20] == "\x02")
               if from != our_address
                 changed and notify_observers(:ev_recv, data, from, port) # * @sock.recv ....
               end
@@ -71,11 +76,11 @@ module OSPFv2
     end
 
     private
-    
+
 
     def long2ip(ip)
       return ip if ip.is_a?(String)
-      [ip].pack('N').unpack('CCCC').collect {|c| c}.join('.') 
+      [ip].pack('N').unpack('CCCC').collect {|c| c}.join('.')
     end
     def header(_h)
       h = _h.unpack('CCnnnCCnNN')
@@ -93,7 +98,7 @@ module OSPFv2
         :ip_dst  => long2ip(h[9]),
       }
     end
-    
+
   end
 
   class OutputQ < Queue
@@ -118,9 +123,10 @@ module OSPFv2
       @thread = Thread.new(@sock) do |s|
         Thread.current['name'] = self.class.to_s
         begin
-          while @continue 
+          while @continue
             el = deq
             @sock.send(*el)
+            Thread.pass
           end
         rescue => e
           p e

data/lib/infra/ospf_socket.rb

@@ -5,12 +5,12 @@
 #
 #
 # This file is part of OSPFv2.
-# 
+#
 # OSPFv2 is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # OSPFv2 is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -28,9 +28,9 @@ require 'infra/ospf_constants'
 module OSPFv2
 
   class SendSocket
-    
+
     attr_reader :sock
-    
+
     def initialize(src, options={})
       @src = src
       @sock = Socket.open(Socket::PF_INET, Socket::SOCK_RAW, IPPROTO_OSPF)
@@ -45,34 +45,34 @@ module OSPFv2
       STDERR.puts "#{e} Cannot Open Socket!"
       exit(1)
     end
-    
+
     #TODO: use all_spf_routers, all_dr_routers, ...
     #     8.1      Sending protocol packets .............................. 58
-    
-    
+
+
     def send_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)
     end
-    
+
     def send_to(packet, dest)
       _send_((packet.respond_to?(:encode) ? packet.encode : packet), 0, Socket.pack_sockaddr_in(0, dest))
     end
-    
+
     def send(packet, dest)
       addr = Socket.pack_sockaddr_in(0, dest)
       @sock.send((packet.respond_to?(:encode) ? packet.encode : packet),0,addr)
     end
-    
+
     def close
       @sock.close unless @sock.closed?
     end
-    
+
     private
-    
+
     def add_membership(group)
       @sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, (IPAddr.new(group).hton + IPAddr.new(@src).hton))
     rescue Errno::EADDRNOTAVAIL
@@ -82,7 +82,7 @@ module OSPFv2
       @sock.send(bits,0,addr)
     end
   end
-  
+
   class RecvSocket
     require 'socket'
     require 'ipaddr'

data/lib/infra/parse_options.rb

@@ -26,8 +26,15 @@ require 'ostruct'
 require 'ie/id'
 
 class OptParse
+  
+  def self.pry_installed?
+    require 'pry'
+  rescue LoadError
+    false
+  end
+  
   def self.parse(args)
-
+        
     options = OpenStruct.new
     options.ipaddr = '192.168.1.123'
     options.network = '192.168.1.0'
@@ -40,8 +47,12 @@ class OptParse
     options.area_id = 0
     options.log_fname = $stdout
     options.grid = [2,2]
-    options.num_sum = 10
-    options.num_ext = 10
+    options.num_sum = 3
+    options.num_ext = 3
+    options.ls_refresh_time = 2000
+    options.ls_refresh_interval = 180
+    options.console = :irb
+    options.network_type = :broadcast
 
     options.parse  = Proc.new do |filename|
       y_conf = YAML::load_file(filename)
@@ -59,25 +70,26 @@ class OptParse
     dead_int = lambda { options.dead_int || (options.hello_int * 4) }
 
     option_help = "blabla ...."
-    hlp_address =    "IP Address of the OSPF Interface."
-    hlp_base_link_addr = "base p2p links addres [#{options.base_link_addr}]"
-    hlp_base_router_id   = "base router-id [#{to_ip.call(options.base_router_id)}]"
-    hlp_neighbor_id= "Neighbor Id. [#{to_ip.call(options.neighbor_id)}]"
-    hlp_router_id =  "Router Id.   [#{to_ip.call(options.router_id)}]"
-    hlp_area_id =    "Area Id.     [#{to_ip.call(options.area_id)}]"
-    hlp_grid =       "Area Grid.   [#{options.grid.join('x')}]"
-    hlp_hello_int =  "Hello Int.   [#{options.hello_int}]"
-    hlp_dead_int =   "Dead Int.    [#{dead_int.call}]"
-    hlp_sum =        "\#Summary.   [#{options.num_sum}]"
-    hlp_ext =        "\#External.  [#{options.num_ext}]"
+    hlp_address =             "IP Address of the OSPF Interface."
+    hlp_base_link_addr=       "base p2p links address           Default: #{options.base_link_addr}"
+    hlp_base_router_id =      "base router-id                   Default: #{to_ip.call(options.base_router_id)}"
+    hlp_neighbor_id=          "Neighbor Id.                     Default: #{to_ip.call(options.neighbor_id)}"
+    hlp_router_id =           "Router Id.                       Default: #{to_ip.call(options.router_id)}"
+    hlp_area_id =             "Area Id.                         Default: #{to_ip.call(options.area_id)}"
+    hlp_grid =                "Area Grid.                       Default: #{options.grid.join('x')}"
+    hlp_hello_int =           "Hello Int.                       Default: #{options.hello_int}"
+    hlp_dead_int =            "Dead Int.                        Default: #{dead_int.call}"
+    hlp_sum =                 "Number of Summary LSA            Default: #{options.num_sum}"
+    hlp_ext =                 "Number AsExternal                Default: #{options.num_ext}"
+    hlp_ls_refresh_time =     "LS Refresh Time                  Default: #{options.ls_refresh_time}"
+    hlp_ls_refresh_interval = "LS Refresh Interval              Default: #{options.ls_refresh_interval}"
 
     optparse = OptionParser.new do |opts|
 
       opts.banner = "Usage: #{$0} [options]"
 
-      opts.on( "--base-p2p-addr [PREFIX]", hlp_base_link_addr) { |x| 
-        options.base_link_addr = x
-      }
+      opts.separator ""
+      opts.separator "Neighbor:"
       opts.on("-i", "--address [PREFIX]", hlp_address) { |x| 
         options.ipaddr = x
         options.ipaddr = x.split('/')[0]
@@ -85,9 +97,6 @@ class OptParse
         options.network = _addr.to_s
         options.netmask = _addr.netmask
       }
-      opts.on("--base-router-id [ID]", hlp_base_router_id) { |id| 
-        options.base_router_id = id.to_i
-      }
       opts.on("-r", "--router-id [ID]", hlp_router_id) { |id| 
         options.router_id = OSPFv2::Id.to_i(id) 
       }
@@ -97,27 +106,62 @@ class OptParse
       opts.on("-a", "--area-id [ID]", hlp_area_id) { |id| 
         options.area_id = to_id.call(id) 
       }
-      opts.on("-g", "--grid [colxrow]", hlp_grid) { |grid| 
-        options.grid = grid.split('x').collect { |x| x.to_i }
-      }
       opts.on( "--hello-interval [INT]", hlp_hello_int) { |int| 
         options.hello_int = int.to_i
       }
       opts.on("--dead-interval [INT]", hlp_dead_int) { |int| 
         options.dead_int = int.to_i
       }
+      opts.on( '-c', "--network [TYPE]", [:broadcast, :p2p], "Network type (broadcast, p2p)") { |t|
+        options.network_type = t || :broadcast
+        
+      }
+      
+      opts.separator ""
+      opts.separator ""
+      opts.separator "Link State Dabatabse:"
       opts.on("-g", "--grid [colxrow]", hlp_grid) { |grid| 
         options.grid = grid.split('x').collect { |x| x.to_i }
       }
-      opts.on('-S', "--number-of-summary [INT]", "Number of Summary LSA.") { |x| 
+      opts.on("-g", "--grid [colxrow]", hlp_grid) { |grid| 
+        options.grid = grid.split('x').collect { |x| x.to_i }
+      }
+      opts.on('-S', "--number-of-summary [INT]", hlp_sum) { |x| 
         options.num_sum = x.to_i
       }
-      opts.on('-E',"--number-of-external [INT]", "Number AsExternal") { |x| 
+      opts.on('-E',"--number-of-external [INT]", hlp_ext) { |x| 
         options.num_ext = x.to_i
       }
+      opts.on("--base-router-id [ID]", hlp_base_router_id) { |id| 
+        options.base_router_id = id.to_i
+      }
+      opts.on( "--base-p2p-addr [PREFIX]", hlp_base_link_addr) { |x| 
+        options.base_link_addr = x
+      }
+
+      opts.separator "\n"
+      opts.on("--refresh-time [SECOND]", OptionParser::DecimalInteger, hlp_ls_refresh_time) { |x| 
+        options.ls_refresh_time = x
+      }
+      opts.on("--refresh-interval [SECOND]", OptionParser::DecimalInteger, hlp_ls_refresh_interval) { |x| 
+        options.ls_refresh_interval = x
+      }
+      
+      opts.separator "\n"
       opts.on( '-f', "--log-fname [FILENAME]", "To redirect logs to a file.") { |fname|
         options.log_fname = fname 
       }
+      
+      if pry_installed?
+        opts.on( '-c', "--console [TYPE]", [:irb, :pry, :none], "Console (irb, pry, none)") { |t|
+          options.console = t || :irb
+        }
+      else
+        opts.on( '-c', "--console [TYPE]", [:irb, :none], "Console (irb, none)") { |t|
+          options.console = t || :irb
+        }
+      end
+      
       opts.on_tail("-h", "--help", "Show this message") { puts "\n  #{opts}\n" ; exit }
       opts.on_tail("-?", "--help") { puts "\n  #{opts}\n" ; exit }
       opts.on

data/lib/ls_db/advertised_routers.rb

@@ -21,7 +21,7 @@
 #++
 
 require 'set'
-require 'ie/id'
+require_relative '../ie/id'
 
 module OSPFv2::LSDB
   class AdvertisedRouters

data/lib/ls_db/link_state_database.rb

@@ -74,7 +74,8 @@ require 'lsa/lsa_factory'
 require 'ls_db/common'
 require 'ls_db/advertised_routers'
 
-require 'infra/to_s'
+require 'ls_db/lsdb_ios'
+
 
 module OSPFv2
 module LSDB
@@ -82,9 +83,9 @@ module LSDB
   class LinkStateDatabase
     include OSPFv2
     include OSPFv2::Common
-    include TO_S
+    include Ios
     
-    AreaId = Class.new(OSPFv2::Id)
+    AreaId = Class.new(OSPFv2::Id) unless const_defined?(:AreaId)
     
     attr_reader :area_id
     attr_writer_delegate :area_id
@@ -118,7 +119,6 @@ module LSDB
     end
     alias :lsas :all
     
-    #TODO: add opaque and external type 7
     LsType.all.each do |type|
       define_method("all_#{type}") do
         @ls_db.find_all { |k,v| k[0]== LsType.to_i(type) }.collect { |k,v| v  }.sort_by { |l| l.advertising_router.to_i  }
@@ -212,36 +212,23 @@ module LSDB
 
     def reset
       each {|lsa| lsa.ack }
-      @offset=0
+      @offset =0
     end
- 
-    def to_s_default
-      s = []
-      s << "    OSPF link state database, Area #{area_id.to_ip}"
-      s << "Age  Options  Type    Link-State ID   Advr Router     Sequence   Checksum  Length"
-       LsType.all.each do |type|
-         s << (__send__ "all_#{type}").collect { |l| l.to_s  }
-       end
-      s.join("\n")
+    
+    def to_s verbose=false
+      _to_s '', verbose
     end
     
-    def to_s_junos(verbose=false)
-      lsas = []
-      lsas << "    OSPF link state database, Area #{area_id.to_ip}"
-      lsas << " Type       ID               Adv Rtr           Seq      Age  Opt  Cksum  Len "
-       LsType.all.each do |type|
-         lsas << "    OSPF AS SCOPE link state database"  if type == :external
-         lsas << (__send__ "all_#{type}").collect { |l| 
-           if verbose
-             l.to_s_junos_verbose 
-           else 
-             l.to_s_junos
-           end
-         }
-       end
-      lsas.join("\n")
+    [:ios, :junos].each do |style|
+      define_method("to_s_#{style}") do
+        _to_s style.to_s, false
+      end
+      alias_method "to_#{style}", "to_s_#{style}"
+      define_method("to_s_#{style}_verbose") do
+        _to_s style.to_s, true
+      end
+      alias_method "to_#{style}_v", "to_s_#{style}_verbose"
     end
-    alias :to_j :to_s_junos
     
     def [](*key)
       lookup(*key)
@@ -255,10 +242,16 @@ module LSDB
      all.find_all { |l| ! l.ack? }
     end
     
+    #FIXME: don't use find_all ?????
     def refresh
       all.find_all {|l| l.refresh(advertised_routers, ls_refresh_time) }
     end 
     
+    def refresh2(age)
+      all.each {|l| l.refresh2(advertised_routers, age) }
+      ''
+    end 
+    
     def ls_refresh?(ls)
       rt = ls_refresh_time
       ls.instance_eval { refresh?(rt) }
@@ -267,16 +260,11 @@ module LSDB
     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?
@@ -292,7 +280,6 @@ module LSDB
     def has?(obj)
       lookup(obj)
     end
-      
     
     def recv_dd(dd, ls_req_list)
       raise ArgumentError, "lss nil" unless ls_req_list
@@ -308,11 +295,58 @@ module LSDB
       }
       nil
     end
-        
+
+    require 'ls_db/lsdb_ios'
+    include Ios
+
     private
     
-    def lsa_types
-      [:router, :network, :summary, :asbr_summary, :as_external]
+    def _to_s_hdr
+      s = []
+      s << "    OSPF link state database, Area #{area_id.to_ip}"
+      s << "Age  Options  Type    Link-State ID   Advr Router     Sequence   Checksum  Length"
+      s
+    end
+    def _to_s_hdr_junos
+      s = []
+      s << "    OSPF link state database, Area #{area_id.to_ip}"
+      s << " Type       ID               Adv Rtr           Seq      Age  Opt  Cksum  Len "
+      s
+    end
+
+    # FIXME: don't display header'
+    # >> puts ls_db.to_s(1)
+    #     OSPF link state database, Area 0.0.0.0
+    # Age  Options  Type    Link-State ID   Advr Router     Sequence   Checksum  Length
+    # Router:
+    #    LsAge: 19
+    #    Options:  0x22  [DC,E]
+    # 
+
+    def _to_s(style, verbose)
+      s = []
+      to_s_hdr     = '_to_s_hdr'
+      to_s         = 'to_s'
+      to_s_verbose = 'to_s_verbose'
+      if style.length>0
+        to_s_hdr     = "_to_s_hdr_#{style}"
+        to_s         = "to_s_#{style}"
+        to_s_verbose = "to_s_#{style}_verbose"
+      end
+      s << __send__(to_s_hdr)
+      LsType.all.each do |type|
+        all = __send__ "all_#{type}"
+        next if all.empty?
+        s << __send__( "_to_s_hdr_#{type}_#{style}", verbose) if respond_to?("_to_s_hdr_#{type}_#{style}")
+        s << all.collect { |l| 
+          if verbose
+            l.send to_s_verbose
+          else 
+            l.send to_s
+          end
+        }
+      end
+      s.join("\n  ")
     end
     
     def id2i(id)
@@ -332,3 +366,4 @@ end
 require 'ls_db/link_state_database_build'
 
 load "../../../test/ospfv2/ls_db/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+