ospfv2 0.0.1 → 0.0.2

data/lib/neighbor/neighbor.rb

@@ -43,7 +43,6 @@ module OSPFv2
         @logger = Logger.new(io)
       end
       def trace(s)
-         "{Time.to_ts} #{s}"
         @logger << s
       end
     end
@@ -71,7 +70,7 @@ module OSPFv2
       @router_id= RouterId.new arg[:router_id] || '1.1.1.1'
       @area_id= AreaId.new arg[:aread_id] || '0.0.0.0'
       @lsa_request_list = {}
-      @ls_db=nil
+      @ls_db, @ev = nil, nil
       if arg[:log_fname]
         @trace = Trace.new(arg[:log_fname])
       else
@@ -113,6 +112,9 @@ module OSPFv2
         s << "\n"
         @trace.trace s.join
       end
+    rescue => e
+      p e
+      raise
     end
 
     def debug(obj)
@@ -169,21 +171,34 @@ module OSPFv2
     end
     
     def update(*args)
-      @evQ.enq *args
+      @evQ.enq(*args)
     end
     def send(packet, dest=OSPFv2::AllSPFRouters)
+      # p "about to send 111111 #{packet.class} "
+      # p "@output? #{@output ? true : false} #{packet.class}"
+      # p @output
+      # p "--------------"
       return unless @output
-      [packet].flatten.each { |p| 
-        log :snd, p
-        @output.enq [p,dest]
-      }
+      case packet
+      when Array
+        # p "WE HAVE AN ARRAY OF PACKET!"
+        packet.each { |p| 
+          # p "about to send p 333333 #{p.inspect}"
+          # log :snd, p
+          @output.enq [p,dest]
+        }
+      else
+        log :snd, packet
+        # p "about to send packet 333333 #{packet.inspect}"
+        @output.enq [packet,dest]
+        # p "about to send 333333 #{packet.inspect}"
+      end
     end
     
     # AllSPFRouters = "224.0.0.5"
     # AllDRouters = "224.0.0.6"
     def flood(lsas, dest=AllSPFRouters)
-      # return unless @output
-      send (LinkStateUpdate.new_lsas lsas), dest
+      send LinkStateUpdate.new_lsas(lsas), dest
     end
     
     def start_periodic_hellos

data/lib/neighbor/recv_hello.rb

@@ -30,11 +30,6 @@ module OSPFv2
       debug "rescued #{e.inspect}"
     end
 
-    def recv_link_state_request(ls_request, from, port)
-      #TODO: check what address the LSU shoul be send to ? unicast ? AllDRouteres ? AllSpfRouters ?
-      send ls_request.to_lsu(@ls_db, :area_id=> @aread_id, :router_id => @router_id), from 
-    end
-    
     def recv_link_state_update(ls_update, from, port)
       ls_ack = LinkStateAck.ack_ls_update ls_update, :area_id=> @area_id, :router_id=> @router_id
       send ls_ack, OSPFv2::AllDRouters #from

data/lib/neighbor/recv_ospf_packet.rb

@@ -34,7 +34,6 @@ module OSPFv2
     end
 
     def recv_link_state_request(ls_request, from, port)
-      #TODO: check what address the LSU shoul be send to ? unicast ? AllDRouteres ? AllSpfRouters ?
       send ls_request.to_lsu(@ls_db, :area_id=> @aread_id, :router_id => @router_id), from 
     end
     
@@ -52,7 +51,7 @@ module OSPFv2
           end
         }
         new_state Full.new, 'loading_done' if @ls_req_list.empty?
-       end
+      end
       @ls_db.recv_link_state_update ls_update if @ls_db
     end
     

data/lib/neighbor_sm/exstart_state.rb

@@ -23,33 +23,30 @@
 require 'neighbor_sm/neighbor_state'
 module OSPFv2
   module NeighborState
-    
+
     class ExStart < State
       def initialize(n)
         @neighbor = n
-         n.instance_eval do
+        n.instance_eval do
           @last_dd_seqn = n.dd_sequence_number
-          
+
           #-- could be a State#reset method inherited ?
           @ls_db.reset if @ls_db
           @ls_req_list={}
           @periodic_refresh.cancel
           @periodic_rxmt.cancel
           #--
-          
+
           @last_dd_seqn = dd_sequence_number
           raise unless @last_dd_seqn>0
-          
-          p "***"
-          p @last_dd_seqn
-          
+
           dd = DatabaseDescription.new :router_id=> @router_id, :area_id=> @area_id, 
-                                        :imms=>7, :dd_sequence_number => @last_dd_seqn
+          :imms=>7, :dd_sequence_number => @last_dd_seqn
           send_dd dd, true
         end
-        
+
       end
-      
+
       def negotiation_done
         @neighbor.instance_eval do
           dd_rxmt_interval.cancel
@@ -58,7 +55,7 @@ module OSPFv2
       end
 
       def adj_ok?
-         if ! ok
+        if ! ok
           change_state(@neighbor, Two_way.new)
         end
 

data/lib/neighbor_sm/init_state.rb

@@ -23,21 +23,19 @@
 require 'neighbor_sm/neighbor_state'
 module OSPFv2
   module NeighborState
-    
+
     class Init < State
 
-      # recv_hello inherited
-      
       def recv_hello(neighbor, hello, *args)
-         super
-         two_way_received(neighbor) if hello.has_neighbor?(neighbor.router_id)
-       end
+        super
+        two_way_received(neighbor) if hello.has_neighbor?(neighbor.router_id)
+      end
 
       def two_way_received(neighbor, *args)
         change_state(neighbor, ExStart.new(neighbor), 'two_way_received' )
       end
     end
-    
+
   end
 end
 

data/lib/packet/database_description.rb

@@ -120,8 +120,6 @@ require 'ls_db/link_state_database'
 
 module OSPFv2
   
-  
-  
   class DatabaseDescription < OspfPacket
     
     class << self
@@ -149,6 +147,7 @@ module OSPFv2
       @interface_mtu = InterfaceMtu.new
       @options = Options.new
       @imms, @dd_sequence_number, @number_of_lsa=0, nil, nil
+      @lsas=[]
 
       if arg.is_a?(Hash)
         arg.merge!({:packet_type=>:dd})
@@ -168,7 +167,7 @@ module OSPFv2
       s << super(:brief)
       s << "MTU #{interface_mtu.to_i}, Options 0x#{options.to_i.to_s(16)}, #{imms_to_s}, DD_SEQ: 0x#{dd_sequence_number_to_shex}"
       s << "Age  Options  Type    Link-State ID   Advr Router     Sequence   Checksum  Length" if @lsas
-      s <<((@lsas.collect { |x| x.to_s_dd })).join("\n ") if @lsas
+      s << ((@lsas.collect { |x| x.to_s_dd })).join("\n ") if @lsas
       s.join("\n ")
     end
 
@@ -268,8 +267,10 @@ module OSPFv2
       dd_sequence_number.to_s(16)
     end
     
-    def parse(s)
-      interface_mtu, options, @imms, @dd_sequence_number, headers = super(s).unpack('nCCNa*')
+    def parse(_s)
+      s = super(_s)
+      db, _ = s.unpack("a#{@_packet_len-24}a*")
+      interface_mtu, options, @imms, @dd_sequence_number, headers = db.unpack('nCCNa*')
       self.options = Options.new options
       @interface_mtu = InterfaceMtu.new interface_mtu
       @lsas ||=[]
@@ -280,8 +281,7 @@ module OSPFv2
     end
     
     def number_of_lsa
-      #FIXME: rename interface mtu method...
-      @number_of_lsa ||=interface_mtu.n0flsa
+      @number_of_lsa ||=interface_mtu.number_of_lsa
     end
     
     def set(arg)

data/lib/packet/hello.rb

@@ -189,7 +189,7 @@ module OSPFv2
     
     attr_reader :netmask, :designated_router_id, :backup_designated_router_id
     attr_reader :hello_interval, :options, :rtr_pri, :router_dead_interval, :neighbors
-    attr_writer_delegate :designated_router_id, :backup_designated_router_id, :neighbors
+    attr_writer_delegate :designated_router_id, :backup_designated_router_id
     
     class Neighbors
       Neighbor = Class.new(OSPFv2::Id)
@@ -241,7 +241,6 @@ module OSPFv2
         @neighbors = nil
         @hello_interval, @router_dead_interval = 10, 40
         set arg
-        
       elsif arg.is_a?(String)
         parse arg
       elsif arg.is_a?(Hello)
@@ -268,10 +267,6 @@ module OSPFv2
       self.neighbors = hello.router_id.to_hash
     end
 
-    def to_s
-      super
-    end
-
     def to_s_verbose
       super +
       [@netmask, @options, rtr_pri_to_s, @designated_router_id, @backup_designated_router_id, neighbors_to_s].collect { |x| x.to_s }.join("\n ")
@@ -300,7 +295,6 @@ module OSPFv2
     
     private
     
-    
     def neighbors_to_s
       ["Neighbors:", neighbors.collect { |x| x.to_s(nil) } ].join("\n  ")
     end
@@ -308,15 +302,17 @@ module OSPFv2
       ["Neighbors:", neighbors.collect { |x| x.to_s(nil) } ].join("\n  ")
     end
     
-    def parse(s)
-      netmask, @hello_interval, options, @rtr_pri, @router_dead_interval, dr, bdr, neighbors = super(s).unpack('NnCCNNNa*')
+    def parse(_s)
+      s = super(_s)
+      hello, _ = s.unpack("a#{@_packet_len-24}a*")
+      netmask, @hello_interval, options, @rtr_pri, @router_dead_interval, dr, bdr = hello.slice!(0,20).unpack('NnCCNNN')
       @netmask = Netmask.new netmask
       @options = Options.new options
       @designated_router_id = DesignatedRouterId.new dr
       @backup_designated_router_id = BackupDesignatedRouterId.new bdr
-      @neighbors ||=Hello::Neighbors.new
-      while neighbors.size>0
-        self.neighbors= neighbors.slice!(0,4).unpack('N')[0]
+      @neighbors ||=Hello::Neighbors.new      
+      while hello.size>0
+        self.neighbors= hello.slice!(0,4).unpack('N')[0]
       end
     end
     
@@ -325,3 +321,89 @@ module OSPFv2
 end
 
 load "../../../test/ospfv2/packet/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+
+
+__END__
+
+0201002c
+01010101
+00000000
+8be60000
+00000000
+00000000
+
+ffffff00
+000a1201
+00000028
+c0a89e0d
+00000000
+
+
+fff600030001000400000001
+
+>> ["0201002c01010101000000008be600000000000000000000ffffff00000a120100000028c0a89e0d00000000fff600030001000400000001"]
+["ffffff00000a120100000028c0a89e0d00000000fff600030001000400000001"]
+44
+["0001000400000001"]
+[""]
+
+
+   Source: 192.168.158.13 (192.168.158.13)
+    Destination: 224.0.0.5 (224.0.0.5)
+Open Shortest Path First
+    OSPF Header
+        OSPF Version: 2
+        Message Type: Hello Packet (1)
+        Packet Length: 44
+        Source OSPF Router: 1.1.1.1 (1.1.1.1)
+        Area ID: 0.0.0.0 (Backbone)
+        Packet Checksum: 0x8be6 [correct]
+        Auth Type: Null
+        Auth Data (none)
+    OSPF Hello Packet
+        Network Mask: 255.255.255.0
+        Hello Interval: 10 seconds
+        Options: 0x12 (L, E)
+            0... .... = DN: DN-bit is NOT set
+            .0.. .... = O: O-bit is NOT set
+            ..0. .... = DC: Demand circuits are NOT supported
+            ...1 .... = L: The packet contains LLS data block
+            .... 0... = NP: Nssa is NOT supported
+            .... .0.. = MC: NOT multicast capable
+            .... ..1. = E: ExternalRoutingCapability
+        Router Priority: 1
+        Router Dead Interval: 40 seconds
+        Designated Router: 192.168.158.13
+        Backup Designated Router: 0.0.0.0
+    OSPF LLS Data Block
+        Checksum: 0xfff6
+        LLS Data Length: 12 bytes
+        Extended options TLV
+            Type: 1
+            Length: 4
+            Options: 0x00000001 (LR)
+                .... .... .... .... .... .... .... ..0. = RS: Restart Signal (RS-bit) is NOT set
+                .... .... .... .... .... .... .... ...1 = LR: LSDB Resynchronization (LR-bit) is SET
+
+
+0000  01 00 5e 00 00 05 cc 00 09 41 00 10 08 00 45 c0   ..^......A....E.
+0010  00 4c 1b 86 00 00 01 59 5e 58 c0 a8 9e 0d e0 00   .L.....Y^X......
+0020  00 05 02 01 00 2c 01 01 01 01 00 00 00 00 8b e6   .....,..........
+0030  00 00 00 00 00 00 00 00 00 00 ff ff ff 00 00 0a   ................
+0040  12 01 00 00 00 28 c0 a8 9e 0d 00 00 00 00 ff f6   .....(..........
+0050  00 03 00 01 00 04 00 00 00 01                     ..........
+
+
+2c
+
+
+      02 01 00 2c 01 01 01 01 00 00 00 00 8b e6    14
+00 00 00 00 00 00 00 00 00 00 ff ff ff 00 00 0a    16 30
+12 01 00 00 00 28 c0 a8 9e 0d 00 00 00 00 ff f6    16 46
+00 03 00 01 00 04 00 00 00 01                      10 56
+
+
+
+
+
+

data/lib/packet/link_state_ack.rb

@@ -79,7 +79,7 @@ module OSPFv2
     attr_accessor :lsa_headers
     
     def self.ack_ls_update(lsu, *args)
-      ls_ack = new *args
+      ls_ack = new(*args)
       ls_ack.lsa_headers = lsu.lsas
       ls_ack
     end
@@ -125,7 +125,7 @@ module OSPFv2
       headers = super(s)
       while headers.size>0
         lsa = Lsa.new headers.slice!(0,20)
-        @lsa_headers <<lsa
+        @lsa_headers << lsa
       end
     end
 

data/lib/packet/link_state_update.rb

@@ -167,7 +167,7 @@ module OSPFv2
         lsas = arg[:lsas]
         arg.delete(:lsas)
         lsu = new(arg)
-        lsas.flatten.compact.each do |lsa|
+        [lsas].flatten.compact.each do |lsa|
           lsa_len = lsa.encode.size
           if (len + lsa_len) > (1476-56-20)
             lsus << lsu

data/lib/packet/ospf_packet.rb

@@ -147,6 +147,7 @@ module OSPFv2
       else
         raise ArgumentError, "Invalid argument", caller
       end
+      @_len=nil
     end
     
     def encode(payload='',router_id=@router_id)
@@ -167,7 +168,7 @@ module OSPFv2
   # Version 2, RouterId 0.0.0.1, AreaId 0.0.0.0, AuType 0, Checksum 0x9580, len 9999
 
     def to_s_brief
-      encode unless @_len
+      encode
       "Version #{ospf_version.to_i}, RouterId #{router_id.to_ip}, AreaId #{area_id.to_ip}, Checksum #{0}, len #{@_len}"
     end
   
@@ -202,8 +203,6 @@ module OSPFv2
     end
 
     def method_missing(method, *args, &block)
-      puts "Method missing in #{self.class}: method: #{method}"
-
       if method == :to_s_junos
         to_s_default(*args)
       else
@@ -212,8 +211,7 @@ module OSPFv2
     end
 
     def to_hash(verbose=false)
-      #FIXME: verbose not working, i.e. always false
-      encode if verbose
+      encode
       h = super()
       h.delete(:authentication) if @authentication==''
       h.delete(:csum) unless verbose
@@ -234,6 +232,7 @@ module OSPFv2
       @router_id = RouterId.new(rid)
       @area_id = AreaId.new(aid)
       @au_type = AuType.new(au_type)
+      @_packet_len = len
       packet
     end
     

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ospfv2
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jean Michel Esnault
@@ -14,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 -07:00
-default_executable: 
+date: 2011-04-16 00:00:00 Z
 dependencies: []
 
 description: 
-email: jme@spidercloud.com
+email: ospfv2@esnault.org
 executables: 
 - ospfv2
 extensions: []
@@ -58,10 +58,13 @@ files:
 - lib/ls_db/links.rb
 - lib/lsa/external.rb
 - lib/lsa/lsa.rb
+- lib/lsa/lsa_base.rb
 - lib/lsa/lsa_factory.rb
 - lib/lsa/network.rb
+- lib/lsa/opaque.rb
 - lib/lsa/router.rb
 - lib/lsa/summary.rb
+- lib/lsa/tlv/tlv.rb
 - lib/neighbor/neighbor.rb
 - lib/neighbor/neighbor_event_handler.rb
 - lib/neighbor/recv_database_description.rb
@@ -81,7 +84,8 @@ files:
 - lib/packet/link_state_request.rb
 - lib/packet/link_state_update.rb
 - lib/packet/ospf_packet.rb
-has_rdoc: true
+- changelog.txt
+- bin/ospfv2
 homepage: 
 licenses: []
 
@@ -92,23 +96,27 @@ require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: An OSPFv2 Emulator.