ospfv2 0.0.2 → 0.0.3

data/lib/ls_db/link_state_database_build.rb

@@ -69,7 +69,7 @@ module OSPFv2::LSDB
          rlsa = OSPFv2::Lsa.factory \
          :advertising_router=> router_id, 
          :ls_id=> router_id,
-         :ls_type=>:router_lsa, 
+         :ls_type=>:router, 
          :options=> 0x22
          
         advertised_routers << router_id
@@ -96,7 +96,7 @@ module OSPFv2::LSDB
     
     
     def remove_adjacency(rid, neighbor_id, prefix)
-      if (rlsa = lookup(:router_lsa, rid))
+      if (rlsa = lookup(:router, rid))
         addr, source_address, plen, network, netmask = IPAddr.to_arr(prefix)
         rlsa.delete(:point_to_point,id2ip(neighbor_id))
         rlsa.delete(3,network)
@@ -136,7 +136,7 @@ module OSPFv2::LSDB
           :advertising_router=> router_id,
           :ls_id=> router_id,
           :nwveb=>2, 
-          :ls_type=>:router_lsa,
+          :ls_type=>:router,
           :options=> 0x22
         
         advertised_routers << router_id

data/lib/ls_db/link_state_database_links.rb

@@ -26,6 +26,7 @@ require 'lsa/lsa'
 
 module OSPFv2
 
+  #FIXME extend class Lsa instead...
 
   class Lsa
     def lsdb_link_id
@@ -49,10 +50,14 @@ module OSPFv2::LSDB
       (row << 16) + col + base_rid      
     end
 
+    #FIXME: 9/24/2014 ???????
+    # check where this is used? 
+    # should create an infinite loop?
     def router_id(*args)
       LinkStateDatabase.router_id(*args)
     end  
 
+    # FIXME: should be moved to base
     # lsdb = LinkStateDatabase.create 10, 10, :prefix => '192.168.0.0/24'
     # lsdb = LinkStateDatabase.create 10, 10, :prefix_base => '192.168.0.0/24', :router_id_base => 
     def self.create(arg={})
@@ -138,11 +143,11 @@ module OSPFv2::LSDB
     end
 
     def link_refresh
-
+      #TODO implement link_refresh
     end
 
     def link_maxage
-
+      #TODO implement link_maxage
     end
 
   end

data/lib/ls_db/lsdb_ios.rb

@@ -0,0 +1,59 @@
+module OSPFv2::LSDB
+module Ios
+  def _to_s_hdr_ios
+    s=[]
+    s << ""
+    s << "            OSPF Router with ID ()"
+    s
+  end
+  def _to_s_hdr_router_ios(verbose=false)
+    s=[]
+    s << ""
+    s << "                Router Link States (Area #{area_id.to_i})"
+    s << ""
+    s << "Link ID         ADV Router      Age         Seq#       Checksum Link count" unless verbose
+    s
+  end
+  def _to_s_hdr_network_ios(verbose=false)
+    s=[]
+    s << ""
+    s << "                Net Link States (Area #{area_id.to_i})"
+    s << ""
+    s << "Link ID         ADV Router      Age         Seq#       Checksum" unless verbose
+    s
+  end
+  def _to_s_hdr_summary_ios(verbose=false)
+    s=[]
+    s << ""
+    s << "                Summary Net Link States (Area #{area_id.to_i})"
+    s << ""
+    s << "Link ID         ADV Router      Age         Seq#       Checksum" unless verbose
+    s
+  end
+  def _to_s_hdr_asbr_summary_ios(verbose=false)
+    s=[]
+    s << ""
+    s << "                Summary ASB Link States (Area #{area_id.to_i})"
+    s << ""
+    s << "Link ID         ADV Router      Age         Seq#       Checksum" unless verbose
+    s
+  end
+  def _to_s_hdr_as_external_ios(verbose=false)
+    s=[]
+    s << ""
+    s << "                Type-5 AS External States (Area #{area_id.to_i})"
+    s << ""
+    s << "Link ID         ADV Router      Age         Seq#       Checksum Tag" unless verbose
+    s
+  end
+  def _to_s_hdr_area_ios(verbose=false)
+    s=[]
+    s << ""
+    s << "                Type-10 Opaque Link Area Link States (Area #{area_id.to_i})"
+    s << ""
+    s << "Link ID         ADV Router      Age         Seq#       Checksum Opaque ID" unless verbose
+    s
+  end
+
+end
+end

data/lib/lsa/external.rb

@@ -193,12 +193,45 @@ module OSPFv2
       super
     end
     
-    def to_s_default
+    def to_s
+      super
+    end
+    
+    # Network Mask: /24
+    #       Metric Type: 1 (Comparable directly to link state metric)
+    #       TOS: 0 
+    #       Metric: 0 
+    #       Forward Address: 0.0.0.0
+    #       External Route Tag: 0
+    #       Metric Type: 1 (Comparable directly to link state metric)
+    #       TOS: 10 
+    #       Metric: 20 
+    #       Forward Address: 0.0.0.0
+    #       External Route Tag: 10
+
+    def to_s_ios
+      super + external_route.tag.to_s
+    end
+
+    def to_s_ios_verbose
+      s = []
+      mt_metrics = self.mt_metrics.collect
+      s << super
+      s << "Network Mask: #{netmask}"
+      ext = []
+      ext << "    #{external_route}"
+      ext << mt_metrics.collect { |x| x.to_s }
+      s << ext.join("\n      ")
+      s.join("\n  ")
+    end
+    
+
+    def to_s_verbose
       mt_metrics = self.mt_metrics.collect
       super  +
       ['',netmask, external_route, *mt_metrics ].collect { |x| x.to_s }.join("\n   ")
     end
-    
+   
     def to_s_junos
       super
     end

data/lib/lsa/lsa.rb

@@ -124,16 +124,14 @@ length
 
 =end
 
-require 'infra/ospf_common'
-require 'infra/ospf_constants'
-require 'ie/id'
-require 'ie/ls_type'
-require 'ie/ls_age'
-require 'ie/sequence_number'
-require 'ie/options'
-require 'ls_db/advertised_routers'
-
-require 'infra/to_s'
+require_relative '../infra/ospf_common'
+require_relative '../infra/ospf_constants'
+require_relative '../ie/id'
+require_relative '../ie/ls_type'
+require_relative '../ie/ls_age'
+require_relative '../ie/sequence_number'
+require_relative '../ie/options'
+require_relative '../ls_db/advertised_routers'
 
 module OSPFv2
   
@@ -141,12 +139,40 @@ module OSPFv2
     include Comparable
     
     unless const_defined?(:AdvertisingRouter)
-      AdvertisingRouter = Class.new(Id)
-      LsId = Class.new(Id)
+      AdvertisingRouter = Class.new(Id) do
+        def to_s_ios
+          "Advertising Router: " + to_ip
+        end
+      end
+      LsId = Class.new(Id) do
+        def to_s_ios
+          "Link State ID: " + to_ip
+        end
+      end
       LsAge = Class.new(LsAge)
       MODX=4102
     end
+    
+    
+    #  0                   1                   2                   3
+    #  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+    # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    # |            LS age             |    Options    |    LS type    |
+    # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    # |                        Link State ID                          |
+    # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    # |                     Advertising Router                        |
+    # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    # |                     LS sequence number                        |
+    # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    # |         LS checksum           |             length            |
+    # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    # 
+    class Header
+    end
+    
 
+    #FIXME: need to generate Router, Network, .. LSAs.
     class << self
       def new_ntop(arg)
         lsa = new
@@ -163,14 +189,17 @@ module OSPFv2
     
     include OSPFv2::Common
     include OSPFv2::Constant
-    
-    # FIXME: when adding LSA in LSDB should be acked when init, rxmt otherwise ....
+        
     def ack
       @_rxmt_=false
     end
     def retransmit
       @_rxmt_=true
     end
+    
+    #  returns
+    #          true  if lsa has been acked by neighbor
+    #          false otherwise
     def is_acked?
       @_rxmt_ == false
     end
@@ -181,24 +210,34 @@ module OSPFv2
     attr_reader :ls_id
     attr_reader :advertising_router
     attr_reader :sequence_number
+    attr_reader :opaque_id, :opaque_type
     
-    attr_writer_delegate :advertising_router, :ls_id, :ls_age
+    attr_writer_delegate :advertising_router, :ls_id, :ls_age, :opaque_id, :opaque_type
+    
+    LsType.all.each do |type|
+      define_method("#{type}?") do
+        type == LsType.to_sym(@ls_type.to_i)
+      end
+    end
     
     def initialize(arg={})
       arg = arg.dup
+      
       @ls_age = LsAge.new
       @sequence_number = SequenceNumber.new
       @options = Options.new
       @ls_id = LsId.new
+      @ls_id = nil
+      if is_opaque?
+        @opaque_id   = OpaqueId.new
+        @opaque_type = OpaqueType.new
+      else
+        @ls_id=LsId.new
+      end
       @advertising_router = AdvertisingRouter.new
       @_length = 0
       @_rxmt_ = false
       
-      # unless @ls_type
-      #   # raise if caller[-2].grep(/test\/unit/).empty?
-      #   @ls_type = LsType.new(1)
-      # end
-      
       if arg.is_a?(Hash)
         set arg
       elsif arg.is_a?(String)
@@ -219,15 +258,58 @@ module OSPFv2
       @sequence_number = SequenceNumber.new(seqn)
     end
 
-    def to_s_default
+    def to_s_ios
+      sprintf("%-15.15s %-15.15s %-4.0d        0x%8.8X 0x%6.6X ", 
+            is_opaque? ? ls_id = Id.new_ntoh(@opaque_type.encode + @opaque_id.encode).to_ip : self.ls_id.to_ip, 
+            advertising_router.to_ip, 
+            ls_age.to_i, 
+            seqn.to_I, 
+            csum_to_i)
+    end
+
+    def to_s
       len = encode.size
       if is_opaque?
-      else
+        ls_id = Id.new_ntoh(@opaque_type.encode + @opaque_id.encode)
         sprintf("%-4.0d  0x%2.2x  %-8s  %-15.15s %-15.15s 0x%8.8x  0x%4.4x   %-7d", 
         ls_age.to_i, options.to_i, ls_type.to_s_short, ls_id.to_ip, advertising_router.to_ip, seqn.to_I,csum_to_i,len)
+      else
+        sprintf("%-4.0d  0x%2.2x  %-8s  %-15.15s %-15.15s 0x%8.8x  0x%4.4x   %-7d", 
+        ls_age.to_i, options.to_i, ls_type.to_s_short, self.ls_id.to_ip, advertising_router.to_ip, seqn.to_I,csum_to_i,len)
+      end
+    end
+    alias :to_s_dd :to_s
+    
+    # LS age: 44
+    # Options: (No TOS-capability, No DC)
+    # LS Type: Opaque Area Link
+    # Link State ID: 1.0.0.0
+    # Opaque Type: 1
+    # Opaque ID: 0
+    # Advertising Router: 0.0.0.3
+    # LS Seq Number: 80000001
+    # Checksum: 0xD12
+    # Length: 116
+    # Fragment number : 0
+    def to_s_ios_verbose
+      len = encode.size
+      s = []
+      s << ''
+      s << ls_age.to_s_ios
+      s << options.to_s_ios
+      s << ls_type.to_s_ios
+      if is_opaque?
+        s << "Opaque Type: #{opaque_type.to_i}"
+        s << "Opaque ID: #{opaque_id.to_i}"
+      else
+        s << "#{ls_id.to_s_ios} #{summary? ? "(summary Network Number)" : ''}"
       end
+      s << advertising_router.to_s_ios
+      s << sequence_number.to_s_ios
+      s << "Checksum: #{format "0x%4X", csum_to_i}" if @_csum
+      s << "Length: #{len}"
+      s.join("\n  ")
     end
-    alias :to_s_dd :to_s_default
     
     def to_s_verbose
       len = encode.size
@@ -257,8 +339,10 @@ module OSPFv2
         sprintf("%-7s %-1.1s%-15.15s  %-15.15s  0x%8.8x  %4.0d  0x%2.2x 0x%4.4x %3d", ls_type.to_junos, '', ls_id.to_ip, advertising_router.to_ip, seqn.to_I, ls_age.to_i, options.to_i, csum_to_i, len)
       end
     end
-    include OSPFv2::TO_S  
-    alias :to_s_junos_verbose :to_s_junos
+
+    def to_s_junos_verbose
+      to_s_junos
+    end
     
     def is_opaque?
       ls_type.is_opaque?
@@ -270,7 +354,8 @@ module OSPFv2
       header << [options.to_i].pack('C')
       header << ls_type.encode
       if is_opaque?
-        header << [(@opaque_type << 24) + @opaque_id].pack('N')
+        header << @opaque_type.encode
+        header << @opaque_id.encode
       else
         header << ls_id.encode
       end
@@ -319,8 +404,8 @@ module OSPFv2
       @sequence_number = SequenceNumber.new seqn
       @advertising_router = AdvertisingRouter.new advr
       if is_opaque?
-        @opaque_id   = ls_id >> 24
-        @opaque_type = ls_id & 0xffffff
+        @opaque_type = OpaqueType.new(ls_id>>24)
+        @opaque_id = OpaqueId.new(ls_id & 0xffffff)
       else
         @ls_id = LsId.new ls_id
       end
@@ -381,6 +466,14 @@ module OSPFv2
       self
     end
     
+    def refresh2(advertised_routers, age)
+      return unless advertised_routers.has?(advertising_router)
+      @sequence_number.incr
+      @ls_age = LsAge.new(age)
+      retransmit
+      self
+    end
+    
     def maxage
       ls_age.maxage and retransmit
       self
@@ -397,12 +490,14 @@ module OSPFv2
     end
     
     def method_missing(method, *args, &block)
-      # puts "&&&&&  #{self.class}: method: #{method}"
-      # p caller[0]
-      if method == :to_s_junos
-        :to_s_default
+      if method.to_s =~ /^to_s_(ios|junos)_verbose/
+        p " #{self.class}: #{method} IS MISSING!!! defaulting to :to_s_verbose"
+        __send__ :to_s_verbose, *args, &block
+      elsif method.to_s =~ /^to_s_(ios|junos)$/
+        p $1
+        __send__ :to_s, *args, &block
       else
-        super
+        raise "missing: #{method} #{caller[0..2]}"
       end
     end
 
@@ -472,5 +567,3 @@ module OSPFv2
   end
 
 end
-
-load "../../../test/ospfv2/lsa/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/lib/lsa/lsa_factory.rb

@@ -25,6 +25,7 @@ require 'lsa/router'
 require 'lsa/network'
 require 'lsa/summary'
 require 'lsa/external'
+# require 'lsa/traffic_engineering'
 
 module OSPFv2
   class Lsa
@@ -39,17 +40,30 @@ module OSPFv2
           when 4 ; OSPFv2::AsbrSummary.new_ntop(arg)
           when 5 ; OSPFv2::AsExternal.new_ntop(arg)
           when 7 ; OSPFv2::AsExternal7.new_ntop(arg)
+          when 9,10,11
+            _, opaque_type = arg.unpack('NC')
+            case opaque_type
+            when 1
+              OSPFv2::TrafficEngineering.new_ntop(arg)
+            end
           else 
             raise
           end
         elsif arg.is_a?(Hash)
           case arg[:ls_type]
-          when :router_lsa        ; OSPFv2::Router.new_hash(arg)
-          when :network_lsa       ; OSPFv2::Network.new_hash(arg)
-          when :summary_lsa       ; OSPFv2::Summary.new_hash(arg)
-          when :asbr_summary_lsa  ; OSPFv2::AsbrSummary.new_hash(arg)
-          when :as_external_lsa   ; OSPFv2::AsExternal.new_hash(arg)
-          when :as_external7_lsa  ; OSPFv2::AsExternal7.new_hash(arg)
+          when :router        ; OSPFv2::Router.new_hash(arg)
+          when :network       ; OSPFv2::Network.new_hash(arg)
+          when :summary       ; OSPFv2::Summary.new_hash(arg)
+          when :asbr_summary  ; OSPFv2::AsbrSummary.new_hash(arg)
+          when :as_external   ; OSPFv2::AsExternal.new_hash(arg)
+          when :as_external7  ; OSPFv2::AsExternal7.new_hash(arg)
+          when :area, :link_local, :domain
+            case arg[:opaque_type]
+            when 1, :te_lsa
+              OSPFv2::TrafficEngineering.new_hash(arg)
+            else
+              raise
+            end
           else
             raise
           end
@@ -59,5 +73,4 @@ module OSPFv2
       end
     end
   end
-  
 end