bgp4r 0.0.12 → 0.0.13

data/bgp/nlris/vpn.rb

@@ -1,3 +1,11 @@
+#--
+# Copyright 2011 Jean-Michel Esnault.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#
+#
+# This file is part of BGP4R.
+# 
 
 module BGP
   class Vpn
@@ -29,16 +37,26 @@ module BGP
       end
     end
     # len_included arg is used by labeled encode()
-    def encode_next_hop
+    def encode_next_hop(*args)
       Rd.new.encode + @prefix.encode(false)
     end
     def encode(len_included=true)
       if len_included
-        [bit_length, @rd.encode, @prefix.encode(false)].pack('Ca*a*')
+        [bit_length, @rd.encode, @prefix.encode_with_len_without_path_id].pack('Ca*a*')
       else
-        @rd.encode + @prefix.encode(false)
+        @rd.encode + @prefix.encode_without_len_without_path_id
       end
     end
+    def encode_without_len_without_path_id
+      encode(false)
+    end
+    def path_id
+      @prefix.path_id
+    rescue
+    end
+    def path_id=(val)
+      @prefix.path_id=val
+    end
     def bit_length
       @rd.bit_length + @prefix.mlen
     end
@@ -55,14 +73,14 @@ module BGP
       nbits = s.slice!(0,1).unpack('C')[0]
       rd,vpn = s.slice!(0,(7+nbits)/8).unpack("a8a*")
       @rd = Rd.new(rd.is_packed)
-      @prefix= Prefix.new([nbits-64,vpn].pack('Ca*'), afi)
+      @prefix= Prefix.new_ntop([nbits-64,vpn].pack('Ca*'), afi)
     end
     def nexthop
       @prefix.nexthop
     end
     def to_s
        #Label Stack=5806 (bottom) RD=3215:317720610, IPv4=10.45.142.64/32
-      "#{@rd.to_s(false)}, #{@prefix.ipv4? ? 'IPv4' : 'IPv6'}=#{@prefix.to_s}"
+      "#{@rd.to_s(false)}, #{@prefix.to_s_with_afi}"
     end
   end
 end

data/bgp/optional_parameters/add_path.rb

@@ -24,19 +24,6 @@ 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
@@ -60,9 +47,9 @@ module BGP::OPT_PARM::CAP
         raise
       end
     end
-
-    def add(sr, afi,safi)
-      @af[[_afi(afi), _safi(safi)]] = _send_recv(sr)
+    
+    def add(sr, _afi,_safi)
+      @af[[afi(_afi), safi(_safi)]] = _send_recv(sr)
     end
 
     def parse(s)
@@ -111,7 +98,7 @@ module BGP::OPT_PARM::CAP
 
     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)}"
+      "AFI #{IANA.afi?(afi)} (#{afi}), SAFI #{IANA.safi?(safi)} (#{safi}), #{send_recv_to_s(sr)}"
     end
 
     def _send_recv(val)
@@ -133,28 +120,15 @@ module BGP::OPT_PARM::CAP
         'bogus'
       end
     end
-
-    def _afi(val)
-      if val.is_a?(Fixnum)
-        val
-      elsif val == :ipv4
-        1
-      elsif val == :ipv6
-        2
-      end
+    
+    def afi(arg)
+      IANA.afi(arg)
     end
-
-    def _safi(val)
-      if val.is_a?(Fixnum)
-        val
-      elsif val == :unicast
-        1
-      elsif val == :multicast
-        2
-      end
+    def safi(arg)
+      IANA.safi(arg)
     end
-
+    
   end
 end
 
-load "../../test/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/optional_parameters/as4.rb

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

data/bgp/optional_parameters/capability.rb

@@ -80,14 +80,6 @@ module BGP::OPT_PARM
       end
     end
     
-    def method_missing()
-      if name == :to_s_brief
-        "#{self.class.to_s.split('::').last}"
-      else
-        super
-      end
-    end
-    
   end
 end
 
@@ -98,8 +90,6 @@ module BGP
   end
 end
 
-# require 'bgp4r'
-
 module BGP::OPT_PARM
   def Capability.factory(s)
     code = s.slice(2,1).unpack('C')[0]
@@ -148,4 +138,4 @@ module BGP::OPT_PARM
     end
 end
 
-load "../../test/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/optional_parameters/dynamic.rb

@@ -34,4 +34,4 @@ class Dynamic < BGP::OPT_PARM::Capability
 end
 end
 
-load "../../test/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/optional_parameters/graceful_restart.rb

@@ -36,8 +36,8 @@ class Graceful_restart < BGP::OPT_PARM::Capability
     end
   end
   
-  def add(afi,safi,flags)
-    @tuples << [_afi(afi), _safi(safi), flags]
+  def add(afi,safi,af_flags=0)
+    @tuples << [_afi(afi), _safi(safi), af_flags]
   end
 
   def parse(s)
@@ -59,16 +59,40 @@ class Graceful_restart < BGP::OPT_PARM::Capability
   end
   def to_s
     s = []
-    s <<  "\n    Graceful Restart Extension (#{CAP_GR}), length: 4"
+    s <<  "\n    Graceful Restart Extension (#{CAP_GR}), length: #{encode.size}"
     s <<  "    Restart Flags: #{restart_flag}, Restart Time #{@restart_time}s"
     s = s.join("\n  ")
     super + (s + (['']+@tuples.collect { |af| address_family(*af)}).join("\n        "))
   end
   
+  def method_missing(name, *args, &block)
+    if name.to_s =~ /^(.+)_forwarding_state_(.+)/
+      state = $2
+      afi_safi = $1
+      afi, *safi = afi_safi.to_s.split('_')
+      _afi  = IANA.afi?(afi.to_sym)
+      _safi = IANA.safi?((safi.join('_')).to_sym)
+      if state == 'preserved'
+        _state = 0x80
+      elsif state == 'not_preserved'
+        _state = 0
+      else
+        super
+      end
+      if _afi and _safi
+        add _afi,_safi, _state
+      else
+        super
+      end
+    else
+      super
+    end
+  end
+  
   private
   
   def address_family(afi, safi, flags)
-    "AFI #{IANA.afi(afi)} (#{afi}), SAFI #{IANA.safi(safi)} (#{safi}), #{address_family_flags(flags)}"
+    "AFI #{IANA.afi?(afi)} (#{afi}), SAFI #{IANA.safi?(safi)} (#{safi}), #{address_family_flags(flags)}"
   end
   
   def restart_flag
@@ -80,37 +104,26 @@ class Graceful_restart < BGP::OPT_PARM::Capability
   end
   
   def address_family_flags(flags)
-    if flags & 1 == 0
+    if flags & 0x80 == 0
       "Forwarding state not preserved (0x#{flags.to_s(16)})"
-    elsif flags & 1 == 1
+    elsif flags & 0x80 == 0x80
       "Forwarding state preserved (0x#{flags.to_s(16)})"
+    else
+      "Flags (0x#{flags.to_s(16)}"
     end
   end
   
   def _afi(val)
-    if val.is_a?(Fixnum)
-      val
-    elsif val == :ipv4
-      1
-    elsif val == :ipv6
-      2
-    end
+    IANA.afi(val)
   end
   
   def _safi(val)
-    if val.is_a?(Fixnum)
-      val
-    elsif val == :unicast
-      1
-    elsif val == :multicast
-      2
-    end
+    IANA.safi(val)
   end
   
-  
 end
 end
 
-load "../../test/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
 
 

data/bgp/optional_parameters/mbgp.rb

@@ -25,21 +25,18 @@ require 'bgp/optional_parameters/capability'
 module BGP::OPT_PARM::CAP
   
   class Mbgp < BGP::OPT_PARM::Capability 
-
-    def self.ipv4_unicast
-      Mbgp.new(1,1)
-    end
-
-    def self.ipv4_multicast
-      Mbgp.new(1,2)
-    end
-
-    def self.ipv6_unicast
-      Mbgp.new(2,2)
-    end
-
-    def self.ipv6_multicast
-      Mbgp.new(2,2)
+    
+    class << self
+      def method_missing(name, *args, &block)
+        afi, *safi = name.to_s.split('_')
+        _afi  = IANA.afi?(afi.to_sym)
+        _safi = IANA.safi?((safi.join('_')).to_sym)
+        if _afi and _safi
+          new _afi,_safi
+        else
+          super
+        end
+      end
     end
 
     def initialize(afi,safi=nil)
@@ -50,27 +47,16 @@ module BGP::OPT_PARM::CAP
         self.safi, self.afi = safi, afi
       end
     end
-
-    def afi=(val)
-      @afi = if val.is_a?(Fixnum)
-        val
-      elsif val == :ipv4
-        1
-      elsif val == :ipv6
-        2
-      end
+    
+    def afi=(arg)
+      @afi = IANA.afi(arg)
     end
-
-    def safi=(val)
-      @safi = if val.is_a?(Fixnum)
-        val
-      elsif val == :unicast
-        1
-      elsif val == :multicast
-        2
-      end
+    def safi=(arg)
+      @safi = IANA.safi(arg)
     end
-
+    
+    attr_reader :afi, :safi
+    
     def encode
       super([@afi,0,@safi].pack('nCC'))
     end
@@ -81,11 +67,11 @@ module BGP::OPT_PARM::CAP
 
     def to_s
       super + "\n    Multiprotocol Extensions (#{CAP_MBGP}), length: 4" +
-      "\n      AFI #{IANA.afi(@afi)} (#{@afi}), SAFI #{IANA.safi(@safi)} (#{@safi})"
+      "\n      AFI #{IANA.afi?(@afi)} (#{@afi}), SAFI #{IANA.safi?(@safi)} (#{@safi})"
     end
     
     def to_s_brief
-      "MBGP #{IANA.afi(@afi)}, #{IANA.safi(@safi)}"
+      "MBGP #{IANA.afi?(@afi)}, #{IANA.safi?(@safi)}"
     end
 
     def to_hash
@@ -94,4 +80,4 @@ module BGP::OPT_PARM::CAP
   end
 end
 
-load "../../test/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/optional_parameters/orf.rb

@@ -87,4 +87,4 @@ class Orf < BGP::OPT_PARM::Capability
 end
 end
 
-load "../../test/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/optional_parameters/route_refresh.rb

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

data/bgp/orfs/prefix_orf.rb

@@ -120,18 +120,15 @@ module BGP
     end
     
     def size
-      @prefix.nbyte+7+1    
+      @prefix.nbytes+7+1
     end
     
     def _parse_(s, afi=1)
-      #puts "s before parse: #{s.unpack('H*')}"
       o1, @seqn, @min, @max, prefix = s.unpack('CNCCa*')
       @action = o1 >> 6
       @match = (o1 >> 5) & 1
-      @prefix = BGP::Prefix.new(prefix.is_packed, afi)
-      #puts "size of orf entry is : #{size}"
+      @prefix = BGP::Prefix.new_ntop(prefix.is_packed, afi)
       s.slice!(0,size)
-      #puts "s after parse: #{s.unpack('H*')}"
     end
 
     def self.add(*args) ; Prefix_entry.new(0,*args)  ; end
@@ -178,7 +175,7 @@ class BGP::Prefix_orf < BGP::Orf
 
 end
 
-load "../../test/orfs/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/orfs/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
 
 __END__
 

data/bgp/path_attributes/aggregator.rb

@@ -101,4 +101,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/as_path.rb

@@ -227,5 +227,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/atomic_aggregate.rb

@@ -39,4 +39,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/cluster_list.rb

@@ -114,4 +114,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/communities.rb

@@ -171,4 +171,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/extended_communities.rb

@@ -104,4 +104,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/extended_community.rb

@@ -30,6 +30,7 @@ module BGP
 
     ROUTE_TARGET = 2
     ROUTE_ORIGIN = 3
+    LINK_BANDWIDTH = 4
     OSPF_DOMAIN_ID = 5
     OSPF_ROUTER_ID = 7
     BGP_DATA_COLLECT = 8
@@ -40,19 +41,7 @@ module BGP
     TWO_OCTET_AS = 0
     IPV4_ADDR = 1
     OPAQUE = 3
-
-    def _encoded_value_
-      case @type & 3
-      when TWO_OCTET_AS
-        [@global, @local].pack('nN')
-      when IPV4_ADDR
-        [@global, @local].pack('Nn')
-      when OPAQUE
-        [@global].pack('H12')
-      else
-        raise RuntimeError, "bogus type: #{@type}"
-      end
-    end
+    FLOAT = -1
     
     def encode
       [@type, @subtype, _encoded_value_].pack('CCa6')
@@ -60,12 +49,14 @@ module BGP
     
     def parse(s)
       @type, @subtype = s.slice!(0,2).unpack('CC')
-      case @type & 3
+      case community_structure
       when TWO_OCTET_AS ; @global, @local = s.unpack('nN')
       when IPV4_ADDR
         @global, @local = s.unpack('Nn')
       when OPAQUE
         @global = s.unpack('H12')
+      when FLOAT
+        _, @global = s.unpack('ng')
       end
     end
     
@@ -121,6 +112,44 @@ module BGP
     def name
       self.class.to_s.split('::').last.gsub('_',' ')
     end
+
+    def to_s
+      case community_structure
+      when TWO_OCTET_AS
+        "#{name}: #{@global}:#{@local}"
+      when IPV4_ADDR
+        "#{name}: #{IPAddr.create(@global)}:#{@local}"
+      when OPAQUE
+        "#{name}: #{@global}"
+      when FLOAT
+        "#{name}: #{[@global].pack('g').unpack('g')[0]}"
+      else
+        raise RuntimeError, "bogus type: #{@type}"
+      end
+    end
+
+    private
+
+    def community_structure
+      cs = @type & 3
+      cs = FLOAT if cs == TWO_OCTET_AS and @subtype == LINK_BANDWIDTH
+      return cs
+    end
+
+    def _encoded_value_
+      case community_structure
+      when TWO_OCTET_AS
+        [@global, @local].pack('nN')
+      when IPV4_ADDR
+        [@global, @local].pack('Nn')
+      when OPAQUE
+        [@global].pack('H12')
+      when FLOAT
+        [0,@global].pack('ng')
+      else
+        raise RuntimeError, "bogus type: #{@type}"
+      end
+    end
     
   end
   
@@ -142,6 +171,7 @@ module BGP
       when OSPF_DOMAIN_ID   ; Ospf_domain_id.new(s)
       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)
       else
         puts "too bad type #{type}, subtype #{subtype} : #{s.unpack('H*')}"
         Extended_community.new(s)
@@ -173,18 +203,6 @@ module BGP
       end
     end
 
-    def to_s
-      case @type & 3
-      when TWO_OCTET_AS
-        "#{name}: #{@global}:#{@local}"
-      when IPV4_ADDR
-        "#{name}: #{IPAddr.create(@global)}:#{@local}"
-      when OPAQUE
-        "#{name}: #{@global}"
-      else
-        raise RuntimeError, "bogus type: #{@type}"
-      end
-    end
 
   end
 
@@ -250,5 +268,16 @@ module BGP
       end
     end
   end
+  
+  class Link_bandwidth < Extended_community
+    def initialize(*args)
+      if args[0].is_a?(String) and args[0].is_packed?
+        super(*args)
+      else
+        args += [0]
+        super(NON_TRANSITIVE | TWO_OCTET_AS, LINK_BANDWIDTH, *args)
+      end
+    end
+  end
 
 end

data/bgp/path_attributes/local_pref.rb

@@ -76,4 +76,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