ospfv2 0.0.2 → 0.0.3

data/lib/neighbor/neighbor.rb

@@ -52,15 +52,17 @@ module OSPFv2
     include OSPFv2
     attr_reader :address, :inactivity_timer, :hello, :dd_rxmt_interval
     
-    InactivityTimer = Class.new(Timer)
-    HelloTimer = Class.new(PeriodicTimer)
-    RxmtIntervalTimer = Class.new(PeriodicTimer)
-    RefreshTimer = Class.new(PeriodicTimer)
-    RouterId = Class.new(Id)
-    AreadId = Class.new(Id)
-
     attr_writer :hello_int, :dead_int
     
+    unless const_defined?(:AreaId)
+      InactivityTimer = Class.new(Timer)
+      HelloTimer = Class.new(PeriodicTimer)
+      RxmtIntervalTimer = Class.new(PeriodicTimer)
+      RefreshTimer = Class.new(PeriodicTimer)
+      RouterId = Class.new(Id)
+      AreaId = Class.new(Id)
+    end
+
     def initialize(arg={})
       #TODO: accept prefix arg and set @address and @netmask in hello...
       @address = arg[:src_addr] || '127.0.0.1'
@@ -195,8 +197,6 @@ module OSPFv2
       end
     end
     
-    # AllSPFRouters = "224.0.0.5"
-    # AllDRouters = "224.0.0.6"
     def flood(lsas, dest=AllSPFRouters)
       send LinkStateUpdate.new_lsas(lsas), dest
     end

data/lib/packet/link_state_update.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
@@ -71,7 +71,7 @@
       A.4.1. Detailed formats of the different types of LSAs are described
       in Section A.4.
 
-  
+
 =end
 
 require 'packet/ospf_packet'
@@ -79,11 +79,11 @@ require 'lsa/lsa'
 require 'lsa/lsa_factory'
 require 'packet/link_state_ack'
 module OSPFv2
-  
+
   class LinkStateUpdate < OspfPacket
-    
+
     attr_reader :lsas
-    
+
     def initialize(_arg={})
       arg = _arg.dup
       @lsas=[]
@@ -98,11 +98,11 @@ module OSPFv2
         raise ArgumentError, "Invalid argument", caller
       end
     end
-    
+
     def number_of_lsa
       lsas.size
     end
-    
+
     def encode
       headers = []
       headers << [lsas.size].pack('N')
@@ -123,9 +123,9 @@ module OSPFv2
         end
       end
     end
-    
+
     def [](val)
-      lsas[val] 
+      lsas[val]
     end
 
     # def to_s
@@ -144,11 +144,11 @@ module OSPFv2
       s.join("\n ")
     end
 
-    
+
     def each
       lsas.each { |ls| yield ls }
     end
-    
+
     def keys
       lsas.collect { |ls| ls.key }
     end
@@ -167,7 +167,7 @@ module OSPFv2
         lsas = arg[:lsas]
         arg.delete(:lsas)
         lsu = new(arg)
-        [lsas].flatten.compact.each do |lsa|
+        lsas.each do |lsa|
           lsa_len = lsa.encode.size
           if (len + lsa_len) > (1476-56-20)
             lsus << lsu
@@ -179,11 +179,13 @@ module OSPFv2
         end
         lsus << lsu
         lsus
+      rescue
+        raise
       end
     end
 
   end
-  
+
 end
 
 load "../../../test/ospfv2/packet/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/lib/packet/ospf_packet.rb

@@ -117,13 +117,15 @@ require 'ie/au_type'
 
 module OSPFv2
   
-  RouterId = Class.new(Id)
-  AreaId   = Class.new(Id)
-  
   class OspfPacket
     include OSPFv2
     include OSPFv2::Common
     
+    unless const_defined?(:RouterId)
+      RouterId = Class.new(Id)
+      AreaId   = Class.new(Id)
+    end
+    
     attr_reader :area_id, :router_id, :version, :ospf_version, :packet_type, :au_type
     attr_writer_delegate :area_id, :router_id, :packet_type, :au_type
     
@@ -204,7 +206,7 @@ module OSPFv2
 
     def method_missing(method, *args, &block)
       if method == :to_s_junos
-        to_s_default(*args)
+        to_s(*args)
       else
         super
       end
@@ -260,11 +262,13 @@ module OSPFv2
     include OSPFv2
     include OSPFv2::Common
     
-    HELLO = 1
-    DATABASE_DESCRIPTION = 2
-    LINK_STATE_REQUEST = 3
-    LINK_STATE_UPDATE = 4
-    LINK_STATE_ACKNOWLEDGMENT = 5
+    unless const_defined?(:HELLO)
+      HELLO = 1
+      DATABASE_DESCRIPTION = 2
+      LINK_STATE_REQUEST = 3
+      LINK_STATE_UPDATE = 4
+      LINK_STATE_ACKNOWLEDGMENT = 5
+    end
     
     class << self
       

data/test/unit/ie/au_type_test.rb

@@ -0,0 +1,18 @@
+
+require "test/unit"
+require 'ie/au_type'
+
+class TestIeAuType < Test::Unit::TestCase
+  include OSPFv2
+  def test_new
+    assert AuType.new
+    assert_equal 'AuType: null authentication', AuType.new(0).to_s
+    assert_equal 'AuType: simple password', AuType.new(1).to_s
+    assert_equal 'AuType: cryptographic authentication', AuType.new(2).to_s
+    assert_equal 'AuType: unknown', AuType.new(3).to_s
+    assert_equal 0, AuType.new(0).to_i
+    assert_equal 1, AuType.new(1).to_i
+    assert_equal 2, AuType.new(2).to_i
+    assert_equal 3, AuType.new(3).to_i
+  end
+end

data/test/unit/ie/external_route_test.rb

@@ -0,0 +1,51 @@
+require "test/unit"
+
+require "ie/external_route"
+
+class TestIeExternalRoute < Test::Unit::TestCase
+  
+  include OSPFv2
+  def tests
+    assert ExternalRoute.new
+    assert_equal '0000000a0000000000000000', ExternalRoute.new( :metric=> 10).to_shex
+    assert_equal '0000000a0000000000000000', ExternalRoute.new( :type=> :e1, :metric=> 10).to_shex
+    assert_equal '8000000a0000000000000000', ExternalRoute.new( :type=> :e2, :metric=> 10).to_shex
+    assert_equal '800000ff0101010100000000', ExternalRoute.new( :type=> :e2, 
+                                                                :metric=> 255, 
+                                                                :forwarding_address => '1.1.1.1').to_shex
+    assert_equal '800000ff01010101000000ff', ExternalRoute.new( :type=> :e2, 
+                                                                :metric=> 255, 
+                                                                :forwarding_address => '1.1.1.1', 
+                                                                :tag=> 255).to_shex
+    assert_equal({:metric=>255, :type=>:e2, :forwarding_address=>"1.1.1.1", :tag=>255}, 
+    h = ExternalRoute.new( :type=> :e2, :metric=> 255, :forwarding_address => '1.1.1.1', :tag=> 255).to_hash )
+    assert_equal h, ExternalRoute.new(h).to_hash
+    assert_equal h, ExternalRoute.new(ExternalRoute.new(h).encode).to_hash
+    
+    ext = ExternalRoute.new(h)
+    assert_equal '800000ff01010101000000ff', ext.to_shex
+    ext2 = ExternalRoute.new(ext)
+    assert_equal '800000ff01010101000000ff', ext2.to_shex
+    
+    ext = ExternalRoute.new(['800000ff01010101000000ff'].pack('H*'))
+    assert_equal 255, ext.tag
+    assert_equal :e2, ext.type
+    assert_equal '1.1.1.1', ext.forwarding_address.to_ip
+    assert_equal 0, ext.mt_id
+  end
+  
+  def test_mt
+    assert_raise(ArgumentError) { MtExternalRoute.new }
+    assert_raise(ArgumentError) { MtExternalRoute.new(:metric=> 10) }
+    assert_raise(ArgumentError) { MtExternalRoute.new(:id=> 0) }
+    assert MtExternalRoute.new(:mt_id=>1)
+    ext = ExternalRoute.new(['810000ff01010101000000ff'].pack('H*'))
+    assert_equal 255, ext.tag
+    assert_equal :e2, ext.type
+    assert_equal '1.1.1.1', ext.forwarding_address.to_ip
+    assert_equal 1, ext.mt_id
+    ext  =  MtExternalRoute.new(MtExternalRoute.new(:mt_id=>10, :tag=>20, :forwarding_address=>'1.1.1.1'))
+    assert_equal ext.to_shex, MtExternalRoute.new(ext).to_shex
+  end
+
+end

data/test/unit/ie/id_test.rb

@@ -0,0 +1,22 @@
+
+require "test/unit"
+require 'ie/id.rb'
+
+class TestIeId < Test::Unit::TestCase
+  include OSPFv2
+  def test_new
+    assert Id.new
+    assert_equal 'Id: 0.0.0.0', Id.new.to_s
+    assert_equal 'Id: 0.0.0.0', Id.new.to_s
+    assert_equal 'Id: 1.1.1.1', Id.new('1.1.1.1').to_s
+    assert_equal 'Id: 1.1.1.1', Id.new(0x01010101).to_s
+    assert_equal 'Id: 1.1.1.1', Id.new(IPAddr.new('1.1.1.1')).to_s
+    assert_equal '0a000001', Id.new(0x0a000001).to_shex
+    assert_equal '0a000001', Id.new(Id.new(Id.new(0x0a000001))).to_shex
+  end
+  def test_new_ntoh
+    assert_equal 'Id: 0.0.0.0', Id.new_ntoh(Id.new.enc).to_s
+    assert_equal 'Id: 1.1.1.1', Id.new_ntoh(Id.new('1.1.1.1').enc).to_s
+  end
+end
+

data/test/unit/ie/interface_mtu_test.rb

@@ -0,0 +1,23 @@
+require "test/unit"
+
+require "ie/interface_mtu"
+
+class TestIeInterfaceMtu < Test::Unit::TestCase
+  include OSPFv2
+  def test_new
+    assert InterfaceMtu
+    assert_equal( '05dc', InterfaceMtu.new.to_shex)
+    assert_equal( 'InterfaceMtu: 1500', InterfaceMtu.new.to_s)
+    assert_equal( 1500, InterfaceMtu.new.to_i)
+    assert_equal( '05c4', InterfaceMtu.new(1476).to_shex)
+    assert_equal( 'InterfaceMtu: 255', InterfaceMtu.new(255).to_s)
+    assert_equal( 255, InterfaceMtu.new(255).to_i)
+    assert_raise(RuntimeError)  { InterfaceMtu.new 0xffffffff }
+    assert_raise(RuntimeError)  { InterfaceMtu.new 0xfffffff }
+    assert_raise(RuntimeError)  { InterfaceMtu.new 0x1ffffff }
+    assert_raise(RuntimeError)  { InterfaceMtu.new( -1) }
+    assert_equal( 'InterfaceMtu: 65535', InterfaceMtu.new(0xffff).to_s)
+    assert_equal( 'ffff', InterfaceMtu.new(0xffff).to_shex)
+    assert_equal( 72, InterfaceMtu.new.number_of_lsa)
+  end
+end

data/test/unit/ie/ls_age_test.rb

@@ -0,0 +1,46 @@
+require "test/unit"
+
+require "ie/ls_age"
+
+class TestIeLsAge < Test::Unit::TestCase
+  include OSPFv2
+  def test_new
+    assert LsAge.new
+    assert_equal( 0, LsAge.new.to_i)
+    assert_equal( 1, LsAge.new(1).to_i)
+  end
+  def test_compare
+    a1 = LsAge.new
+    a2 = LsAge.new(2)
+    assert( ! (a1 == a2), "should not be equal")
+    assert(   (a1 < a2), "a1 is more recent, i.e smaller age")
+  end
+  def test_minus
+    a1 = LsAge.new
+    a2 = LsAge.new(2)
+    assert_equal( -2, a1 - a2)
+    assert_equal(  2, a2 - a1)
+  end
+  def test_maxage
+    a1 = LsAge.new
+    assert_equal( 0, a1.to_i)
+    assert_equal( 3600, a1.maxage)
+    assert( a1.maxaged?, 'should be maxaged!')
+  end
+  def test_aging
+    a1 = LsAge.new(20)
+    sleep 1.1
+    assert_equal( 20, a1.to_i)
+    assert( ! LsAge.aging?)
+    assert_equal( 20, a1.to_i)
+    LsAge.aging :on
+    assert LsAge.aging?
+    assert_equal( 20, a1.to_i)
+    sleep 1.1
+    assert( LsAge.aging?)
+    assert_equal( 21, a1.to_i)
+    LsAge.aging :off
+    assert( ! LsAge.aging?)
+    assert_equal( 20, a1.to_i)
+  end
+end

data/test/unit/ie/ls_type_test.rb

@@ -0,0 +1,41 @@
+
+require "test/unit"
+require 'ie/ls_type'
+
+
+class TestIeLsType < Test::Unit::TestCase
+  include OSPFv2
+  def test_new
+    assert LsType.new :router
+    assert_equal 'LsType: router', LsType.new(:router).to_s
+    assert_equal 'LsType: network', LsType.new(:network).to_s
+    assert_equal 'LsType: summary', LsType.new(:summary).to_s
+    assert_equal 'LsType: asbr_summary', LsType.new(:asbr_summary).to_s
+    assert_equal 'LsType: as_external', LsType.new(:as_external).to_s
+    assert_equal 'LsType: link_local', LsType.new(:link_local).to_s
+    assert_equal 'LsType: domain', LsType.new(:domain).to_s
+    assert_equal 'LsType: area', LsType.new(:area).to_s
+    assert_equal 1, LsType.new(:router).to_i
+    assert_equal 2, LsType.new(:network).to_i
+    assert_equal 3, LsType.new(:summary).to_i
+    assert_equal 4, LsType.new(:asbr_summary).to_i
+    assert_equal 5, LsType.new(:as_external).to_i
+    assert_equal 9, LsType.new(:link_local).to_i
+    assert_equal 10, LsType.new(:area).to_i
+    assert_equal 11, LsType.new(:domain).to_i
+    assert_equal :router, LsType.new(1).to_sym
+    assert_equal :summary, LsType.new(3).to_sym
+    assert_equal :network, LsType.new(2).to_sym
+    assert_equal :asbr_summary, LsType.new(4).to_sym
+    assert_equal :as_external, LsType.new(5).to_sym
+    assert_equal :link_local, LsType.new(9).to_sym
+    assert_equal :area, LsType.new(10).to_sym
+    assert_equal :domain, LsType.new(11).to_sym
+    assert LsType.new(:link_local).is_opaque?
+    assert ! LsType.new(:router).is_opaque?
+    assert LsType.new(:area).is_opaque?
+    assert_equal 'OpaqLoca', LsType.new(:link_local).to_junos
+    assert_equal 'Network', LsType.new(:network).to_junos
+  end
+end
+

data/test/unit/ie/metric_test.rb

@@ -0,0 +1,24 @@
+require "test/unit"
+
+require "ie/metric"
+
+class TestIeMetric < Test::Unit::TestCase
+  include OSPFv2
+  def test_new
+    assert Metric
+    assert_equal( '00000000', Metric.new.to_shex)
+    assert_equal( 'Metric: 0', Metric.new.to_s)
+    assert_equal( 0, Metric.new.to_i)
+    assert_equal( '000000ff', Metric.new(255).to_shex)
+    assert_equal( 'Metric: 255', Metric.new(255).to_s)
+    assert_equal( 255, Metric.new(255).to_i)
+    assert_raise(RuntimeError)  { Metric.new 0xffffffff }
+    assert_raise(RuntimeError)  { Metric.new 0xfffffff }
+    assert_raise(RuntimeError)  { Metric.new 0x1ffffff }
+    assert_raise(RuntimeError)  { Metric.new( -1) }
+    assert_equal( 'Metric: 16777215', Metric.new(0x0ffffff).to_s)
+    assert_equal( 'Topology default (ID 0) -> Metric: 16777215', Metric.new(0x0ffffff).to_s_junos)
+    assert_equal( '000fffff', Metric.new(0xfffff).to_shex)
+    assert_equal( 'ffff', Metric.new(0xfffff).to_shex('n'))
+  end
+end

data/test/unit/ie/mt_metric_test.rb

@@ -0,0 +1,27 @@
+require "test/unit"
+require "ie/mt_metric"
+
+class TestIeMtMetric < Test::Unit::TestCase
+  include OSPFv2
+  def tests
+    assert MtMetric.new
+    assert_equal '00000000', MtMetric.new.to_shex
+    assert_equal 'Topology 0, Metric 0', MtMetric.new.to_s
+    assert_equal '01000001', MtMetric.new(:id => 1, :metric => 1).to_shex
+    assert_equal '01ffffff', MtMetric.new(:id => 1, :metric => 0xffffff).to_shex
+    assert_equal '01ffffff', MtMetric.new(:id => 1, :metric => 0xffffffff).to_shex
+    assert_equal 1, MtMetric.new(:id => 1, :metric => 0xffffffff).id
+    assert_equal 4294967295, MtMetric.new(:id => 1, :metric => 0xffffffff).metric
+    assert_equal( {:id=>1, :metric=>1}, MtMetric.new(:id => 1, :metric => 1).to_hash)
+    assert_equal( 'Topology 1, Metric 1', MtMetric.new(:id => 1, :metric => 1).to_s)
+    assert_equal( 'Topology 1, Metric 1', MtMetric.new(:id => 1, :metric => 1).to_s)
+    assert_equal( 'Topology 1, Metric 1', MtMetric.new([1,1]).to_s)
+    assert_equal 'Topology (ID 1) -> Metric: 1', MtMetric.new([1,1]).to_s_junos
+    assert_equal MtMetric.new([1,1]).to_shex, MtMetric.new(MtMetric.new([1,1])).to_shex
+    m = MtMetric.new(['01ffffff'].pack('H*'))
+    assert_equal '01ffffff', m.to_shex
+    assert_equal 1, m.id
+    assert_equal 1, m.id
+    assert_equal 0xffffff, m.metric
+  end
+end

data/test/unit/ie/opaque_id_test.rb

@@ -0,0 +1,22 @@
+require "test/unit"
+
+require "ie/opaque_id"
+
+class TestIeOpaqueId < Test::Unit::TestCase
+  include OSPFv2
+  def test_new
+    assert OpaqueId.new
+    assert_equal( '000000', OpaqueId.new.to_shex)
+    assert_equal( 'OpaqueId: 0', OpaqueId.new.to_s)
+    assert_equal( 0, OpaqueId.new.to_i)
+    assert_equal( '0000ff', OpaqueId.new(255).to_shex)
+    assert_equal( 'OpaqueId: 255', OpaqueId.new(255).to_s)
+    assert_equal( 255, OpaqueId.new(255).to_i)
+    assert_raise(RuntimeError)  { OpaqueId.new 0xffffffff }
+    assert_raise(RuntimeError)  { OpaqueId.new 0xfffffff }
+    assert_raise(RuntimeError)  { OpaqueId.new 0x1ffffff }
+    assert_raise(RuntimeError)  { OpaqueId.new( -1) }
+    assert_equal( 'OpaqueId: 16777215', OpaqueId.new(0x0ffffff).to_s)
+    assert_equal( '0fffff', OpaqueId.new(0xfffff).to_shex)
+  end
+end