ospfv2 0.0.2 → 0.0.3

data/lib/lsa/network.rb

@@ -93,7 +93,7 @@ class Network < Lsa
   
   def initialize(arg={})
     @network_mask, @attached_routers = nil, []
-    @ls_type = LsType.new(:network_lsa)
+    @ls_type = LsType.new(:network)
     super
   end
   
@@ -135,20 +135,55 @@ class Network < Lsa
   #    NetworkMask: 255.255.255.0
   #    AttachRouter: 192.168.1.200
   #    AttachRouter: 193.0.0.0
-  def to_s_default(*args)
+  # FIXME:
+  #  when not verbose, only header is displayed and this is taken care of by parent method
+  def to_s_verbose(*args)
     super  +
     ['', network_mask, *attached_routers].join("\n   ")
   end
-  
-  # Network *192.168.1.200    192.168.1.200    0x80000001    98  0x22 0x2dc   32
-  #   mask 255.255.255.0
-  #   attached router 192.168.1.200
-  #   attached router 193.0.0.0
+  #   
+  # R1#show ip ospf database network 
   # 
-  def to_s_junos
-    super
+  #             OSPF Router with ID (1.1.1.1) (Process ID 1)
+  # 
+  #                 Net Link States (Area 0)
+  # 
+  #   Routing Bit Set on this LSA
+  #   LS age: 949
+  #   Options: (No TOS-capability, DC)
+  #   LS Type: Network Links
+  #   Link State ID: 192.168.0.2 (address of Designated Router)
+  #   Advertising Router: 2.2.2.2
+  #   LS Seq Number: 8000000E
+  #   Checksum: 0xF9B3
+  #   Length: 32
+  #   Network Mask: /24
+  #         Attached Router: 2.2.2.2
+  #         Attached Router: 1.1.1.1
+  # 
+  # R1#
+  # def to_s_ios
+  #   attrs = attached_routers.collect { |ar| "      Attached Router #{ar.to_ip}"}
+  #   s = []
+  #   s << super
+  #   s << "Network Mask: " + network_mask.to_s(false)
+  #   s << attached_routers.collect { |ar| "      Attached Router #{ar.to_ip}"}
+  #   s.join("\n")
+  # end
+  def to_s_ios_verbose
+    attrs = attached_routers.collect { |ar| "      Attached Router #{ar.to_ip}"}
+    s = []
+    s << super
+    s << "Network Mask: " + network_mask.to_s(false)
+    s << attached_routers.collect { |ar| "      Attached Router #{ar.to_ip}"}
+    s.join("\n  ")
   end
 
+  # FIXME: should be removed and parent take care of it.
+  # def to_s_junos
+  #   super
+  # end
+
   def to_s_junos_verbose
     mask = "mask #{network_mask.to_ip}"
     attrs = attached_routers.collect { |ar| "attached router #{ar.to_ip}"}

data/lib/lsa/router.rb

@@ -205,7 +205,7 @@ module OSPFv2
       super
       @links=[]
       @nwveb ||=0
-      @ls_type = LsType.new(:router_lsa)
+      @ls_type = LsType.new(:router)
       
       # arg.merge!({:ls_type => 1}) if arg.is_a?(Hash)
       [[:abr,1],[:asbr,2],[:vl,4],[:wild,8],[:nssa,16]].each { |x| def_bit(*x) } unless respond_to? :set_abr
@@ -242,7 +242,7 @@ module OSPFv2
       end
     end
 
-    def to_s_default
+    def to_s_verbose
       super  +
       ['', nwveb_to_s, *links.collect {|x| x.to_s }].join("\n   ")
     end
@@ -251,6 +251,18 @@ module OSPFv2
       super
     end
 
+    def to_s_ios
+      super + links.size.to_s
+    end
+    
+    def to_s_ios_verbose
+      s = []
+      s << super
+      s << "Number of Links: #{links.size.to_s}"
+      s << links.collect {|l| l.to_s_ios_verbose }.join
+      s.join("\n  ")
+    end
+
     def to_s_junos_verbose
       link_hdr = "  bits 0x#{nwveb.to_i}, link count #{links.size}"
       links_to_s = links.collect {|link| link.to_s_junos }

data/lib/lsa/summary.rb

@@ -38,7 +38,7 @@ module OSPFv2
     attr_reader :metric, :netmask, :mt_metrics
     
     def initialize(type, arg={})
-      @netmask=nil
+      @netmask=Netmask.new(0)
       @metric=nil
       @mt_metrics=[]
       @ls_type = LsType.new(type)
@@ -68,16 +68,29 @@ module OSPFv2
       super
     end
     
-    def to_s_default(*args)
+    def to_s_verbose
       super  +
       ['',netmask, metric, *mt_metrics].collect { |x| x.to_s }.join("\n   ")
     end
     
+    def to_s_ios_verbose
+      s = []
+      s << super
+      s << "Network Mask: " + netmask.to_s(false)
+      s << "      TOS 0 Metrics: #{metric.to_i}"
+      s << @mt_metrics.collect { |mt| "\n      #{mt.to_s}" }.join unless @mt_metrics.empty?
+      s.join("\n  ")
+    end
+    
     def to_s_junos_verbose
       mask = "mask #{netmask.to_ip}"
       super +
       ['', mask, metric.to_s_junos, *mt_metrics.collect{|m| m.to_s_junos}].join("\n  ")
+    rescue
+      p netmask
+      p self
     end
+    
     def to_s_junos
       super
     end
@@ -117,7 +130,7 @@ module OSPFv2
     def initialize(arg={})
       case arg
       when Hash
-        arg = fix_hash(arg).merge!({:ls_type => :summary_lsa,})
+        arg = fix_hash(arg).merge!({:ls_type => :summary,})
       end
       super 3, arg
     end

data/lib/lsa/tlv/color.rb

@@ -0,0 +1,47 @@
+#--
+# Copyright 2011 Jean-Michel Esnault.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#
+#
+# This file is part of OSPFv2.
+# 
+#++
+
+require_relative 'tlv'
+
+module OSPFv2
+
+  class Color_Tlv
+    include SubTlv
+    include Common
+
+    attr_reader :tlv_type, :color
+
+    def initialize(arg={})
+      @tlv_type = 9
+      @color = 0
+
+      if arg.is_a?(Hash) then
+        set(arg.dup)
+      elsif arg.is_a?(String)
+        __parse(arg)
+      else
+        raise ArgumentError, "Invalid argument", caller
+      end
+    end
+
+    def encode
+      [@tlv_type, 4, @color].pack('nnN')
+    end
+
+    def __parse(s)
+      @tlv_type, _, @color = s.unpack('nnN')
+    end
+
+    def to_s
+      self.class.to_s + ": " + color.to_s
+    end
+
+  end
+end

data/lib/lsa/tlv/link.rb

@@ -0,0 +1,122 @@
+#--
+# Copyright 2011 Jean-Michel Esnault.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#
+#
+# This file is part of OSPFv2.
+# 
+#++
+
+require_relative 'tlv'
+
+module OSPFv2
+
+  class Link_Tlv
+    include Tlv
+    include Tlv::Common
+    include Common
+    
+    attr_reader :tlv_type, :_length, :tlvs
+    
+    def initialize(arg={})
+      @tlv_type = 2
+      @tlvs = []
+      if arg.is_a?(Hash) then
+        if arg.has_key?(:tlvs)
+          @tlvs = arg[:tlvs].collect { |h| SubTlv.factory(h) }
+        end
+      elsif arg.is_a?(String)
+        __parse(arg)
+      else
+        raise ArgumentError, "Invalid argument", caller
+      end
+    end
+    
+    def has?(klass=nil)
+      if klass.nil?
+        return tlvs.collect { |tlv| tlv.class }
+      else
+        return tlvs.find { |tlv| tlv.is_a?(klass) }.nil? ? false : true
+      end
+    end    
+
+    def find(klass)
+      tlvs.find { |a| a.is_a?(klass) }
+    end
+
+    def __index(klass)
+      i=-1
+      tlvs.find { |a| i +=1 ; a.is_a?(klass) }
+      i
+    end
+    private :__index
+
+    def replace(*objs)
+      objs.each do |obj|  
+        if has?(obj.class)
+          index = __index(obj.class)
+          tlvs[index]=obj
+        else
+          add(obj)
+        end
+      end
+      self
+    end
+
+    def remove(klass) 
+      tlvs.delete_if { |a| a.is_a?(klass) }
+    end
+
+    def [](klass)
+      find(klass)
+    end
+
+    def add(obj)
+      if obj.is_a?(OSPFv2::SubTlv)
+        @tlvs << obj
+      else
+        raise
+      end
+      self
+    end
+    
+    def <<(obj)
+      add(obj)
+    end
+
+    def encode
+      tlvs = encoded_tlvs
+      [@tlv_type, tlvs.size, tlvs].pack('nna*')
+    end
+
+    def __parse(s)
+      @tlv_type, @_length, tlvs = s.unpack('nna*')
+      while tlvs.size>0
+        _, len = tlvs.unpack('nn')
+        @tlvs << SubTlv.factory(tlvs.slice!(0,stlv_len(len)))
+      end
+    end
+
+    def encoded_tlvs
+      tlvs.collect { |tlv| tlv.encode }.join
+    end
+    
+    def _length
+      encoded_tlvs.size
+    end
+    
+    def to_s_ios
+      #TODO
+      tlvs.collect { |tlv| tlv.to_s }.join("\n  ")
+    end
+
+    def to_s(args={})
+      ident = [' ']* (args[:ident] || 0)
+      "Link TLV (#{tlv_type}), length: #{encoded_tlvs.size}" +
+      ['',tlvs].flatten.collect { |tlv| tlv.to_s }.join("\n#{ident}")
+    end
+
+  end
+end
+

data/lib/lsa/tlv/link_id.rb

@@ -0,0 +1,55 @@
+#--
+# Copyright 2011 Jean-Michel Esnault.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#
+#
+# This file is part of OSPFv2.
+# 
+#++
+
+require_relative 'tlv'
+
+module OSPFv2
+
+  class LinkId_Tlv
+    include SubTlv
+    include Common
+
+    LinkId = Class.new(Id) unless const_defined?(:LinkId)
+    attr_reader :tlv_type, :link_id
+
+    attr_writer_delegate :link_id
+
+    def initialize(arg={})
+      @tlv_type  = 2
+      @link_id = LinkId.new
+
+      if arg.is_a?(Hash) then
+        set(arg.dup)
+      elsif arg.is_a?(String)
+        __parse(arg)
+      else
+        raise ArgumentError, "Invalid argument", caller
+      end
+    end
+
+    def encode
+      [@tlv_type, 4, @link_id.encode].pack('nna*')
+    end
+
+    def __parse(s)
+      @tlv_type, _, link_id = s.unpack('nna*')
+      @link_id = LinkId.new_ntoh(link_id)
+    end
+
+    def to_s
+      "Link ID : " + link_id.to_ip
+    end
+
+    def to_s_junos_style(ident=0)
+      "  "*ident + "RtrAddr (1), length #{@length}: #{router_id.to_ip}"
+    end
+
+  end
+end

data/lib/lsa/tlv/link_type.rb

@@ -0,0 +1,44 @@
+#--
+# Copyright 2011 Jean-Michel Esnault.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#
+#
+# This file is part of OSPFv2.
+# 
+#++
+
+require_relative 'tlv'
+
+module OSPFv2
+  class LinkType_Tlv
+    @link_type = { 1=> :p2p, 2=> :multiaccess }
+    class << self
+      def type_to_s(arg)
+        "#{@link_type[arg]}"
+      end
+    end
+    include SubTlv
+    include Common
+    attr_reader :tlv_type, :link_type
+    def initialize(arg={})
+      @tlv_type, @link_type = 1,1
+      if arg.is_a?(Hash) then
+        set(arg.dup)
+      elsif arg.is_a?(String)
+        __parse(arg)
+      else
+        raise ArgumentError, "Invalid argument", caller
+      end
+    end
+    def encode
+      [@tlv_type, 1, @link_type,0,0,0].pack('nnCC3')
+    end
+    def __parse(s)
+      @tlv_type, _, @link_type= s.unpack('nnC')
+    end
+    def to_s
+      "Link Type : #{LinkType_Tlv.type_to_s(link_type)}"
+    end
+  end
+end

data/lib/lsa/tlv/local_interface.rb

@@ -0,0 +1,56 @@
+#--
+# Copyright 2011 Jean-Michel Esnault.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#
+#
+# This file is part of OSPFv2.
+# 
+#++
+
+require_relative 'tlv'
+
+module OSPFv2
+
+  class LocalInterfaceIpAddress_Tlv
+    include SubTlv
+    include Common
+
+    IpAddress = Class.new(Id) unless const_defined?(:IpAddress)
+    attr_reader :tlv_type, :ip_address
+
+    attr_writer_delegate :ip_address
+
+    def initialize(arg={})
+      @tlv_type = 3
+      @ip_address = IpAddress.new
+
+      if arg.is_a?(Hash) then
+        set(arg.dup)
+      elsif arg.is_a?(String)
+        __parse(arg)
+      else
+        raise ArgumentError, "Invalid argument", caller
+      end
+    end
+
+    def encode
+      [@tlv_type, 4, @ip_address.encode].pack('nna*')
+    end
+
+    def __parse(s)
+      @tlv_type, _, ip_address = s.unpack('nna*')
+      @ip_address = IpAddress.new_ntoh(ip_address)
+    end
+
+
+    def to_s
+      "Interface Address : #{ip_address.to_ip}"
+    end
+
+    def to_s_junos_style(ident=0)
+      "  "*ident + "RtrAddr (1), length #{@length}: #{router_id.to_ip}"
+    end
+
+  end
+end