bgp4r 0.0.11 → 0.0.12

data/bgp/path_attributes/mp_unreach.rb

@@ -30,12 +30,13 @@ module BGP
     attr_reader :safi, :nlris
 
     def initialize(*args)
-      @safi, @nlris= 1, []
+      @safi, @nexthops, @nlris, @path_id= 1, [], [], nil # default is ipv4/unicast
       @flags, @type = OPTIONAL, MP_UNREACH
       if args[0].is_a?(String) and args[0].is_packed?
-        parse(args[0])
+        parse(*args)
       elsif args[0].is_a?(self.class)
-        parse(args[0].encode, *args[1..-1])
+        s = args.shift.encode
+        parse(s, *args)
       elsif args[0].is_a?(Hash) and args.size==1
         set(*args)
       else
@@ -43,27 +44,60 @@ module BGP
       end
     end
 
-    def afi
+   def afi
       @afi ||= @nlris[0].afi
     end
 
+    # FIXME: refactor with mp_reach ....
     def set(h)
-      @safi = h[:safi]
-      h[:nlri]   ||=[]
-      h[:prefix] ||=[]
+      h[:nlris] ||=[]
       @afi = h[:afi] if h[:afi]
+      @safi = h[:safi]
+      @path_id = path_id = h[:path_id]
       case @safi
-      when 1,2
-        @nlris = [h[:prefix]].flatten.collect { |p| p.is_a?(Prefix) ? p : Prefix.new(p) }
+      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[:nlri]].flatten.collect { |n|
+        @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]
-          Labeled.new(prefix, *n[:label]) 
-        }
-      when 128,129 ; @nlris = [h[:nlri]].flatten.collect { |n| 
-        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]) }
+          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
@@ -76,22 +110,41 @@ module BGP
     def to_s(method=:default)
       super(mp_unreach, method)
     end
-
-    def parse(s)
+    
+    def parse(s,arg=false)
+      
       @flags, @type, len, value = super(s)
       @afi, @safi = value.slice!(0,3).unpack('nC')
+      
+      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]
-        @nlris << Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi)
+        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
       end
       raise RuntimeError, "leftover afer 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/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/path_attribute.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.
 #
@@ -21,6 +21,7 @@
 #++
 
 require 'bgp/path_attributes/attribute'
+require 'bgp/neighbor/add_path_cap'
 
 module BGP
 
@@ -39,6 +40,7 @@ module BGP
         add(*args)
       end
     end
+
     def add(*args)
       @attributes ||=[]
       args.each { |arg| @attributes << arg if arg.is_a?(BGP::Attr) }
@@ -218,13 +220,32 @@ module BGP
       end
     end
     include BGP::ATTR
-    def self.factory(s, as4byte=false)
+    def self.factory(s, arg=nil)
+      #FIXME:
+      
+      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
+      
       flags, type = s.unpack('CC')
       case type
       when ORIGIN
         Origin.new(s)
       when AS_PATH
-        As_path.new(s,as4byte)
+        As_path.new(s,as4byte_flag)
       when NEXT_HOP
         Next_hop.new(s)
       when MULTI_EXIT_DISC
@@ -244,12 +265,14 @@ module BGP
       when CLUSTER_LIST
         Cluster_list.new(s)
       when MP_REACH
-        Mp_reach.new(s)
+        Mp_reach.new(s,path_id_flag)
       when MP_UNREACH
-        Mp_unreach.new(s)
+        Mp_unreach.new(s,path_id_flag)
       when EXTENDED_COMMUNITY
         Extended_communities.new(s)
       else
+        #FIXME: raise UnknownPathAttributeError() ....
+        p s
         Unknown.new(s)
       end
     end

data/bgp4r.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bgp4r}
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean-Michel Esnault"]
-  s.date = %q{2011-01-08}
+  s.date = %q{2011-02-13}
   s.description = %q{BGP4R is a BGP-4 ruby library to create,  send, and receive  BGP messages in an  object oriented manner}
-  s.email = %q{jesnault@gmail.com}
+  s.email = %q{bgp4r@esnault.org}
   s.extra_rdoc_files = [
     "LICENSE.txt",
      "README.rdoc"
@@ -33,7 +33,8 @@ Gem::Specification.new do |s|
      "bgp/messages/route_refresh.rb",
      "bgp/messages/update.rb",
      "bgp/misc/live_feed.rb",
-     "bgp/neighbor.rb",
+     "bgp/neighbor/add_path_cap.rb",
+     "bgp/neighbor/neighbor.rb",
      "bgp/nlris/inet.rb",
      "bgp/nlris/label.rb",
      "bgp/nlris/labeled.rb",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
      "bgp/nlris/prefix.rb",
      "bgp/nlris/rd.rb",
      "bgp/nlris/vpn.rb",
+     "bgp/optional_parameters/add_path.rb",
      "bgp/optional_parameters/as4.rb",
      "bgp/optional_parameters/capabilities.rb",
      "bgp/optional_parameters/capability.rb",
@@ -79,8 +81,13 @@ Gem::Specification.new do |s|
      "examples/unit-testing/malformed_update.rb",
      "examples/unit-testing/no_export.rb",
      "examples/unit-testing/prepend_aspath.rb",
+     "examples/unit-testing/test.rb",
+     "examples/unit-testing/test1.rb",
+     "examples/unit-testing/test2.rb",
      "examples/unit-testing/unknown_transitive_attr.rb",
      "test/common_test.rb",
+     "test/helpers/server.rb",
+     "test/iana_test.rb",
      "test/messages/capability_test.rb",
      "test/messages/keepalive_test.rb",
      "test/messages/markers_test.rb",
@@ -91,12 +98,14 @@ Gem::Specification.new do |s|
      "test/messages/update_test.rb",
      "test/misc/live_feed_test.rb",
      "test/misc/misc.rb",
-     "test/neighbor_test.rb",
+     "test/neighbor/add_path_cap_test.rb",
+     "test/neighbor/neighbor_test.rb",
      "test/nlris/ext_nlri_test.rb",
      "test/nlris/inet_test.rb",
      "test/nlris/labeled_test.rb",
      "test/nlris/nlri_test.rb",
      "test/nlris/rd_test.rb",
+     "test/optional_parameters/add_path_test.rb",
      "test/optional_parameters/as4_test.rb",
      "test/optional_parameters/capability_test.rb",
      "test/optional_parameters/dynamic_test.rb",
@@ -132,6 +141,9 @@ Gem::Specification.new do |s|
   s.summary = %q{A BGP-4 Ruby Library}
   s.test_files = [
     "test/common_test.rb",
+     "test/helpers",
+     "test/helpers/server.rb",
+     "test/iana_test.rb",
      "test/messages",
      "test/messages/capability_test.rb",
      "test/messages/keepalive_test.rb",
@@ -144,7 +156,9 @@ Gem::Specification.new do |s|
      "test/misc",
      "test/misc/live_feed_test.rb",
      "test/misc/misc.rb",
-     "test/neighbor_test.rb",
+     "test/neighbor",
+     "test/neighbor/add_path_cap_test.rb",
+     "test/neighbor/neighbor_test.rb",
      "test/nlris",
      "test/nlris/ext_nlri_test.rb",
      "test/nlris/inet_test.rb",
@@ -152,6 +166,7 @@ Gem::Specification.new do |s|
      "test/nlris/nlri_test.rb",
      "test/nlris/rd_test.rb",
      "test/optional_parameters",
+     "test/optional_parameters/add_path_test.rb",
      "test/optional_parameters/as4_test.rb",
      "test/optional_parameters/capability_test.rb",
      "test/optional_parameters/dynamic_test.rb",

data/bgp4r.rb

@@ -4,4 +4,4 @@ require 'bgp/messages/messages'
 require 'bgp/path_attributes/attributes'
 require 'bgp/nlris/nlris'
 require 'bgp/optional_parameters/capabilities'
-require 'bgp/neighbor'
+require 'bgp/neighbor/neighbor'

data/examples/unit-testing/malformed_update.rb

@@ -36,6 +36,7 @@ class TestBgp < Test::Unit::TestCase
     msg = recv(queue)
     assert msg, "Did not receive expected BGP update message."
     assert_instance_of(Notification, msg)
+    sleep 0.3
     assert_equal 'Missing Well-known Attribute', msg.to_string
     assert @n100.is_idle?
   end
@@ -61,7 +62,7 @@ class TestBgp < Test::Unit::TestCase
        nil
      end
   end
-    
+  
   def malformed_update
      update = Update.new(
        Path_attribute.new(

data/examples/unit-testing/test.rb

@@ -0,0 +1,82 @@
+
+require 'bgp4r'
+require 'timeout'
+
+Thread.abort_on_exception=true
+
+
+include BGP
+
+Log.create
+Log.level=Logger::DEBUG
+
+N100 = Class.new(BGP::Neighbor)
+
+class RecvMsgHandler
+  def initialize(q)
+    @q = q
+  end
+  def update(bgp_msg)
+    @q.enq bgp_msg
+  end
+end
+
+def setup
+  @n100 = N100.new(:my_as=> 100, :remote_addr => '40.0.0.2', :local_addr => '40.0.0.1', :id=> '13.11.19.59')
+  start_peering
+end
+
+def test_verify_missing_well_known_attribute_is_greeting_with_a_notification_from_as200
+  queue = Queue.new
+  @n100.add_observer RecvMsgHandler.new(queue)
+  @n100.send_message malformed_update
+  msg = recv(queue)
+end
+
+def teardown
+  @n100.stop
+  sleep(0.5)
+end
+
+private
+
+def start_peering
+  @n100.capability :as4_byte
+  @n100.start
+end
+
+def recv(q, timeout=5)
+  begin
+    Timeout::timeout(timeout) do |t| 
+      msg = q.deq
+    end
+  rescue Timeout::Error => e
+    nil
+  end
+end
+
+def malformed_update
+  update = Update.new(
+  Path_attribute.new(
+  Origin.new(0),
+  Multi_exit_disc.new(100),
+  Local_pref.new(100),
+  As_path.new(100)
+  ),
+  Nlri.new('77.0.0.0/17', '78.0.0.0/18', '79.0.0.0/19')
+  )
+end
+
+setup
+p @n100.inspect
+p @n100.inspect
+p @n100.inspect
+p @n100.inspect
+p @n100.inspect
+p @n100.inspect
+p @n100.inspect
+p @n100.inspect
+p @n100.instance_eval { @cap }
+
+test_verify_missing_well_known_attribute_is_greeting_with_a_notification_from_as200
+teardown

data/examples/unit-testing/test1.rb

@@ -0,0 +1,82 @@
+require "test/unit"
+require 'bgp4r'
+require 'timeout'
+
+Thread.abort_on_exception=true
+
+include BGP
+
+Log.create
+Log.level=Logger::DEBUG
+
+N100 = Class.new(BGP::Neighbor)
+N300 = Class.new(BGP::Neighbor)
+
+class RecvMsgHandler
+  def initialize(q)
+    @q = q
+  end
+  def update(bgp_msg)
+    @q.enq bgp_msg
+  end
+end
+
+def setup
+  @n100 = N100.new(:my_as=> 100, :remote_addr => '40.0.0.2', :local_addr => '40.0.0.1', :id=> '13.11.19.59')
+  @n300 = N300.new(:my_as=> 300, :remote_addr => '40.0.1.1', :local_addr => '40.0.1.2', :id=> '13.11.19.57')
+  start_peering
+end
+
+def test_verify_that_200_is_prepended_to_aspath
+  queue = Queue.new
+  @n300.add_observer RecvMsgHandler.new(queue)
+  send_update_to @n100
+  msg = recv(queue)
+  puts msg
+end
+
+def teardown
+  [@n100, @n300].each { |n| n.stop }
+  sleep(0.5)
+end
+
+private
+
+def start_peering
+  [@n100, @n300].each { |n| 
+    n.capability :as4_byte
+    n.start 
+  }
+end
+
+def recv(q, timeout=5)
+  begin
+    Timeout::timeout(timeout) do |t| 
+      msg = q.deq
+    end
+  rescue Timeout::Error => e
+    nil
+  end
+end
+
+def update1
+  update = Update.new(
+  Path_attribute.new(
+  Origin.new(0),
+  Next_hop.new('40.0.0.1'),
+  Multi_exit_disc.new(100),
+  Local_pref.new(100),
+  As_path.new(100),
+  Communities.new('1311:1 311:59 2805:64')
+  ),
+  Nlri.new('77.0.0.0/17', '78.0.0.0/18', '79.0.0.0/19')
+  )
+end
+
+def send_update_to(n)
+  n.send_message update1
+end
+
+setup
+test_verify_that_200_is_prepended_to_aspath
+

data/examples/unit-testing/test2.rb

@@ -0,0 +1,44 @@
+
+require 'bgp4r'
+require 'test/helpers/server'
+
+include BGP
+include BGP::OPT_PARM::CAP
+include BGP::TestHelpers
+
+def test_start
+  start_server(3456)
+  @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+  @c.start :port=> 3456
+end
+
+def test_start_no_blocking
+  start_server(3333)
+  @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+  @c.start :port=> 3333, :no_blocking=>true
+  assert_equal('OpenSent', @c.state)
+  assert_match(/(Active|OpenSent)/, @s.state)
+  stop_server
+end
+
+def test_send_and_receive_path_id_afi_1_safi_1
+  server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
+  server_add_path_cap.add(:send_and_recv, 1, 1)
+  start_server(3456, server_add_path_cap)
+  @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+  @c.add_cap server_add_path_cap
+  @c.start :port=> 3456    
+  assert @s.session_info.recv_inet_unicast?, 
+  "Should have the capability to recv inet unicast reachability path info."
+  assert @s.session_info.send_inet_unicast?, 
+  "Should have the capability to send inet unicast reachability path info."
+  assert @c.session_info.recv_inet_unicast?, 
+  "Should have the capability to recv inet unicast reachability path info."
+  assert @c.session_info.send_inet_unicast?, 
+  "Should have the capability to send inet unicast reachability path info."
+  stop_server
+end
+
+start_server(3456)
+@c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+@c.start :port=> 3456

data/test/common_test.rb

@@ -46,6 +46,13 @@ class Common_Test < Test::Unit::TestCase
     assert_equal('255.255.255.254', IPAddr.new('1.1.1.1/31').netmask)
     assert_equal('255.255.255.252', IPAddr.new('1.1.1.1/30').netmask)
     assert_equal('255.255.255.248', IPAddr.new('1.1.1.1/29').netmask)
+    assert_equal('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff',IPAddr.new('2011:1:18::1').netmask)
+    assert_equal('ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe',IPAddr.new('2011:1:18::1/127').netmask)
+    assert_equal('ffff:ffff:ffff:ffff:8000:0000:0000:0000',IPAddr.new('2011:1:18::1/65').netmask)
+    assert_equal('ffff:ffff:ffff:ffff:0000:0000:0000:0000',IPAddr.new('2011:1:18::1/64').netmask)
+    assert_equal('ffff:ffff:ffff:fffe:0000:0000:0000:0000',IPAddr.new('2011:1:18::1/63').netmask)
+    assert_equal('ffff:ffff:ffff:0000:0000:0000:0000:0000',IPAddr.new('2011:1:18::1/48').netmask)
+    assert_equal('ffff:ffff:0000:0000:0000:0000:0000:0000',IPAddr.new('2011:1:18::1/32').netmask)
   end
   def test_ipaddr_4
     ip1 = IPAddr.new('10.0.0.1/28')

data/test/helpers/server.rb

@@ -0,0 +1,20 @@
+module BGP
+  module TestHelpers
+    def stop_server
+      @s.stop if @s
+      @c.stop if @c
+      @server.close if @server
+      @thread.kill if @thread
+    end
+    def start_server(port, cap=nil)
+      @server = TCPServer.new(port)
+      @thread = Thread.new do 
+        while (session = @server.accept())
+          @s = Neighbor.new(4, 100, 180, '0.0.0.1', '127.0.0.1', '127.0.0.1')
+          @s.add_cap cap if cap
+          @s.start_session(session)
+        end
+      end
+    end
+  end
+end

data/test/iana_test.rb

@@ -0,0 +1,43 @@
+#--
+# Copyright 2011 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/iana"
+
+require 'test/unit'
+class TestBgpIana < Test::Unit::TestCase
+  def test_afi?
+    assert_equal 1, IANA.afi?(:ip)
+    assert_equal 2, IANA.afi?(:ip6)
+    assert_equal 5, IANA.afi?(:bbn)
+    assert_equal 12, IANA.afi?(:appletalk)
+    assert_equal 'IP', IANA.afi?(1)
+    assert_equal 'IP6',IANA.afi?(2)
+  end
+  def test_safi?
+    assert_equal 1, IANA.safi?(:unicast_nlri)
+    assert_equal 2, IANA.safi?(:multicast_nlri)
+    assert_equal 4, IANA.safi?(:label_nlri)
+    assert_equal 5, IANA.safi?(:mcast_vpn)
+    assert_equal 64, IANA.safi?(:tunnel)
+    assert_equal 65, IANA.safi?(:vpls)
+  end
+end

data/test/messages/open_test.rb

@@ -92,7 +92,12 @@ class Open_Test < Test::Unit::TestCase
     assert_equal s, open.to_shex
   end
   def test_4
+    open = Open.new(4,100, 200, '10.0.0.1')
+    open << OPT_PARM::CAP::As4.new(100)
+    open << OPT_PARM::CAP::Route_refresh.new
+    open << OPT_PARM::CAP::Add_path.new(:recv, 1, 1)
+    assert open.find(As4)
+    assert open.find(Route_refresh)
+    assert open.find(Add_path)
   end
-  
-  
 end