bgp4r 0.0.11 → 0.0.12

data/bgp/optional_parameters/add_path.rb

@@ -0,0 +1,160 @@
+#--
+# Copyright 2010 Jean-Michel Esnault.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#
+#
+# This file is part of BGP4R.
+# 
+# BGP4R 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.
+# 
+# BGP4R 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
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+require 'bgp/optional_parameters/capability'
+
+module BGP::OPT_PARM::CAP
+
+  #
+  # Belongs to Neighbor this is a session attribute....
+  # def include_path_id?(speeker, peer, sr, afi, safi)
+  #   # when sending afi, safi, speaker agrees to send and peer to receive
+  #   # when receiving afi, safi, speaker agrees to recv and peer agress to send
+  #   case sr
+  #   when :recv
+  #     speeker.has?(:recv, afi, safi) && peer.has?(:send, afi, safi)
+  #   when :send
+  #     speeker.has?(:send, afi, safi) && peer.has?(:recv, afi, safi)
+  #   end
+  # end
+
+  class Add_path < BGP::OPT_PARM::Capability 
+
+    class << self
+      def new_array(arg)
+        o = new
+        arg.each { |t| o.add(*t) }
+        o
+      end
+    end
+    
+    def initialize(*args)
+      @af={}
+      if args.size>1
+        super(OPT_PARM::CAP_ADD_PATH)
+        add(*args)
+      elsif args.size==1 and args[0].is_a?(String)
+        parse(*args)
+      elsif args.empty?
+        super(OPT_PARM::CAP_ADD_PATH)
+      else
+        raise
+      end
+    end
+
+    def add(sr, afi,safi)
+      @af[[_afi(afi), _safi(safi)]] = _send_recv(sr)
+    end
+
+    def parse(s)
+      families = super(s)
+      while families.size>0
+        afi, safi, sr = families.slice!(0,4).unpack('nCC')
+        @af[[afi,safi]]=sr
+      end
+    end
+    
+    # 0001 01 01
+    # 0002 80 02
+    # 0002 01 03
+
+    def send? afi, safi
+      has? :send, afi, safi
+    end
+
+    def recv? afi, safi
+      has? :recv, afi, safi
+    end
+
+    def has?(sr, afi, safi)
+      case sr
+      when :recv
+        @af.has_key?([afi,safi]) && (2..3) ===  @af[[afi,safi]]
+      when :send
+        @af.has_key?([afi,safi]) && (@af[[afi,safi]] == 1 or @af[[afi,safi]] ==3)
+      end
+    end
+
+    def encode
+      s = []
+      s << @af.to_a.sort.collect { |e|  e.flatten.pack('nCC')  }
+      super s.join
+    end
+
+    def to_s
+      s = []
+      s <<  "\n    Add-path Extension (#{CAP_ADD_PATH}), length: #{encode.size}"
+      s = s.join("\n  ")
+      super + (s + (['']+@af.to_a.collect { |e| address_family_to_s(*e)}).join("\n        "))
+    end
+
+    private
+
+    def address_family_to_s(af, sr)
+      afi, safi = af
+      "AFI #{IANA.afi(afi)} (#{afi}), SAFI #{IANA.safi(safi)} (#{safi}), #{send_recv_to_s(sr)}"
+    end
+
+    def _send_recv(val)
+      case val
+      when :send, 1                                          ; 1
+      when :recv, :receive, 2                                ; 2
+      when :send_and_recv, :send_recv, :send_and_receive, 3  ; 3
+      else
+        val
+      end
+    end
+
+    def send_recv_to_s(val)
+      case val
+      when 1 ; 'SEND (1)'
+      when 2 ; 'RECV (2)'
+      when 3 ; 'SEND_AND_RECV (3)'
+      else
+        'bogus'
+      end
+    end
+
+    def _afi(val)
+      if val.is_a?(Fixnum)
+        val
+      elsif val == :ipv4
+        1
+      elsif val == :ipv6
+        2
+      end
+    end
+
+    def _safi(val)
+      if val.is_a?(Fixnum)
+        val
+      elsif val == :unicast
+        1
+      elsif val == :multicast
+        2
+      end
+    end
+
+  end
+end
+
+load "../../test/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/optional_parameters/capabilities.rb

@@ -7,6 +7,7 @@ require 'bgp/optional_parameters/optional_parameter'
 require 'bgp/optional_parameters/orf'
 require 'bgp/optional_parameters/route_refresh'
 require 'bgp/optional_parameters/as4'
+require 'bgp/optional_parameters/add_path'
 
 module BGP::OPT_PARM
   module DYN_CAP

data/bgp/optional_parameters/capability.rb

@@ -114,6 +114,8 @@ module BGP::OPT_PARM
       CAP::Orf.new(s)
     when CAP_GR
       CAP::Graceful_restart.new(s)
+    when CAP_ADD_PATH
+      CAP::Add_path.new(s)
     when CAP_DYNAMIC
       CAP::Dynamic.new(s)
     else
@@ -134,8 +136,12 @@ module BGP::OPT_PARM
         DYN_CAP::Route_refresh.new(code)
       when CAP_ORF,CAP_ORF_CISCO
         DYN_CAP::Orf.new(s)
+      when CAP_ADD_PATH
+        DYN_CAP::Add_path.new(s)
       when CAP_GR
         DYN_CAP::Graceful_restart.new(s)
+      when CAP_ADD_PATH
+        CAP::Add_path.new(s)
       else
         Capability::Unknown.new(s)
       end

data/bgp/optional_parameters/graceful_restart.rb

@@ -29,7 +29,7 @@ class Graceful_restart < BGP::OPT_PARM::Capability
   def initialize(*args)
     if args.size>1
       @restart_state, @restart_time = args
-      @address_families = []
+      @tuples = []
       super(OPT_PARM::CAP_GR)
     else
       parse(*args)
@@ -37,16 +37,16 @@ class Graceful_restart < BGP::OPT_PARM::Capability
   end
   
   def add(afi,safi,flags)
-    @address_families << [_afi(afi), _safi(safi), flags]
+    @tuples << [_afi(afi), _safi(safi), flags]
   end
 
   def parse(s)
-    @address_families = []
+    @tuples = []
     o1, families = super(s).unpack('na*')
     @restart_state = o1 >> 12
     @restart_time = o1 & 0xfff
     while families.size>0
-      @address_families << families.slice!(0,4).unpack('nCC')
+      @tuples << families.slice!(0,4).unpack('nCC')
     end
   end
 
@@ -54,7 +54,7 @@ class Graceful_restart < BGP::OPT_PARM::Capability
   def encode
     s = []
     s << [(@restart_state << 12) + @restart_time].pack('n')
-    s << @address_families.collect { |af| af.pack('nCC') }
+    s << @tuples.collect { |af| af.pack('nCC') }
     super s.join
   end
   def to_s
@@ -62,7 +62,7 @@ class Graceful_restart < BGP::OPT_PARM::Capability
     s <<  "\n    Graceful Restart Extension (#{CAP_GR}), length: 4"
     s <<  "    Restart Flags: #{restart_flag}, Restart Time #{@restart_time}s"
     s = s.join("\n  ")
-    super + (s + (['']+@address_families.collect { |af| address_family(*af)}).join("\n        "))
+    super + (s + (['']+@tuples.collect { |af| address_family(*af)}).join("\n        "))
   end
   
   private

data/bgp/optional_parameters/optional_parameter.rb

@@ -36,6 +36,7 @@ module OPT_PARM
     CAP_GR  = 64
     CAP_AS4 = 65
     CAP_DYNAMIC = 67
+    CAP_ADD_PATH = 69
     CAP_ROUTE_REFRESH_CISCO = 128
     CAP_ORF_CISCO = 130
 

data/bgp/path_attributes/as_path.rb

@@ -156,7 +156,7 @@ module BGP
       attr_accessor :as4byte
       
       def initialize(*args)
-
+        
         @flags, @type, @segments, @as4byte = WELL_KNOWN_MANDATORY, AS_PATH, [], false
         
         if args[0].is_a?(String) and args[0].is_packed?

data/bgp/path_attributes/attribute.rb

@@ -61,16 +61,23 @@ module BGP
     OPTIONAL_TRANSITIVE      = OPTIONAL | TRANSITIVE
     OPTIONAL_NON_TRANSITIVE  = OPTIONAL
     
-    def encode(value='',value_fmt=nil)
-      len, len_fmt = value.size, 'C'
+    def len_fmt(len)
       if len>255
         @flags |= EXTENDED_LENGTH
-        len_fmt='n'
+        @_len_fmt='n'
+      else
+        @_len_fmt = 'C'
+        @flags &= ~EXTENDED_LENGTH
       end
+    end
+    
+    def encode(value='',value_fmt=nil)
+      len = value.size
+      len_fmt(len)
       if value_fmt
-        [@flags<<4, @type, len, *value].pack("CC#{len_fmt}#{value_fmt}")
+        [@flags<<4, @type, len, *value].pack("CC#{@_len_fmt}#{value_fmt}")
       else
-        ([@flags<<4, @type, len].pack("CC#{len_fmt}") + value).is_packed
+        ([@flags<<4, @type, len].pack("CC#{@_len_fmt}") + value).is_packed
       end
     end
     

data/bgp/path_attributes/mp_reach.rb

@@ -1,4 +1,4 @@
-#--
+ #--
 # Copyright 2008, 2009 Jean-Michel Esnault.
 # All rights reserved.
 # See LICENSE.txt for permissions.
@@ -24,119 +24,165 @@ require 'bgp/path_attributes/attribute'
 require 'bgp/nlris/nlris'
 
 module BGP
-    
-    class Mp_reach < Attr
-      
-      attr_reader :safi, :nlris
-      
-      def initialize(*args)
-        @safi, @nexthops, @nlris= 1, [], [] # default is ipv4/unicast
-        @flags, @type = OPTIONAL, MP_REACH
-        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) and args.size==1
-          set(*args)
-        else
-          raise ArgumentError, "invalid argument" 
-        end
+
+  class Mp_reach < Attr
+
+    attr_reader :safi, :nlris, :path_id
+
+    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
-      
-      def afi
-        @afi ||= @nexthops[0].afi
+    end
+
+    def afi
+      @afi ||= @nexthops[0].afi
+    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
-      
-      def set(h)
-        @safi = h[:safi]
-        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
+      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
-        case @safi
-        when 1,2
-          @nlris = [h[:prefix]].flatten.collect { |n| Prefix.new(n) }
-        when 4
-          @nlris = [h[:nlri]].flatten.collect { |n|
-            prefix = n[:prefix].is_a?(String) ? Prefix.new(n[:prefix]) : n[:prefix]
-            Labeled.new(prefix, *n[:label]) 
-          }
-        when 128,129 ; @nlris = [h[:nlri]].flatten.collect { |n| 
+      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])
-          Labeled.new(Vpn.new(prefix,rd), *n[:label]) }
-        else
+          nlri = Labeled.new(Vpn.new(prefix,rd), *n[:label]) 
+          path_id ? Ext_Nlri.new(path_id, nlri) : nlri
         end
+      else
       end
+    end
+
+    def nexthops
+      @nexthops.collect { |nh| nh.nexthop }.join(", ")
+    end
+
+    def mp_reach
+      "\n    AFI #{IANA.afi(afi)} (#{afi}), SAFI #{IANA.safi(safi)} (#{safi})" +
+      "\n    nexthop: " + nexthops +
+      (['']+ @nlris.collect { |nlri| nlri.to_s }).join("\n      ")
+    end
+
+    def to_s(method=:default)
+      super(mp_reach, method)
+    end
+
+    def to_hash
+    end
+
+    def parse(s,arg=false)
       
-      def nexthops
-        @nexthops.collect { |nh| nh.nexthop }.join(", ")
-      end
-      
-      def mp_reach
-        "\n    AFI #{IANA.afi(afi)} (#{afi}), SAFI #{IANA.safi(safi)} (#{safi})" +
-        "\n    nexthop: " + nexthops +
-        (['']+ @nlris.collect { |nlri| nlri.to_s }).join("\n      ")
-      end
-      
-      def to_s(method=:default)
-        super(mp_reach, method)
-      end
+      @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)
       
-      def to_hash
+      if arg.respond_to?(:path_id?)
+        path_id_flag = arg.path_id? :recv, @afi, @safi
+      else
+        path_id_flag = arg
       end
       
-      
-      def parse(s)
-        @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)
-        while value.size>0
-          blen = value.slice(0,1).unpack('C')[0]
-          @nlris << Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi)
+      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
-        raise RuntimeError, "leftover afer parsing: #{value.unpack('H*')}" if value.size>0
-        
       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)
-            when 2
-              @nexthops << Prefix.new([128,s.slice!(0,16)].pack('Ca*'),2)
-            end
-          when 128,129
-            @nexthops << Vpn.new([64+32,s.slice!(0,12)].pack('Ca*'))
-          else
-            raise RuntimeError, "cannot parse nexthop for safi #{@safi}"
+      raise RuntimeError, "leftover afer parsing: #{value.unpack('H*')}" if value.size>0
+    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)
+          when 2
+            @nexthops << Prefix.new([128,s.slice!(0,16)].pack('Ca*'),2)
           end
+        when 128,129
+          @nexthops << Vpn.new([64+32,s.slice!(0,12)].pack('Ca*'))
+        else
+          raise RuntimeError, "cannot parse nexthop for safi #{@safi}"
         end
       end
-      
-      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*'))
-        when :mp_unreach
-          super([afi, @safi, @nlris.collect { |n| n.encode }.join].pack('nCa*'))
-        end
-      end
-      
-      def new_unreach
-        s = encode(:mp_unreach)
-        s[1]= [MP_UNREACH].pack('C')
-        Mp_unreach.new(s)
+    end
+    
+    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*'))
+      when :mp_unreach
+        super([afi, @safi, @nlris.collect { |n| n.encode }.join].pack('nCa*'))
       end
-      
     end
-      
+    
+    def new_unreach
+      s = encode(:mp_unreach)
+      s[1]= [MP_UNREACH].pack('C')
+      Mp_unreach.new(s)
+    end
+
+  end
+
 end
 
 load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0