bgp4r 0.0.13 → 0.0.14

data/bgp/path_attributes/extended_community.rb

@@ -34,15 +34,21 @@ module BGP
     OSPF_DOMAIN_ID = 5
     OSPF_ROUTER_ID = 7
     BGP_DATA_COLLECT = 8
+    COLOR = 11
+    ENCAPSULATION = 12
 
-    IANA_AUTHORITY_BIT = 0x8
-    NON_TRANSITIVE = 0x4    
+    IANA_AUTHORITY_BIT = 0x80
+    TRANSITIVE = 0x0    
+    NON_TRANSITIVE = 0x40    
 
     TWO_OCTET_AS = 0
     IPV4_ADDR = 1
     OPAQUE = 3
     FLOAT = -1
     
+    DEFAULT_OPAQUE_ENCODING = 'H12'
+    
+    
     def encode
       [@type, @subtype, _encoded_value_].pack('CCa6')
     end
@@ -54,7 +60,14 @@ module BGP
       when IPV4_ADDR
         @global, @local = s.unpack('Nn')
       when OPAQUE
-        @global = s.unpack('H12')
+        case self
+        when Color
+          _,@global = s.unpack('nN')
+        when Encapsulation
+          _,@global = s.unpack('Nn')
+        else
+          @global = s.unpack('H12')
+        end
       when FLOAT
         _, @global = s.unpack('ng')
       end
@@ -112,23 +125,36 @@ module BGP
     def name
       self.class.to_s.split('::').last.gsub('_',' ')
     end
-
     def to_s
+      "#{name}: #{value}"
+    end
+
+    private
+
+    def value
       case community_structure
       when TWO_OCTET_AS
-        "#{name}: #{@global}:#{@local}"
+        "#{@global}:#{@local}"
       when IPV4_ADDR
-        "#{name}: #{IPAddr.create(@global)}:#{@local}"
+        "#{IPAddr.create(@global)}:#{@local}"
       when OPAQUE
-        "#{name}: #{@global}"
+        "#{@global}"
       when FLOAT
-        "#{name}: #{[@global].pack('g').unpack('g')[0]}"
+        "#{[@global].pack('g').unpack('g')[0]}"
       else
         raise RuntimeError, "bogus type: #{@type}"
       end
+      
     end
 
-    private
+    def value2
+      case community_structure
+      when FLOAT ; @global
+      when IPV4_ADDR ;  ["#{IPAddr.create(@global)}",@local]
+      else 
+        [@global, @local]
+      end
+    end
 
     def community_structure
       cs = @type & 3
@@ -143,7 +169,14 @@ module BGP
       when IPV4_ADDR
         [@global, @local].pack('Nn')
       when OPAQUE
-        [@global].pack('H12')
+        case self
+        when BGP::Color
+          [0,@global].pack('nN')
+        when BGP::Encapsulation
+          [0,@global].pack('Nn')
+        else
+          [@global].pack('H12')
+        end
       when FLOAT
         [0,@global].pack('ng')
       else
@@ -172,8 +205,10 @@ module BGP
       when OSPF_ROUTER_ID   ; Ospf_router_id.new(s)
       when BGP_DATA_COLLECT ; Bgp_data_collect.new(s)
       when LINK_BANDWIDTH   ; Link_bandwidth.new(s)
+      when COLOR            ; Color.new(s)
+      when ENCAPSULATION    ; Encapsulation.new(s)
       else
-        puts "too bad type #{type}, subtype #{subtype} : #{s.unpack('H*')}"
+        puts "too bad type #{type.to_s(16)}, subtype #{subtype.to_s(16)} : #{s.unpack('H*')}"
         Extended_community.new(s)
       end
     end
@@ -184,9 +219,10 @@ module BGP
         parse(args[0])
       elsif args.size==3
         @type, @subtype, value = args
-        raise ArgumentError, "invalid argument #{args.inspect}"  unless instance_of?(Opaque)
+        raise ArgumentError, "invalid argument #{args.inspect}"  unless is_a?(Opaque)
         @type |= OPAQUE
         @global, @local=value, nil
+        
       elsif args.size==4
         raise  ArgumentError, "This is a base class and should not be instanciated"  if instance_of?(Extended_community)
         @type, @subtype, @global, @local = args
@@ -202,8 +238,6 @@ module BGP
         raise ArgumentError, "invalid arg #{args.inspect}"
       end
     end
-
-
   end
 
   class Route_target < Extended_community
@@ -235,6 +269,9 @@ module BGP
         super(1,OSPF_DOMAIN_ID,*args)
       end
     end
+    def value2
+      "#{IPAddr.create(@global)}"
+    end
   end
 
   class Ospf_router_id < Extended_community
@@ -246,6 +283,9 @@ module BGP
         super(1,OSPF_ROUTER_ID,*args)
       end
     end
+    def value2
+      "#{IPAddr.create(@global)}"
+    end
   end
 
   class Bgp_data_collect < Extended_community
@@ -263,8 +303,7 @@ module BGP
       if args[0].is_a?(String) and args[0].is_packed?
         super(*args)
       else
-        raise ArgumentError, "not an opaque extended community" if [2,3,5,7,8].include?(args[0])
-        super(0,*args)
+        super(*args)
       end
     end
   end
@@ -278,6 +317,52 @@ module BGP
         super(NON_TRANSITIVE | TWO_OCTET_AS, LINK_BANDWIDTH, *args)
       end
     end
+    def value2
+      @global
+    end
   end
 
+  class Color < Opaque
+    def initialize(*args)
+      args = 0 if args.empty?
+      if args[0].is_a?(String) and args[0].is_packed?
+        super(*args)
+      else        
+        super(TRANSITIVE, COLOR, *args)
+      end
+    end
+    def value2
+      @global
+    end
+  end
+  
+  class Encapsulation < Opaque
+    def initialize(*args)
+      args = 0 if args.empty?
+      if args[0].is_a?(String) and args[0].is_packed?
+        super(*args)
+      else        
+        case args[0]
+        when :l2tpv3 ; tunnel_type = 1
+        when :gre    ; tunnel_type = 2
+        when :ipip   ; tunnel_type = 7
+        else
+          tunnel_type = *args
+        end
+        super(TRANSITIVE, ENCAPSULATION, tunnel_type)
+      end
+    end
+    def value2
+      case @global
+      when 1 ; :l2tpv3
+      when 2 ; :gre
+      when 7 ; :ipip
+      else 
+        @global
+      end
+    end
+  end  
+  
 end
+
+load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/local_pref.rb

@@ -27,6 +27,12 @@ module BGP
 
   class Local_pref < Attr
 
+    class << self
+      def new_hash(arg={})
+        new arg
+      end
+    end
+
     def initialize(arg=100)
       @flags, @type = WELL_KNOWN_MANDATORY, LOCAL_PREF
       if arg.is_a?(String) and arg.is_packed?
@@ -54,6 +60,10 @@ module BGP
     def to_i
       @local_pref
     end
+    
+    def to_hash
+      {:local_pref=>to_i}
+    end
 
     def encode
       super([to_i].pack('N'))

data/bgp/path_attributes/mp_reach.rb

@@ -70,6 +70,25 @@ module BGP
       self
     end
     
+    def to_hash
+      h_afi_safi = {:safi=> @safi, :afi=>@afi}
+      h_nlris = @nlris.size>1 ? @nlris.collect { |n| nlri_to_hash(n) } : nlri_to_hash(@nlris[0])
+      h = if @nexthops.empty?
+        h_afi_safi.merge(:nlris=>h_nlris)
+      else
+        h_afi_safi.merge(:nlris=>h_nlris).merge({:nexthop=>@nexthops.collect { |n| n.nexthop.to_s }} )
+      end      
+    end
+    
+    def nlri_to_hash(nlri)
+      if nlri.is_a?(Prefix) and ! nlri.extended?
+        nlri.to_s
+      else
+        nlri.to_hash
+      end  
+    end
+    private :nlri_to_hash
+    
     module ClassMethods
       def afi_from_nlris(arg)
         case arg
@@ -157,8 +176,8 @@ module BGP
     def to_s(method=:default)
       super(mp_reach, method)
     end
-
     def to_hash
+      {:mp_reach=>super}
     end
 
     def parse(s,arg=false)
@@ -206,7 +225,7 @@ module BGP
       end
       raise RuntimeError, "leftover afer parsing: #{value.unpack('H*')}" if value.size>0
     end
-
+    
     def parse_iso_mapped_next_hops(s)
       raise unless @afi == 3
       while s.size>0

data/bgp/path_attributes/mp_unreach.rb

@@ -59,7 +59,7 @@ module BGP
     def to_s(method=:default)
       super(mp_unreach, method)
     end
-    
+  
     def parse(s,arg=false)
       
       @flags, @type, len, value = super(s)
@@ -86,6 +86,10 @@ module BGP
       p nlris[0].prefix
       raise
     end
+
+    def to_hash
+      {:mp_unreach=>super}
+    end
     
   end
   

data/bgp/path_attributes/multi_exit_disc.rb

@@ -27,6 +27,12 @@ module BGP
 
   class Multi_exit_disc < Attr
 
+    class << self
+      def new_hash(arg={})
+        new arg
+      end
+    end
+
     def initialize(arg=0)
       @flags, @type=OPTIONAL, MULTI_EXIT_DISC
       if arg.is_a?(String) and arg.is_packed?
@@ -68,6 +74,10 @@ module BGP
       super(multi_exit_disc, method)
     end
 
+    def to_hash
+      {:multi_exit_disc=>to_i}
+    end
+
     private
 
     def parse(s)

data/bgp/path_attributes/next_hop.rb

@@ -27,12 +27,28 @@ module BGP
 
   class Next_hop < Attr
 
+    # class << self
+    #   def new_hash(arg={})
+    #     if arg.has_key?(:next_hop)
+    #       new( arg[:next_hop])
+    #     elsif arg.has_key?(:nexthop)
+    #       new( arg[:nexthop])
+    #     end
+    #   end
+    # end
+
     def initialize(*args)
       @flags, @type = WELL_KNOWN_MANDATORY, NEXT_HOP
       if args[0].is_a?(String) and args[0].is_packed?
         parse(args[0])
       elsif args[0].is_a?(self.class)
         parse(args[0].encode, *args[1..-1])
+      elsif args[0].is_a?(Hash)
+        if args[0].has_key?(:next_hop)
+          @next_hop = IPAddr.create(args[0][:next_hop])
+        elsif arg.has_key?(:nexthop)
+          @next_hop = IPAddr.create(args[0][:nexthop])
+        end
       else
         @next_hop = IPAddr.create(*args)
       end
@@ -44,6 +60,10 @@ module BGP
     def to_s(method=:default)
       super(next_hop, method)
     end
+    
+    def to_hash
+      {:next_hop=> next_hop }
+    end
 
     def to_i
       @next_hop.to_i

data/bgp/path_attributes/origin.rb

@@ -59,6 +59,20 @@ module BGP
     def to_i
       @origin
     end
+    
+    def to_sym
+      case @origin
+      when 1 ; :egp
+      when 2 ; :incomplete
+      when 0 ; :igp
+      else
+        :undefined
+      end
+    end
+    
+    def to_hash
+      {:origin=> to_sym}
+    end
 
     def origin
       case to_i

data/bgp/path_attributes/originator_id.rb

@@ -30,6 +30,13 @@ module BGP
 
   class Originator_id < Attr
 
+    class << self
+      def new_hash(arg={})
+        new arg[:origin_id]
+      end
+    end
+
+
     def initialize(*args)
       @flags, @type = OPTIONAL, ORIGINATOR_ID
       if args[0].is_a?(String) and args[0].is_packed?
@@ -42,27 +49,31 @@ module BGP
     end
 
     def to_i
-      @next_hop.to_i
+      @origin_id.to_i
     end
     def parse(s)
       @flags, @type, len, value = super(s)
-      @next_hop = IPAddr.create(value)
+      @origin_id = IPAddr.create(value)
     end
 
     def encode
-      super(@next_hop.encode)
+      super(@origin_id.encode)
     end
 
     def to_s(method=:default)
-      super(@next_hop.to_s, method)
+      super(@origin_id.to_s, method)
     end
     
     def originator_id
-      @next_hop.to_s
+      @origin_id.to_s
+    end
+    
+    def to_hash
+      {:origin_id=> originator_id}
     end
     
     def originator_id=(val)
-      @next_hop=IPAddr.create(val)
+      @origin_id=IPAddr.create(val)
     end
 
 

data/bgp/path_attributes/path_attribute.rb

@@ -36,9 +36,37 @@ module BGP
         while s.size>0
           @attributes << Attr.factory(*args)
         end
+      elsif args.size ==1 and args[0].is_a?(Hash)
+        @attributes = []
+        @attributes = args[0].keys.collect { |attr|  
+          case attr
+          when :next_hop, :nexthop     ; Next_hop.new(args[0][attr])
+          when :local_pref             ; Local_pref.new(args[0][attr])
+          when :med, :multi_exit_disc  ; Multi_exit_disc.new(args[0][attr])
+          when :mp_reach               ; Mp_reach.new(args[0][attr])
+          when :mp_unreach             ; Mp_unreach.new(args[0][attr])
+          when :as_path                ; As_path.new_hash(args[0][attr])
+          when :as4_path               ; As4_path.new_hash(args[0][attr])
+          when :origin                 ; Origin.new(args[0][attr])
+          when :cluster_list           ; Cluster_list.new(*args[0][attr])
+          when :aggregator             ; Aggregator.new(args[0][attr])
+          when :as4_aggregator         ; As4_aggregator.new(args[0][attr])
+          when :originator_id          ; Originator_id.new(args[0][attr])
+          when :communities, :community; Communities.new(args[0][attr])
+          when :extended_communities, :extended_community
+            Extended_communities.new_hash(args[0][attr])
+          when :atomic_aggregate       ; Atomic_aggregate.new
+            # FIXME: add other attr here ...
+          else 
+            puts "#{attr} to be implemented!"
+          end
+          }.compact
       else
         add(*args)
       end
+      
+      yield(self) if block_given?
+      
     end
 
     def add(*args)
@@ -53,7 +81,12 @@ module BGP
         if as4byte and a.is_a?(As_path)
           a.to_s(method, as4byte)
         else
+          begin
           a.to_s(method)
+        rescue => e
+          p e 
+          p a.class
+        end
         end
       }).join("\n  ")
     end
@@ -187,7 +220,16 @@ module BGP
       end
       eval "alias :has_an_#{attr}? :has_a_#{attr}_attr?" if (attr =~ /^[aeiou]/)
     end
-
+    
+    def to_hash
+      h = {}
+      @attributes.each { |att| 
+        _h = att.to_hash
+        h = h.merge(_h)  if _h
+      }
+      h
+    end
+    
     private
 
     def att_sym_to_klass(sym)
@@ -276,8 +318,51 @@ module BGP
         Unknown.new(s)
       end
     end
+
+    # def self.new_hash(_arg={:arg=>nil})
+    #   #FIXME:
+    #   
+    #   arg = _arg.delete(:arg)
+    #   
+    #   if arg.is_a?(Neighbor::Capabilities)
+    #     as4byte_flag = arg.as4byte?
+    #     path_id_flag = arg
+    #   elsif arg.is_a?(Hash)
+    #     as4byte_flag=arg[:as4byte]
+    #     path_id_flag=arg[:path_id]
+    #   elsif arg.is_a?(TrueClass)
+    #     as4byte_flag=true
+    #     path_id_flag=nil
+    #   elsif arg.respond_to? :as4byte?
+    #     as4byte_flag = arg.as4byte?
+    #     path_id_flag = arg
+    #   else
+    #     as4byte_flag=nil
+    #     path_id_flag=nil
+    #   end
+    # 
+    #   _arg.keys.each { |attr|
+    #     case attr
+    #     when :local_pref ; Local_pref.new(_arg[attr])
+    #     when :next_hop   ; Next_hop.new(_arg[attr])
+    #     else
+    #     end
+    #   }
+    # end
+
+
     
   end
-end
 
+  # require 'bgp/path_attributes/local_pref'
+  # require 'bgp/path_attributes/next_hop'
+  # require 'bgp/path_attributes/multi_exit_disc'
+  #   
+  # p = Path_attribute.new :local_pref=>100, :next_hop => '10.0.0.1', :med=>300
+  # # p p
+  # puts p 
+  
+  
+  
+end
 load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/tlvs/tlv.rb

@@ -0,0 +1,18 @@
+module BGP
+  module TLV
+    attr_accessor :tlv_type
+    def encode(value)
+      p 'IN ENCODE TLV'
+      [@tlv_type, value.size, value].pack('nna*')
+    end
+  end
+  module STLV
+    attr_accessor :stlv_type
+    def encode(value)
+       [@stlv_type, value.size, value].pack('CCa*')
+    end
+  end
+end
+
+load "../../../test/unit/path_attributes/tlvs/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+