bgp4r 0.0.10 → 0.0.11

data/bgp/common.rb

@@ -82,7 +82,6 @@ class IPAddr
 
 end
 
-
 class Object
   def to_shex(*args)
     self.respond_to?(:encode) ? self.encode(*args).unpack('H*')[0] : ""

data/bgp/messages/capability.rb

@@ -69,11 +69,11 @@ module BGP
           @seqn = seqn
           @cap = cap
         elsif args.size==1 && args.is_a?(String)
-      else
-        parse args[0]
-      end
+        else
+          parse args[0]
+        end
       end
-      
+
       def encode
         [@o1,@seqn, @cap.encode].pack('CNa*')
       end
@@ -142,7 +142,7 @@ module BGP
         parse args[0]
       else
         @msg_type=CAPABILITY
-        add *args
+        add(*args)
       end
     end
 

data/bgp/messages/message.rb

@@ -20,7 +20,7 @@
 # along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-module BGP
+module ::BGP
 
   # http://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml#bgp-parameters-1
 
@@ -90,6 +90,7 @@ module BGP
       ! has_no_path_attribute?
     end
   end
+
 end
 
 load "../../test/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/messages/messages.rb

@@ -1,21 +1,9 @@
-module BGP
-
-  begin
-    unless const_defined? :VERSION
-      BGP.const_set('VERSION', Gem.loaded_specs['bgp4r'].version.to_s)
-    end
-  rescue
-  end
-  
-  %w{ update keepalive open notification capabity}.each do |m|
-    autoload "#{m}".capitalize.to_sym, "bgp/messages/#{m}"    
-  end
-  autoload :Route_refresh,     'bgp/messages/route_refresh'
-  autoload :Orf_route_refresh, 'bgp/messages/route_refresh'
-  autoload :Prefix_orf,        'bgp/orfs/prefix_orf'
-  
-end
-
-
-
+require 'bgp/messages/message'
+require 'bgp/messages/keepalive'
+require 'bgp/messages/update'
+require 'bgp/messages/capability'
+require 'bgp/messages/notification'
+require 'bgp/messages/open'
+require 'bgp/messages/route_refresh'
+require 'bgp/orfs/prefix_orf'
 require 'bgp/messages/markers'

data/bgp/messages/notification.rb

@@ -108,7 +108,7 @@ class Notification < Message
     msg = self.encode
     s = "Notification (#{NOTIFICATION}), length: #{msg.size}: "
     s += "#{Notification.code_to_s(@code)} (#{@code}), #{Notification.code_to_s(@code, @subcode)} (#{@subcode}) " 
-    s += "\ndata: [#{@data}]" if @data.size>0
+    s += "\ndata: [#{@data}]" if @data and @data.size>0
     s
   end
 

data/bgp/messages/update.rb

@@ -40,14 +40,13 @@
 require 'bgp/messages/message'
 require 'bgp/path_attributes/path_attribute'
 
-module BGP
-
-class Update < Message
+class BGP::Update < BGP::Message
+  include BGP
   def as4byte?
     @as4byte ||= false
   end
   alias as4byte as4byte?
-    
+
   def initialize(*args)
     if args[0].is_a?(String) and args[0].is_packed?
       @as4byte=false
@@ -59,7 +58,7 @@ class Update < Message
       set(*args)
     end
   end
-  
+
   def set(*args)
     args.each { |arg|
       if arg.is_a?(Withdrawn)
@@ -71,19 +70,19 @@ class Update < Message
       end
     }
   end
-  
+
   def withdrawn=(val)
     @withdrawn=val if val.is_a?(Withdrawn)
   end
-  
+
   def nlri=(val)
     @nlri=val if val.is_a?(Nlri)
   end
-  
+
   def path_attribute=(val)
     @path_attribute=val if val.is_a?(Path_attribute)
   end
-  
+
   def encode(as4byte=false)
     @as4byte=as4byte
     withdrawn, path_attribute, nlri = '', '', ''
@@ -92,13 +91,13 @@ class Update < Message
     nlri = @nlri.encode if defined? @nlri and @nlri
     super([withdrawn.size, withdrawn, path_attribute.size, path_attribute, nlri].pack('na*na*a*'))
   end
-  
+
   def encode4
     encode(true)
   end
-  
+
   attr_reader :path_attribute, :nlri, :withdrawn
-  
+
   # CHANGED ME: NO DEFAULT HERE, the factory calling us has to tell what it is giving us.
   def parse(s, as4byte=false)
     @as4byte=as4byte
@@ -110,7 +109,7 @@ class Update < Message
     self.path_attribute=Path_attribute.new(enc_path_attribute, as4byte) if len>0
     self.nlri = Nlri.new(update) if update.size>0
   end
-  
+
   def <<(val)
     if val.is_a?(Attr)
       @path_attribute ||= Path_attribute.new
@@ -137,7 +136,7 @@ class Update < Message
     s << @nlri.to_s if defined?(@nlri) and @nlri
     "Update Message (#{UPDATE}), #{as4byte ? "4 bytes AS, " : ''}length: #{msg.size}\n  " + s.join("\n") + "\n" + msg.hexlify.join("\n") + "\n"
   end
-  
+
   def self.withdrawn(u)
     if u.nlri and u.nlri.size>0
       Update.new(Withdrawn.new(*(u.nlri.nlris.collect { |n| n.to_s})))
@@ -149,4 +148,4 @@ class Update < Message
   end
 end
 
-end
+load "../../test/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/misc/live_feed.rb

@@ -1,29 +1,23 @@
-require 'net/telnet'
+#require 'net/telnet'
 require 'bgp4r'
 
-
 class LiveFeed
-  def initialize
-    @host = '129.82.138.6'
-    @port = '50001'
-    @timeout = 10
+  def self.open
+    new.open
   end
-
   def open
-
+    @host = '129.82.138.6'
+    @port = '50001'
     @buf = ''
     @queue = Queue.new
 
     th = Thread.new do 
-      feed = Net::Telnet.new('Host'=> @host, 
-                             'Port' => @port, 
-                             'Timeout'=> 5, 
-                             'Telnetmode' => false)
+      @feed = TCPSocket.new @host, @port
       loop do
-        @buf += feed.recv(2000)
+        @buf += @feed.recv(5000)
       end
     end
-    Thread.new do
+    @th=Thread.new do
       loop do
         pos = (@buf =~ /<OCTETS length=.*>([^<]*)<\/OCTETS>/)
         if pos
@@ -33,17 +27,18 @@ class LiveFeed
         end
       end
     end
+    self
+  end
+  def close
+    @th.kill
+    @feed.close
   end
-  
   def read
     @queue.deq
   end
-
   alias msg read
   alias readmessage read
-    
-end
-
-
 
+end
+# 
 

data/bgp/nlris/label.rb

@@ -37,7 +37,7 @@ module BGP
       end
     end
     def encode(bottom=1)
-      n = (@label <<4) | (@exp & 0x7)<<1 |(bottom &0x1)
+      n = (@label << 4) | ((@exp & 0x7)<< 1) |(bottom & 0x1)
       o1 = (n & 0xff0000) >> 16
       o2 = (n & 0x00ff00) >> 8
       o3 = (n & 0x0000ff)

data/bgp/nlris/nlris.rb

@@ -1,32 +1,8 @@
-#--
-# Copyright 2008, 2009, 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/>.
-#++
-
-module BGP
-end
-
-%w{ nlri prefix labeled vpn rd }.each do |n|
-    BGP.autoload  n.capitalize.to_sym,"bgp/nlris/#{n}"
-end
-
-BGP.autoload :Inet_unicast,    "bgp/nlris/inet"
-BGP.autoload :Inet_multicast,  "bgp/nlris/inet"
-BGP.autoload :Withdrawn,       "bgp/nlris/nlri"
+%w{ 
+  nlri 
+  prefix 
+  inet 
+  labeled 
+  vpn 
+  rd 
+}.each { |n| require "bgp/nlris/#{n}" }

data/bgp/nlris/vpn.rb

@@ -52,10 +52,17 @@ module BGP
       @prefix.ipv6?
     end
     def parse(s, afi=1)
+      # p "-----------"
+      # p s.unpack('H*')
+      # p afi
       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)
+      # p @rd
+      # p nbits
+      # p vpn.unpack('H*')
+      raise if nbits-64==0
+      @prefix= Prefix.new([nbits-64,vpn].pack('Ca*'), afi) if nbits-64>0
     end
     def nexthop
       @prefix.nexthop

data/bgp/optional_parameters/capabilities.rb

@@ -1,8 +1,12 @@
-require 'bgp/optional_parameters/capability'
 
-%w{ mbgp orf route_refresh as4 graceful_restart dynamic }.each do |c|
-    BGP::OPT_PARM::CAP.autoload  "#{c}".capitalize.to_sym,"bgp/optional_parameters/#{c}"
-end
+require 'bgp/optional_parameters/capability'
+require 'bgp/optional_parameters/dynamic'
+require 'bgp/optional_parameters/graceful_restart'
+require 'bgp/optional_parameters/mbgp'
+require 'bgp/optional_parameters/optional_parameter'
+require 'bgp/optional_parameters/orf'
+require 'bgp/optional_parameters/route_refresh'
+require 'bgp/optional_parameters/as4'
 
 module BGP::OPT_PARM
   module DYN_CAP

data/bgp/path_attributes/attributes.rb

@@ -1,22 +1,17 @@
-
-module BGP
-  %w{ 
-    origin next_hop 
-    local_pref 
-    multi_exit_disc 
-    as_path 
-    communities 
-    aggregator 
-    atomic_aggregate 
-    originator_id 
-    cluster_list 
-    mp_reach 
-    mp_unreach 
-    extended_communities 
-    path_attribute
-  }.each do |attr|
-    autoload  attr.capitalize.to_sym,"bgp/path_attributes/#{attr}"
-  end
-  autoload :As4_path, 'bgp/path_attributes/as_path'
+%w{ 
+  origin next_hop 
+  local_pref 
+  multi_exit_disc 
+  as_path 
+  communities 
+  aggregator 
+  atomic_aggregate 
+  originator_id 
+  cluster_list 
+  mp_reach 
+  mp_unreach 
+  extended_communities 
+  path_attribute
+}.each do |attr|
+  require "bgp/path_attributes/#{attr}"
 end
-

data/bgp/path_attributes/communities.rb

@@ -147,6 +147,12 @@ module BGP
     
     %w{ no_export no_advertise no_export_sub_confed no_peer }.each do |wkc| 
       define_method("has_#{wkc}?") do
+        has? Community.const_get(wkc.upcase)
+      end
+    end
+
+    %w{ no_export no_advertise no_export_sub_confed no_peer }.each do |wkc| 
+      define_method("does_not_have_#{wkc}?") do
         ! has? Community.const_get(wkc.upcase)
       end
     end

data/bgp/path_attributes/path_attribute.rb

@@ -20,7 +20,6 @@
 # along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'bgp4r'
 require 'bgp/path_attributes/attribute'
 
 module BGP

data/bgp4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bgp4r}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean-Michel Esnault"]
-  s.date = %q{2010-10-30}
+  s.date = %q{2011-01-08}
   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.extra_rdoc_files = [
@@ -89,6 +89,8 @@ Gem::Specification.new do |s|
      "test/messages/open_test.rb",
      "test/messages/route_refresh_test.rb",
      "test/messages/update_test.rb",
+     "test/misc/live_feed_test.rb",
+     "test/misc/misc.rb",
      "test/neighbor_test.rb",
      "test/nlris/ext_nlri_test.rb",
      "test/nlris/inet_test.rb",
@@ -139,6 +141,9 @@ Gem::Specification.new do |s|
      "test/messages/open_test.rb",
      "test/messages/route_refresh_test.rb",
      "test/messages/update_test.rb",
+     "test/misc",
+     "test/misc/live_feed_test.rb",
+     "test/misc/misc.rb",
      "test/neighbor_test.rb",
      "test/nlris",
      "test/nlris/ext_nlri_test.rb",

data/test/messages/capability_test.rb

@@ -70,18 +70,18 @@ class TestBgpMessagesCapability < Test::Unit::TestCase
   include BGP::OPT_PARM
   def test_capability_1
     cap_msg = BGP::Capability.new
-    assert_equal 'ffffffffffffffffffffffffffffffff001306', cap_msg.to_shex
+    assert_equal('ffffffffffffffffffffffffffffffff001306', cap_msg.to_shex)
     cap_msg <<  BGP::Capability::Revision.advertise( 10, DYN_CAP::Mbgp.new(1,1))
-    assert_match /^(ff){16}001f06000000000a01000400010001/, cap_msg.to_shex
+    assert_match(/^(ff){16}001f06000000000a01000400010001/, cap_msg.to_shex)
     cap_msg <<  BGP::Capability::Revision.advertise( 20, DYN_CAP::Mbgp.new(1,2))
-    assert_match /^(ff){16}002b06\s*000000000a01000400010001\s*000000001401000400010002/, cap_msg.to_shex
+    assert_match(/^(ff){16}002b06\s*000000000a01000400010001\s*000000001401000400010002/, cap_msg.to_shex)
   end
   def test_capability_2
     cap_msg = BGP::Capability.new(
       BGP::Capability::Revision.advertise( 10, DYN_CAP::Mbgp.new(1,1)),
       BGP::Capability::Revision.advertise( 20, DYN_CAP::Mbgp.new(1,2))
     )
-    assert_match /^(ff){16}002b06\s*000000000a01000400010001\s*000000001401000400010002/, cap_msg.to_shex
+    assert_match(/^(ff){16}002b06\s*000000000a01000400010001\s*000000001401000400010002/, cap_msg.to_shex)
   end
   def test_capability_3
 

data/test/messages/markers_test.rb

@@ -23,11 +23,12 @@
 require 'test/unit'
 require 'bgp4r'
 require 'bgp/messages/markers'
+require 'bgp/nlris/nlris'
 class End_of_rib_markers_Test < Test::Unit::TestCase
   include BGP
   def test_end_of_rib_maker_messages
-    assert_match /(ff){16}00170200000000/, Update.end_of_rib_marker.to_shex
-    assert_match /(ff){16}001d0200000006800f03000104/, Update.end_of_rib_marker(:afi=>1, :safi=>4).to_shex
-    assert_match /(ff){16}001d0200000006800f03000180/, Update.end_of_rib_marker(:afi=>1, :safi=>128).to_shex
+    assert_match(/(ff){16}00170200000000/, Update.end_of_rib_marker.to_shex)
+    assert_match(/(ff){16}001d0200000006800f03000104/, Update.end_of_rib_marker(:afi=>1, :safi=>4).to_shex)
+    assert_match(/(ff){16}001d0200000006800f03000180/, Update.end_of_rib_marker(:afi=>1, :safi=>128).to_shex)
   end
 end

data/test/messages/notification_test.rb

@@ -36,10 +36,10 @@ class Notification_Test < Test::Unit::TestCase
     assert_equal('Invalid Capability Length', Notification.code_to_s(7,2))
     assert_equal('Malformed Capability Value', Notification.code_to_s(7,3))
     notif = BGP::Notification.new(1,1)
-    assert_match /^(ff){16}0015030101$/, notif.to_shex
+    assert_match(/^(ff){16}0015030101$/, notif.to_shex)
     assert_equal(notif.encode, Notification.new(notif).encode)
     notif = BGP::Notification.new(2,2,'some data')
-    assert_match /(ff){16}001e030202736f6d652064617461/, notif.to_shex
+    assert_match(/(ff){16}001e030202736f6d652064617461/, notif.to_shex)
     assert_equal(notif.encode, Notification.new(notif).encode)
     s = 'ffffffffffffffffffffffffffffffff001e030202736f6d652064617461'
     m = Message.factory([s].pack('H*'))

data/test/messages/update_test.rb

@@ -128,7 +128,7 @@ class Update_Test < Test::Unit::TestCase
     "
   end
   
-  def test_7
+  def test_8
     s = 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0072020000001F4001010040020A0204212C051319351AFE400304557200D9C00804212C045C175D76D6175D76DE1659299C175929981659235C16592D6417592D6417592D6617592D6217C3D228185D73241859284417C3FE84165C727015592190'
     m = Update.new([s].pack('H*'), true)
     pa = m.path_attribute
@@ -140,12 +140,15 @@ class Update_Test < Test::Unit::TestCase
     assert_equal '100 556533011 422910718', pa[As_path].as_path
   end
   
-  # def test_8
-  #   s = 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002302000C16D403741755C68816D408300000'
-  #   m = Update.new([s].pack('H*'))
-  # end
-  # 
-  # def test_9
+  def test_9
+    s = 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002302000C16D403741755C68816D408300000'
+    m = Update.new([s].pack('H*'))
+    assert m.withdrawn, "Should contain withdrawn routes."
+    assert_equal 3,m.withdrawn.nlris.size
+  end
+  
+  #--
+  # def test_10
   #   s = 'ffff ffff ffff ffff ffff ffff ffff ffff
   #   005f 0200 0000 4440 0101 0040 020e 0206
   #   0064 212c 232a 0ddd 53f9 5ba0 4003 0428
@@ -154,8 +157,9 @@ class Update_Test < Test::Unit::TestCase
   #   000d dd00 0053 f900 0302 9e18 5bd9 c5
   #   '.split.join
   #   m = Update.new([s].pack('H*'))
-  #   p m
+  #   p m.path_attribute[:next_hop]
+  #   p m.path_attribute[:as_path]
   # end
-    
+  #++
 
 end

data/test/misc/live_feed_test.rb

@@ -0,0 +1,16 @@
+require "test/unit"
+require "bgp/misc/live_feed"
+
+class TestBgpMiscLiveFeed < Test::Unit::TestCase
+  def test_feed
+    feed = LiveFeed.open
+    n=0
+    loop do
+      n+=1
+      break if n>20
+      msg_shex = feed.read.unpack('H*')[0]
+      assert_match( /ff{16}....(02|04|05|01)/, msg_shex)
+    end
+    feed.close
+  end
+end

data/test/misc/misc.rb

@@ -0,0 +1,13 @@
+require "test/unit"
+
+require "bgp4r"
+
+class TestBgp4r < Test::Unit::TestCase
+  def test_1
+    s = "ffffffffffffffffffffffffffffffff0084020000006d400101024002008004040000000040050400000064c00804282b4e87c010080002282b00007530800a080000000100000004800904513411d2800e310001800c0000000000000000513411d2007401c4f100000c8f00126cdcac14b0907801c53100000c8f00126cdcac14b092"
+    msg = BGP::Message.factory([s].pack('H*'))
+    assert_equal BGP::Update, msg.class
+  end
+  def test_2
+  end
+end

data/test/nlris/nlri_test.rb

@@ -92,34 +92,6 @@ class Withdrawn_Test < Test::Unit::TestCase
   end
 end
 
-class Nlri_Test < Test::Unit::TestCase
-  include BGP
-  def test_1
-    nlri1 = Nlri.new
-    nlri1 << Nlri::Ip4.new('20.0.0.0/15')
-    nlri1 << '20.0.0.0/17'
-    nlri1 << '20.0.0.0/24'
-    s = '0f140010140011140000'
-    nlri2 = Nlri.new([s].pack('H*'))
-    assert_equal('0f140010140011140000', nlri2.to_shex)
-    assert_raise(ArgumentError)  { nlri2.to_shex(true) }
-    assert_equal(3,nlri2.nlris.size)
-         
-  end
-
-  def test_2
-    nlri1 = Nlri.new
-    nlri1 << Nlri::Ip4.new('20.0.0.0/15')
-    nlri1 << '20.0.0.0/17'
-    nlri1 << '20.0.0.0/24'
-    s = '0f140010140011140000'
-    nlri2 = Nlri.new([s].pack('H*'))
-    assert_equal('0f140010140011140000', nlri2.to_shex)
-    assert_raise(ArgumentError)  { nlri2.to_shex(true) }
-    assert_equal(3,nlri2.nlris.size)      
-  end
-end
-
 class Prefix_Test < Test::Unit::TestCase
   include BGP
   def test_1
@@ -130,23 +102,10 @@ class Prefix_Test < Test::Unit::TestCase
     assert(Prefix.new('192.168.0.0/16').ipv4?)
     assert_equal('10c0a8',Prefix.new('192.168.0.0/16').to_shex)
     assert_equal('402009000400040000',Prefix.new('2009:4:4::/64').to_shex)
-    assert('402009000400040000',Prefix.new('2009:4:4::/64').ipv6?)
+    assert Prefix.new('2009:4:4::/64').ipv6?
     assert_equal('2009:4:4::/64',Prefix.new('2009:4:4::/64').to_s)
   end
 end
-class Inet_unicast_Test < Test::Unit::TestCase
-  include BGP
-  def test_1
-    assert_equal(1,Inet_unicast.new('192.168.0.0/16').afi)
-    assert_equal(1,Inet_unicast.new('192.168.0.0/16').safi)
-    assert_equal(2,Inet_unicast.new('2009:4:4::/64').afi)
-    assert_equal(1,Inet_unicast.new('2009:4:4::/64').safi)
-    assert_equal(1,Inet_multicast.new('192.168.0.0/16').afi)
-    assert_equal(2,Inet_multicast.new('192.168.0.0/16').safi)
-    assert_equal(2,Inet_multicast.new('2009:4:4::/64').afi)
-    assert_equal(2,Inet_multicast.new('2009:4:4::/64').safi)
-  end
-end
 
 class Vpn_Test < Test::Unit::TestCase
   include BGP

data/test/optional_parameters/optional_parameter_test.rb

@@ -30,21 +30,21 @@ class Optional_parameter_Test < Test::Unit::TestCase
     def octet.encode
       [0xab].pack('C')
     end
-    assert_match /^(ff){16}011b01040064007801010101fe(ab){254}$/, 
-            Open.new(4, 100, 120, '1.1.1.1', *([octet]*254)).to_shex
-    assert_match /^(ff){16}011c01040064007801010101ff(ab){255}$/, 
-            Open.new(4, 100, 120, '1.1.1.1', *([octet]*255)).to_shex
-    assert_match /^(ff){16}012001040064007801010101ffff0100(ab){256}$/, 
-            Open.new(4, 100, 120, '1.1.1.1', *([octet]*256)).to_shex
-    assert_match /^(ff){16}012101040064007801010101ffff0101(ab){257}$/, 
-            Open.new(4, 100, 120, '1.1.1.1', *([octet]*257)).to_shex
+    assert_match(/^(ff){16}011b01040064007801010101fe(ab){254}$/, 
+            Open.new(4, 100, 120, '1.1.1.1', *([octet]*254)).to_shex)
+    assert_match(/^(ff){16}011c01040064007801010101ff(ab){255}$/, 
+            Open.new(4, 100, 120, '1.1.1.1', *([octet]*255)).to_shex)
+    assert_match(/^(ff){16}012001040064007801010101ffff0100(ab){256}$/, 
+            Open.new(4, 100, 120, '1.1.1.1', *([octet]*256)).to_shex)
+    assert_match(/^(ff){16}012101040064007801010101ffff0101(ab){257}$/, 
+            Open.new(4, 100, 120, '1.1.1.1', *([octet]*257)).to_shex)
   end
   def test_draft_ietf_idr_ext_opt_param_01_parsing
     mbgp = OPT_PARM::CAP::Mbgp.new(1,1)
     open1 = Open.new(4, 100, 120, '1.1.1.1', *[mbgp]*100)
     open2 = Open.new(4, 100, 120, '1.1.1.1', *[mbgp]*10)
-    assert_match /^(ff){16}034001040064007801010101\s*ffff0320\s*0206010400010001/, open1.to_shex
-    assert_match /^(ff){16}006d01040064007801010101\s*50\s*0206010400010001/, open2.to_shex
+    assert_match(/^(ff){16}034001040064007801010101\s*ffff0320\s*0206010400010001/, open1.to_shex)
+    assert_match(/^(ff){16}006d01040064007801010101\s*50\s*0206010400010001/, open2.to_shex)
     assert_equal Open.new(open1).to_shex, open1.to_shex
     assert_equal Open.new(open2).to_shex, open2.to_shex
   end

data/test/path_attributes/communities_test.rb

@@ -79,12 +79,13 @@ class Communities_Test < Test::Unit::TestCase
     assert   Communities.new("145:60 145:10 145:30 145:20").has?('145:60')
   end
   def test_4
-    assert   Communities.new("145:60 145:10").has_no_export?
-    assert   Communities.new("145:60 145:10").has_no_advertise?
-    assert   Communities.new("145:60 145:10").has_no_export_sub_confed?
-    assert ! Communities.new("145:60 145:10").add(:no_export_sub_confed).has_no_export_sub_confed?
-    assert ! Communities.new("145:60 145:10").add(:no_export).has_no_export?
-    assert ! Communities.new("145:60 145:10").add(:no_advertise).has_no_advertise?
+    assert ! Communities.new("145:60 145:10").has_no_export?, "Not expexted to contain [no_export] community"
+    assert   Communities.new("145:60 145:10").does_not_have_no_export?, "Not expexted to contain [no_export] community"
+    assert ! Communities.new("145:60 145:10").has_no_advertise? , 'Not expected to contain [no_advertise] community'
+    assert ! Communities.new("145:60 145:10").has_no_export_sub_confed?, 'Not expected to contain [no_export_sub_confed] community'
+    assert   Communities.new("145:60 145:10").add(:no_export_sub_confed).has_no_export_sub_confed?, 'expected to contain [no_export_sub_confed]'
+    assert   Communities.new("145:60 145:10").add(:no_export).has_no_export?, 'expected to contain [no_export]'
+    assert   Communities.new("145:60 145:10").add(:no_advertise).has_no_advertise?, 'expected to contain [no_advertise]'
   end
 end
 

data/test/path_attributes/local_pref_test.rb

@@ -40,12 +40,4 @@ class Local_pref_Test < Test::Unit::TestCase
     lp1 = Local_pref.new(lp)
     assert_equal(lp.encode, lp1.encode)
   end
-  def test_3
-    lp =  Local_pref.new(200)
-    assert_equal 200, lp.to_i
-    lp + 13
-    assert_equal 213, lp.to_i
-    lp + -13
-    assert_equal 200, lp.to_i
-  end
 end

data/test/path_attributes/multi_exit_disc_test.rb

@@ -43,12 +43,4 @@ class Multi_exit_disc_Test < Test::Unit::TestCase
     mp1 = Multi_exit_disc.new(mp)
     assert_equal(mp.encode, mp.encode)
   end
-  def test_3
-    med =  Multi_exit_disc.new(200)
-    assert_equal 200, med.to_i
-    med + 13
-    assert_equal 213, med.to_i
-    med + -13
-    assert_equal 200, med.to_i
-  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Jean-Michel Esnault
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 -07:00
+date: 2011-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -100,6 +100,8 @@ files:
 - test/messages/open_test.rb
 - test/messages/route_refresh_test.rb
 - test/messages/update_test.rb
+- test/misc/live_feed_test.rb
+- test/misc/misc.rb
 - test/neighbor_test.rb
 - test/nlris/ext_nlri_test.rb
 - test/nlris/inet_test.rb
@@ -173,6 +175,8 @@ test_files:
 - test/messages/open_test.rb
 - test/messages/route_refresh_test.rb
 - test/messages/update_test.rb
+- test/misc/live_feed_test.rb
+- test/misc/misc.rb
 - test/neighbor_test.rb
 - test/nlris/ext_nlri_test.rb
 - test/nlris/inet_test.rb