ospfv2 0.0.1 → 0.0.2

data/bin/ospfv2

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+raise "Not working with 1.9, use ruby 1.8.7"  if RUBY_VERSION.split('.')[0..1].join > '18'
+
 require 'neighbor/neighbor'
 require 'packet/ospf_packet'
 require 'ls_db/link_state_database'
@@ -89,7 +91,6 @@ cli = Thread.new do
   stop
   puts ls_db 
   puts ls_db.to_js_unos
-  aging :on | :off  
   end;
   
   def prompt() ; ">> " ; end
@@ -107,10 +108,6 @@ cli = Thread.new do
     puts "% error: #{e}\n"
   end
   
-  def aging(arg)
-     OSPFv2::Lsa::LsAge.aging arg
-  end
-
   loop do
     print prompt() ; $stdout.flush
     cmd = STDIN.gets
@@ -118,7 +115,7 @@ cli = Thread.new do
     next if cmd.size == 0
     ary = cmd.downcase.split(' ')
     case ary[0]
-    when 'start' ; aging :on ; neighbor.start      
+    when 'start' ; neighbor.start
     when 'stop'  ; neighbor.stop
     when 'help', '?'
       print help

data/changelog.txt

@@ -0,0 +1,8 @@
+=== 0.0.2 Fri Apr 15 18:22:26 PDT 2011
+
+* Work with Cisco Routers that enable LLS by default
+
+=== 0.0.1
+
+* Initial release
+

data/lib/ie/au_type.rb

@@ -20,8 +20,8 @@
 # along with OSPFv2.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-
 # 0 Null authentication 1 Simple password 2 Cryptographic authentication
+
 module OSPFv2
 class AuType
   def initialize(au_type=0)

data/lib/ie/external_route.rb

@@ -64,7 +64,9 @@ module OSPFv2
   class ExternalRoute_Base
     include Common
 
-    ForwardingAddress = Class.new(OSPFv2::Id)
+    unless const_defined?(:ForwardingAddress)
+      ForwardingAddress = Class.new(OSPFv2::Id)
+    end
     
     attr_reader  :metric, :type, :forwarding_address, :tag, :mt_id
     attr_checked :metric do |x|
@@ -161,7 +163,7 @@ module OSPFv2
     def initialize(arg={})
       if arg.is_a?(Hash)
         @forwarding_address = ForwardingAddress.new
-        raise ArgumentError, "MT-ID not set!" unless arg[:mt_id]
+        raise ArgumentError, "MT-ID not set!" unless arg.has_key?(:mt_id)
         raise ArgumentError, "MT-ID should not be 0!" if arg[:mt_id]==0
       end
       super
@@ -169,7 +171,8 @@ module OSPFv2
   end
   
   def ExternalRoute_Base.new_hash(h)
-    if h[:mt_metrics]
+    raise unless h.is_a?(Hash)
+    if h.has_key? :mt_metrics
       MtExternalRoute.new(h)
     else
       ExternalRoute.new(h)

data/lib/ie/interface_mtu.rb

@@ -43,7 +43,6 @@ class InterfaceMtu
   def number_of_lsa
     @noh ||= ((to_i - OSPFv2::PACKET_HEADER_LEN) / OSPFv2::LSA_HEADER_LEN) - 1
   end
-  alias :n0flsa :number_of_lsa
   
   def to_s
     self.class.to_s.split('::').last + ": #{to_i}"

data/lib/ie/ls_age.rb

@@ -26,24 +26,10 @@ module OSPFv2
 class LsAge
   include Comparable
   
-  class << self
-    def aging(state=:off)
-      case state
-      when :on   ; @aging = true
-      when :off  ; @aging = false
-      else
-        raise ArgumentError, "Invalid Argument"
-      end
-    end
-    def aging?
-      @aging
-    end
-  end
-  
   def initialize(age=0)
-    raise ArgumentError, "Invalid Argument #{age}" unless age.is_a?(Integer)
     @age=age
     @time = Time.now
+    raise ArgumentError, "Invalid Argument #{age}" unless age.is_a?(Integer)
   end
   
   def to_i
@@ -51,7 +37,7 @@ class LsAge
   end
   
   def aging?
-    self.class.aging?
+    true
   end
   
   def maxage

data/lib/ie/ls_type.rb

@@ -20,77 +20,114 @@
 # along with OSPFv2.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-# 
-# LS Type   Description
-# ___________________________________
-# 1         Router-LSAs
-# 2         Network-LSAs
-# 3         Summary-LSAs (IP network)
-# 4         Summary-LSAs (ASBR)
-# 5         AS-external-LSAs
-# 
 module OSPFv2
 class LsType
+
+  @ls_type_junos = {
+    1 => 'Router'  ,
+    2 => 'Network' ,
+    3 => 'Summary' ,
+    4 => 'ASBRSum' ,
+    5 => 'Extern'  ,
+    9 => 'OpaqLoca',
+    10=> 'OpaqArea',
+    11=> 'OpaqAS'  ,
+  }
+
+  @ls_type_short = {
+    1=>'router'   ,
+    2=>'network'  ,
+    3=>'summary'  ,
+    4=>'asbrSum'  ,
+    5=>'external' ,
+    7=>'nssa'     ,
+    9=>'opaqLnk'  ,
+    10=>'opaqArea',
+    11=>'opaqAs'  ,
+  }
+
+  @ls_type_sym = {
+    1  => :router_lsa      ,
+    2  => :network_lsa     ,
+    3  => :summary_lsa     ,
+    4  => :asbr_summary_lsa,
+    5  => :as_external_lsa ,
+    7  => :as_external7_lsa,
+    9  => :link_local_lsa  ,
+    10 => :area_lsa        ,
+    11 => :domain_lsa      ,
+  }
   
-  def self.all
-    [:router, :network, :summary, :asbr_summary, :as_external]
-  end
+  @ls_type_sym_to_i = @ls_type_sym.invert
   
-  def self.to_i(arg)
-    return arg unless arg.is_a?(Symbol)
-    case arg.to_s
-    when /^router(_lsa|)$/       ; @ls_type=1
-    when /^network(_lsa|)$/      ; @ls_type=2
-    when /^summary(_lsa|)$/      ; @ls_type=3
-    when /^asbr_summary(_lsa|)$/ ; @ls_type=4
-    when /^as_external(_lsa|)$/  ; @ls_type=5
-    #FIXME: finish and unit-test
-    # when :as_external7_lsa ; @ls_type=7
-    # when :opaque_link      ; @ls_type=9
-    # when :opaque_area      ; @ls_type=10
-    # when :opaque_as        ; @ls_type=11
-    end    
+  def is_opaque?
+    (9..11) === @ls_type
   end
-  
-  def self.to_sym(arg)
-    return arg unless arg.is_a?(Fixnum)
-    case arg
-    when 1  ; :router_lsa
-    when 2  ; :network_lsa
-    when 3  ; :summary_lsa
-    when 4  ; :asbr_summary_lsa
-    when 5  ; :as_external_lsa
-    when 7  ; :as_external7_lsa
-    when 9  ; :opaque_link
-    when 10 ; :opaque_area
-    when 11 ; :opaque_as
+
+  class << self
+    def all
+      [:router, :network, :summary, :asbr_summary, :as_external]
     end
-  end
 
-  def self.to_junos(arg)
-    return arg.to_i unless arg.is_a?(Fixnum)
-    case arg
-    when 1  ; 'Router'
-    when 2  ; 'Network'
-    when 3  ; 'Summary'
-    when 4  ; 'ASBRSum'
-    when 5  ; 'Extern'
-    else
-      'TBD'
+    def to_i(arg)
+      return arg unless arg.is_a?(Symbol)
+      case arg.to_s
+      when /^router(_lsa|)$/       ; @ls_type=1
+      when /^network(_lsa|)$/      ; @ls_type=2
+      when /^summary(_lsa|)$/      ; @ls_type=3
+      when /^asbr_summary(_lsa|)$/ ; @ls_type=4
+      when /^as_external(_lsa|)$/  ; @ls_type=5
+        #FIXME: finish and unit-test
+        # when :as_external7_lsa ; @ls_type=7
+        # when :opaque_link      ; @ls_type=9
+        # when :opaque_area      ; @ls_type=10
+        # when :opaque_as        ; @ls_type=11
+      end    
+    end
+
+    def to_sym(arg)
+      return arg unless arg.is_a?(Fixnum)
+      if @ls_type_sym.has_key?(arg)
+        @ls_type_sym[arg]
+      else
+        raise
+      end
+    end
+
+    def ls_type_sym_to_i(arg)
+      return arg if arg.is_a?(Fixnum)
+      if @ls_type_sym_to_i.has_key?(arg)
+        @ls_type_sym_to_i[arg]
+      else
+        raise
+      end
+    end
+
+    def to_junos(arg)
+      return arg unless arg.is_a?(Fixnum)
+      if @ls_type_junos.has_key?(arg)
+        @ls_type_junos[arg]
+      else
+        raise
+      end
+    end
+
+    def to_short(arg)
+      return arg unless arg.is_a?(Fixnum)
+      if @ls_type_short.has_key?(arg)
+        @ls_type_short[arg]
+      else
+        raise
+      end
     end
   end
   
   def initialize(ls_type=1)
-    case ls_type
-    when  1,:router_lsa       ; @ls_type=1
-    when  2,:network_lsa      ; @ls_type=2
-    when  3,:summary_lsa      ; @ls_type=3
-    when  4,:asbr_summary_lsa ; @ls_type=4
-    when  5,:as_external_lsa  ; @ls_type=5
-    when  7,:as_external7_lsa ; @ls_type=7
-    when  9,:opaque_link      ; @ls_type=9
-    when 10,:opaque_area      ; @ls_type=10
-    when 11,:opaque_as        ; @ls_type=11
+    @ls_type = case ls_type
+    when Symbol
+      LsType.ls_type_sym_to_i(ls_type)
+    when Fixnum
+      ls_type
     else
       raise ArgumentError, "Invalid LsType #{ls_type}"
     end
@@ -101,19 +138,7 @@ class LsType
   def to_s
     self.class.to_s.split('::').last + ": #{to_sym}"
   end
-  def to_s_short
-    case to_i
-    when  1; 'router'
-    when  2; 'network'
-    when  3; 'summary'
-    when  4; 'asbrSum'
-    when  5; 'external'
-    when  7; 'nssa'
-    when  9; 'opaqLnk'
-    when 10; 'opaqArea'
-    when 11; 'opaqAs'
-    end
-  end
+
   def to_sym
     LsType.to_sym @ls_type
   end
@@ -127,6 +152,14 @@ class LsType
     to_sym
   end
   
+  def to_s_short
+    LsType.to_short(to_i)
+  end
+  
+  def to_junos
+    LsType.to_junos(to_i)
+  end
+  
 end
 end
 

data/lib/ie/metric.rb

@@ -58,6 +58,19 @@ class Metric
   end
   
 end
+
+module CommonMetric
+  def mt_metrics=(val)
+    [val].flatten.each { |x| self << x }
+  end
+  
+  def <<(metric)
+    @mt_metrics ||=[]
+    @mt_metrics << MtMetric.new(metric)
+    self
+  end
+end
+
 end
 
 load "../../../test/ospfv2/ie/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/lib/ie/options.rb

@@ -90,6 +90,23 @@ A.2 The Options field
      This bit describes the router's handling of demand circuits, as
      specified in [Ref10].
 
+
+2.1.  L-bit in Options Field
+
+   A new L bit (L stands for LLS) is introduced into the OSPF Options
+   field (see Figure 2a/2b).  Routers set the L bit in Hello and DD
+   packets to indicate that the packet contains an LLS data block.  In
+   other words, the LLS data block is only examined if the L bit is set.
+
+              +---+---+---+---+---+---+---+---+
+              | * | O | DC| L |N/P| MC| E | * |
+              +---+---+---+---+---+---+---+-+-+
+
+               Figure 2a: OSPFv2 Options field
+
+
+
+
 =end
 
 require 'infra/ospf_common'
@@ -98,7 +115,7 @@ module OSPFv2
   
   class Options
      
-    attr :options, true
+    attr_accessor :options
 
     def initialize(arg={})
       @options=0
@@ -146,17 +163,17 @@ module OSPFv2
           end
         end
       end
-      unless arg[:R].nil? and arg[:r].nil?
-        _flag = arg[:R] ||= arg[:r]
+      unless arg[:L].nil? and arg[:l].nil?
+        _flag = arg[:L] ||= arg[:l]
         if _flag.is_a?(TrueClass)
-          setR
+          setL
         elsif _flag.is_a?(FalseClass)
-          unsetR
+          unsetL
         elsif _flag.is_a?(Fixnum)
           if _flag == 0
-            unsetR
+            unsetL
           else
-            setR
+            setL
           end
         end
       end
@@ -189,19 +206,19 @@ module OSPFv2
         end
       end
       unless arg[:MC].nil? and arg[:mc].nil?
-          _flag = arg[:MC] ||= arg[:mc]
-          if _flag.is_a?(TrueClass)
-            setMC
-          elsif _flag.is_a?(FalseClass)
+        _flag = arg[:MC] ||= arg[:mc]
+        if _flag.is_a?(TrueClass)
+          setMC
+        elsif _flag.is_a?(FalseClass)
+          unsetMC
+        elsif _flag.is_a?(Fixnum)
+          if _flag == 0
             unsetMC
-          elsif _flag.is_a?(Fixnum)
-            if _flag == 0
-              unsetMC
-            else
-              setMC
-            end
+          else
+            setMC
           end
         end
+      end
       unless arg[:E].nil? and arg[:e].nil?
         _flag = arg[:E] ||= arg[:e]
         if _flag.is_a?(TrueClass)
@@ -254,9 +271,13 @@ module OSPFv2
     def unsetDC ; __unsetBit(6) ; end
     def dc?     ; __isSet(6)    ; end
     
-    def setR    ; __setBit(5)   ; end
-    def unsetR  ; __unsetBit(5) ; end
-    def r?      ; __isSet(5)    ; end
+    # A new L-bit (L stands for LLS) is introduced into the OSPF Options
+    # field (see Figures 2a and 2b).  Routers set the L-bit in Hello and DD
+    # packets to indicate that the packet contains an LLS data block.  In
+    # other words, the LLS data block is only examined if the L-bit is set.
+    def setL    ; __setBit(5)   ; end
+    def unsetL  ; __unsetBit(5) ; end
+    def l?      ; __isSet(5)    ; end
     
     # N-bit is used in Hello packets only. 
     # It signals the area is an NSSA area.
@@ -340,7 +361,7 @@ module OSPFv2
     def _to_s_
       s = []
       s << 'O' if o?
-      s << 'R' if r?
+      s << 'L' if l?
       s << 'DC' if dc?
       s << 'N' if n?
       s << 'MC' if mc?