bgp4r 0.0.12 → 0.0.13

data/bgp/path_attributes/mp_reach.rb

@@ -1,5 +1,5 @@
  #--
-# Copyright 2008, 2009 Jean-Michel Esnault.
+# Copyright 2008-2009, 2011 Jean-Michel Esnault.
 # All rights reserved.
 # See LICENSE.txt for permissions.
 #
@@ -25,82 +25,122 @@ require 'bgp/nlris/nlris'
 
 module BGP
 
-  class Mp_reach < Attr
-
-    attr_reader :safi, :nlris, :path_id
+  module MpReachCommon
 
-    def initialize(*args)
-      @safi, @nexthops, @nlris, @path_id= 1, [], [], nil # default is ipv4/unicast
-      @flags, @type = OPTIONAL, MP_REACH
-      if args[0].is_a?(String) and args[0].is_packed?
-        parse(*args)
-      elsif args[0].is_a?(self.class)
-        s = args.shift.encode
-        parse(s, *args)
-      elsif args[0].is_a?(Hash) and args.size==1
-        set(*args)
-      else
-        raise ArgumentError, "invalid argument" 
-      end
-    end
-
-    def afi
-      @afi ||= @nexthops[0].afi
+    def self.included(obj)
+      obj.extend ClassMethods
     end
 
     def set(h)
       @safi = h[:safi]
-      @path_id = path_id = h[:path_id]
-      case @safi
-      when 1,2,4   ; @nexthops = [h[:nexthop]].flatten.collect { |nh| Prefix.new(nh) }
-      when 128,129 ; @nexthops = [h[:nexthop]].flatten.collect { |nh| Vpn.new(nh) }
-      else
-      end
-      case @safi
-      when 1
-        @nlris = [h[:nlris]].flatten.collect do |n|
-          case n
-          when String
-            nlri = Inet_unicast.new(n)
-            path_id ? Ext_Nlri.new(path_id, nlri) : nlri
-          when Hash
-            path_id = n[:path_id] if n[:path_id]
-            nlri = Inet_unicast.new(n[:prefix])
-            path_id ? Ext_Nlri.new(path_id, nlri) : nlri
-          else
-            raise ArgumentError, "Invalid: #{n.inspect}"
-          end
-        end
-      when 2
-        @nlris = [h[:nlris]].flatten.collect do |n|
+      @path_id = h[:path_id]
+      @afi = h.has_key?(:afi) ? h[:afi] : self.class.afi_from_nlris(h[:nlris])
+      case safi
+      when 1,2
+        pfx_klass = prefix_klass(afi, safi)
+        @nlris = [h[:nlris]].flatten.compact.collect do |n|
           case n
           when String
-            nlri = Inet_multicast.new(n)
-            path_id ? Ext_Nlri.new(path_id, nlri) : nlri
+            path_id ? pfx_klass.new(path_id, n) : pfx_klass.new(n)
           when Hash
             path_id = n[:path_id] if n[:path_id]
-            nlri = Inet_multicast.new(n[:prefix])
-            path_id ? Ext_Nlri.new(path_id, nlri) : nlri
+            pfx = n[:prefix]
+            path_id ? pfx_klass.new(path_id, pfx) : pfx_klass.new(pfx)
           else
             raise ArgumentError, "Invalid: #{n.inspect}"
           end
         end
       when 4
-        @nlris = [h[:nlris]].flatten.collect do |n|
+        @nlris = [h[:nlris]].flatten.compact.collect do |n|
           path_id = n[:path_id] || @path_id
           prefix = n[:prefix].is_a?(String) ? Prefix.new(n[:prefix]) : n[:prefix]
-          nlri = Labeled.new(prefix, *n[:label]) 
-          path_id ? Ext_Nlri.new(path_id, nlri) : nlri
+          Labeled.new_with_path_id(path_id,prefix, *n[:label])
         end
       when 128,129
-        @nlris = [h[:nlris]].flatten.collect do |n|
+        @nlris = [h[:nlris]].flatten.compact.collect do |n|
           path_id = n[:path_id] || @path_id
           prefix = n[:prefix].is_a?(Prefix) ? n[:prefix] :  Prefix.new(n[:prefix]) 
           rd = n[:rd].is_a?(Rd) ?  n[:rd] : Rd.new(*n[:rd])
-          nlri = Labeled.new(Vpn.new(prefix,rd), *n[:label]) 
-          path_id ? Ext_Nlri.new(path_id, nlri) : nlri
+          Labeled.new_with_path_id(path_id,Vpn.new(prefix,rd), *n[:label]) 
         end
       else
+        raise "SAFI #{safi} not implemented!"
+      end
+      @nexthops = [h[:nexthop]].flatten.collect { |nh| nexthop_klass(afi,safi).new(nh) } if h[:nexthop]
+      self
+    end
+    
+    module ClassMethods
+      def afi_from_nlris(arg)
+        case arg
+        when String
+          _arg = arg
+        when Hash,Array
+          case [arg].flatten[0]
+          when Hash
+            _arg = [arg].flatten[0][:prefix]
+          when String
+            _arg = [arg].flatten[0]
+          else
+            raise
+          end
+        when Hash
+          _arg = arg[:prefix]
+        else
+          raise
+        end
+
+        if _arg.respond_to?(:afi)
+          _arg.afi
+        elsif _arg =~ /^49\./
+          3
+        else
+          IPAddr.new(_arg).ipv4? ? 1 : 2
+        end
+      end
+    end
+    
+    private 
+    
+    def prefix_klass(afi, safi)
+      case afi
+      when 1,2
+        _afi='Inet'
+      when 3
+        return ::BGP.const_get('Prefix')
+      else
+        raise
+      end
+      _safi = case safi
+      when 1 ; 'unicast'
+      when 2 ; 'multicast'
+      else
+        raise
+      end
+      ::BGP.const_get([_afi,_safi].join('_'))
+    end
+    
+  end
+
+
+  class Mp_reach < Attr
+    
+    include MpReachCommon
+
+    attr_reader :safi, :nlris, :path_id, :afi
+
+    def initialize(*args)
+      @safi, @nexthops, @nlris, @path_id= 1, [], [], nil # default is ipv4/unicast
+      @flags, @type = OPTIONAL, MP_REACH
+      if args[0].is_a?(String) and args[0].is_packed?
+        parse(*args)
+      elsif args[0].is_a?(self.class)
+        s = args.shift.encode
+        parse(s, *args)
+      elsif args[0].is_a?(Hash) and args.size==1
+        set(*args)
+      else
+        raise ArgumentError, "invalid argument" 
       end
     end
 
@@ -109,7 +149,7 @@ module BGP
     end
 
     def mp_reach
-      "\n    AFI #{IANA.afi(afi)} (#{afi}), SAFI #{IANA.safi(safi)} (#{safi})" +
+      "\n    AFI #{IANA.afi?(afi)} (#{afi}), SAFI #{IANA.safi?(safi)} (#{safi})" +
       "\n    nexthop: " + nexthops +
       (['']+ @nlris.collect { |nlri| nlri.to_s }).join("\n      ")
     end
@@ -122,40 +162,83 @@ module BGP
     end
 
     def parse(s,arg=false)
-      
+
       @flags, @type, len, value = super(s)
       @afi, @safi, nh_len = value.slice!(0,4).unpack('nCC')
-      parse_next_hops value.slice!(0,nh_len).is_packed
-      value.slice!(0,1)
-      
-      if arg.respond_to?(:path_id?)
-        path_id_flag = arg.path_id? :recv, @afi, @safi
+
+      case @afi
+      when 3
+
+        parse_iso_mapped_next_hops value.slice!(0,nh_len).is_packed
+        value.slice!(0,1)
+
+        if arg.respond_to?(:path_id?)
+          path_id_flag = arg.path_id? :recv, @afi, @safi
+        else
+          path_id_flag = arg
+        end
+
+        while value.size>0
+          path_id = value.slice!(0,4).unpack('N')[0]  if path_id_flag
+          blen = value.slice(0,1).unpack('C')[0]
+          nlri = Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi, path_id)
+          # nlri = Nsap.new_ntoh(value.slice!(0,(blen+7)/8+1))
+          @nlris << nlri
+        end
+
       else
-        path_id_flag = arg
-      end
-      
-      while value.size>0
-        path_id = value.slice!(0,4).unpack('N')[0]  if path_id_flag
-        blen = value.slice(0,1).unpack('C')[0]
-        nlri = Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi)
-        if path_id_flag
-          @nlris << Ext_Nlri.new(path_id, nlri)
+
+        parse_next_hops value.slice!(0,nh_len).is_packed
+        value.slice!(0,1)
+
+        if arg.respond_to?(:path_id?)
+          path_id_flag = arg.path_id? :recv, @afi, @safi
         else
+          path_id_flag = arg
+        end
+
+        while value.size>0          
+          path_id = path_id_flag ? value.slice!(0,4).unpack('N')[0] : nil
+          blen = value.slice(0,1).unpack('C')[0]
+          nlri = Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi, path_id)
           @nlris << nlri
         end
       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
+        s.slice!(0,8) if (128..129)===@safi
+        case s.slice(0,1).unpack('C')[0]
+        when 0x47
+          s.slice!(0,4)
+          @nexthops << Iso_ip_mapped.new(Prefix.new_ntop([32,s.slice!(0,4)].pack('Ca*'),1).to_s)
+        when 0x35
+          s.slice!(0,3)
+          @nexthops << Iso_ip_mapped.new(Prefix.new_ntop([128,s.slice!(0,16)].pack('Ca*'),2).to_s)
+        else
+          raise 
+        end
+        # skip magic
+        s.slice!(0,1)
+      end
+    end
+    
     def parse_next_hops(s)
       while s.size>0
         case @safi
         when 1,2,4
           case @afi
           when 1
-            @nexthops << Prefix.new([32,s.slice!(0,4)].pack('Ca*'),1)
+            @nexthops << Prefix.new_ntop([32,s.slice!(0,4)].pack('Ca*'),1)
           when 2
-            @nexthops << Prefix.new([128,s.slice!(0,16)].pack('Ca*'),2)
+            @nexthops << Prefix.new_ntop([128,s.slice!(0,16)].pack('Ca*'),2)
+          when 3
+            raise "TBD"
+          else 
+            raise "SHOULD NOT BE HERE ...."
           end
         when 128,129
           @nexthops << Vpn.new([64+32,s.slice!(0,12)].pack('Ca*'))
@@ -168,8 +251,9 @@ module BGP
     def encode(what=:mp_reach)
       case what
       when :mp_reach
-        nexthops = @nexthops.collect { |nh| nh.encode(false) }.join
-        super([afi, @safi, nexthops.size, nexthops, 0, @nlris.collect { |n| n.encode }.join].pack('nCCa*Ca*'))
+        nexthops = @nexthops.collect { |nh| nh.encode_next_hop(safi) }.join
+        nlris =  @nlris.collect { |n| n.encode }.join
+        super([afi, @safi, nexthops.size, nexthops, 0, nlris ].pack('nCCa*Ca*'))
       when :mp_unreach
         super([afi, @safi, @nlris.collect { |n| n.encode }.join].pack('nCa*'))
       end
@@ -180,9 +264,27 @@ module BGP
       s[1]= [MP_UNREACH].pack('C')
       Mp_unreach.new(s)
     end
-
+    
+    private
+    
+    def nexthop_klass(afi, safi)
+      case afi
+      when 3
+        ::BGP::const_get('Iso_ip_mapped')
+      else
+        case safi
+        when 1,2,4
+           ::BGP::const_get('Prefix')
+        when 128,129
+          ::BGP::const_get('Vpn')
+        else
+          raise
+        end
+      end
+    end
+    
   end
 
 end
 
-load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/mp_unreach.rb

@@ -21,13 +21,16 @@
 #++
 
 require 'bgp/path_attributes/attribute'
+require 'bgp/path_attributes/mp_reach'
 require 'bgp/nlris/nlris'
 
 module BGP
 
   class Mp_unreach < Attr
 
-    attr_reader :safi, :nlris
+    include MpReachCommon
+
+    attr_reader :safi, :nlris, :path_id
 
     def initialize(*args)
       @safi, @nexthops, @nlris, @path_id= 1, [], [], nil # default is ipv4/unicast
@@ -44,66 +47,12 @@ module BGP
       end
     end
 
-   def afi
+    def afi
       @afi ||= @nlris[0].afi
     end
 
-    # FIXME: refactor with mp_reach ....
-    def set(h)
-      h[:nlris] ||=[]
-      @afi = h[:afi] if h[:afi]
-      @safi = h[:safi]
-      @path_id = path_id = h[:path_id]
-      case @safi
-      when 1
-        @nlris = [h[:nlris]].flatten.collect do |n|
-          case n
-          when String
-            nlri = Inet_unicast.new(n)
-            path_id ? Ext_Nlri.new(path_id, nlri) : nlri
-          when Hash
-            path_id = n[:path_id] if n[:path_id]
-            nlri = Inet_unicast.new(n[:prefix])
-            path_id ? Ext_Nlri.new(path_id, nlri) : nlri
-          else
-            raise ArgumentError, "Invalid: #{n.inspect}"
-          end
-        end
-      when 2
-        @nlris = [h[:nlris]].flatten.collect do |n|
-          case n
-          when String
-            nlri = Inet_multicast.new(n)
-            path_id ? Ext_Nlri.new(path_id, nlri) : nlri
-          when Hash
-            path_id = n[:path_id] if n[:path_id]
-            nlri = Inet_multicast.new(n[:prefix])
-            path_id ? Ext_Nlri.new(path_id, nlri) : nlri
-          else
-            raise ArgumentError, "Invalid: #{n.inspect}"
-          end
-        end
-      when 4
-        @nlris = [h[:nlris]].flatten.collect do |n|
-          path_id = n[:path_id] || @path_id
-          prefix = n[:prefix].is_a?(String) ? Prefix.new(n[:prefix]) : n[:prefix]
-          nlri = Labeled.new(prefix, *n[:label]) 
-          path_id ? Ext_Nlri.new(path_id, nlri) : nlri
-        end
-      when 128,129
-        @nlris = [h[:nlris]].flatten.collect do |n|
-          path_id = n[:path_id] || @path_id
-          prefix = n[:prefix].is_a?(Prefix) ? n[:prefix] :  Prefix.new(n[:prefix]) 
-          rd = n[:rd].is_a?(Rd) ?  n[:rd] : Rd.new(*n[:rd])
-          nlri = Labeled.new(Vpn.new(prefix,rd), *n[:label]) 
-          path_id ? Ext_Nlri.new(path_id, nlri) : nlri
-        end
-      else
-      end
-    end
-
     def mp_unreach
-      "\n    AFI #{IANA.afi(afi)} (#{afi}), SAFI #{IANA.safi(safi)} (#{safi})" +
+      "\n    AFI #{IANA.afi?(afi)} (#{afi}), SAFI #{IANA.safi?(safi)} (#{safi})" +
       (['']+ @nlris.collect { |nlri| nlri.to_s }).join("\n      ")
     end
 
@@ -125,26 +74,21 @@ module BGP
       while value.size>0
         path_id = value.slice!(0,4).unpack('N')[0]  if path_id_flag
         blen = value.slice(0,1).unpack('C')[0]
-        nlri = Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi)
-        if path_id_flag
-          @nlris << Ext_Nlri.new(path_id, nlri)
-        else
-          @nlris << nlri
-        end
+        nlri = Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi, path_id)
+        @nlris << nlri
       end
-      raise RuntimeError, "leftover afer parsing: #{value.unpack('H*')}" if value.size>0
+      raise RuntimeError, "leftover after parsing: #{value.unpack('H*')}" if value.size>0
     end
     
-
     def encode
       super([afi, @safi, @nlris.collect { |n| n.encode }.join].pack('nCa*'))
     rescue => e 
       p nlris[0].prefix
       raise
     end
-
+    
   end
   
 end
 
-load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/multi_exit_disc.rb

@@ -77,4 +77,4 @@ module BGP
   end
 
 end
-load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/next_hop.rb

@@ -60,4 +60,4 @@ module BGP
   end
 
 end
-load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/origin.rb

@@ -84,5 +84,5 @@ module BGP
 
 end
 
-load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
 

data/bgp/path_attributes/originator_id.rb

@@ -70,4 +70,4 @@ module BGP
 
 end
 
-load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/path_attribute.rb

@@ -280,4 +280,4 @@ module BGP
   end
 end
 
-load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0