bgp4r 0.0.9 → 0.0.10

data/bgp/messages/message.rb

@@ -76,9 +76,20 @@ module BGP
     end
     def self.route_refresh(afi,safi)
       Route_refresh.new(afi,safi).encode
+    end    
+    %w{update keepalive open notification capabity route_refresh }.each do |m|
+      define_method("is_a_#{m}?") do
+        is_a?(BGP.const_get(m.capitalize))
+      end      
+      eval "alias :is_an_#{m}? :is_a_#{m}?" if (m =~ /^[aeiou]/)
+    end
+    def has_no_path_attribute?
+      path_attribute.nil?
+    end
+    def has_a_path_attribute?
+      ! 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

@@ -7,11 +7,15 @@ module BGP
   rescue
   end
   
-  %w{ update keepalive open notification capablity}.each do |m|
-    autoload "#{m}".capitalize.to_sym, "bgp/messages/#{m}"
+  %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/markers'

data/bgp/messages/update.rb

@@ -46,6 +46,8 @@ class Update < Message
   def as4byte?
     @as4byte ||= false
   end
+  alias as4byte as4byte?
+    
   def initialize(*args)
     if args[0].is_a?(String) and args[0].is_packed?
       @as4byte=false
@@ -125,8 +127,10 @@ class Update < Message
     end
   end
 
-  def to_s(as4byte=@as4byte, fmt=:tcpdump)
+  def to_s(as4byte=@as4byte)
+    # def to_s(fmt=:tcpdump)
     msg = encode(as4byte)
+    fmt=:tcpdump
     s = []
     s << @withdrawn.to_s if defined?(@withdrawn) and @withdrawn
     s << @path_attribute.to_s(fmt, as4byte) if defined?(@path_attribute) and @path_attribute

data/bgp/misc/live_feed.rb

@@ -0,0 +1,49 @@
+require 'net/telnet'
+require 'bgp4r'
+
+
+class LiveFeed
+  def initialize
+    @host = '129.82.138.6'
+    @port = '50001'
+    @timeout = 10
+  end
+
+  def open
+
+    @buf = ''
+    @queue = Queue.new
+
+    th = Thread.new do 
+      feed = Net::Telnet.new('Host'=> @host, 
+                             'Port' => @port, 
+                             'Timeout'=> 5, 
+                             'Telnetmode' => false)
+      loop do
+        @buf += feed.recv(2000)
+      end
+    end
+    Thread.new do
+      loop do
+        pos = (@buf =~ /<OCTETS length=.*>([^<]*)<\/OCTETS>/)
+        if pos
+          @queue.enq [$1].pack('H*')
+          @buf.slice!(0,pos+10)
+          sleep(0.1)
+        end
+      end
+    end
+  end
+  
+  def read
+    @queue.deq
+  end
+
+  alias msg read
+  alias readmessage read
+    
+end
+
+
+
+

data/bgp/neighbor.rb

@@ -30,10 +30,23 @@ module BGP
   class Neighbor
     include Observable
     
+    # def self.deprecate(old_method, new_method) 
+    #   define_method(old_method) do |*args, &block|
+    #     log_warn "#{old_method}() is deprecated. Use #{new_method}()."
+    #     __send__(new_method, *args, &block)
+    #   end 
+    # end
+    # 
+    # deprecate :send_message, :send
+
     def log_info(txt)
       Log.info "#{self.class} #{txt}"
     end
 
+    def log_warn(txt)
+      Log.warn "#{self.class} #{txt}"
+    end
+
     def log_debug(txt)
       Log.debug "#{self.class} #{txt}"
     end
@@ -214,16 +227,18 @@ module BGP
       @out.thread
     end
 
+    attr_reader :as4byte
 
     def send_message(m)
       raise if m.nil?
       return unless @out
       unless m.is_a?(String)
         log_info "Send#{m.class.to_s.split('::')[-1]}"
-        log_debug "Send #{m.is_a?(Update) ? m.to_s(@as4byte) : m }\n"
+        log_debug "Send #{m.is_a?(Update) ? m.to_s : m }\n"
       end
+      #FIXME: enqueue [m, as4byte]
       if m.is_a?(Update)
-        @out.enq m.encode(@as4byte)
+        @out.enq m.encode(as4byte)
       else
         @out.enq m
       end
@@ -305,6 +320,7 @@ module BGP
 
     def rcv_notification(m)
       log_info "#{m}"
+      changed and notify_observers(m)
       disable
     end
     

data/bgp/path_attributes/as_path.rb

@@ -26,8 +26,6 @@ module BGP
     
     class As_path < Attr
       
-      ##############################
-      
       class Segment
         include ATTR
         
@@ -62,6 +60,10 @@ module BGP
           @seg_type
         end
         
+        def prepend(as)
+          @as.insert(0,as)
+        end
+        
         def seg_type=(val)
           case val
           when :set             ; @seg_type = SET
@@ -147,8 +149,6 @@ module BGP
         end
       end
       
-      ##############################
-      
       def integer?(arg)
         arg.is_a?(Fixnum) or arg.is_a?(Bignum)
       end
@@ -196,6 +196,14 @@ module BGP
         super(as_path, method, as4byte)
       end
       
+      def find_set
+        @segments.find { |s| s.seg_type == SET }
+      end
+
+      def find_sequence
+        @segments.find { |s| s.seg_type == SEQUENCE }
+      end
+      
       private
       
       def parse(s,as4byte=false)

data/bgp/path_attributes/attribute.rb

@@ -170,6 +170,10 @@ module BGP
     
     attr_reader :type
     
+    def <=>(o)
+      0
+    end
+    
     def method_missing(name, *args, &block)
       if name == :encode4
         send :encode, *args, &block

data/bgp/path_attributes/attributes.rb

@@ -1,21 +1,22 @@
 
 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'
 end
 
-%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|
-    BGP.autoload  attr.capitalize.to_sym,"bgp/path_attributes/#{attr}"
-end

data/bgp/path_attributes/communities.rb

@@ -20,35 +20,42 @@
 # along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-
 require 'bgp/path_attributes/attribute'
 
-
 module BGP
 
   class Communities < Attr
 
     class Community
       
+      unless const_defined? :NO_EXPORT
+        NO_EXPORT             = 0xFFFFFF01
+        NO_ADVERTISE          = 0xFFFFFF02
+        NO_EXPORT_SUB_CONFED  = 0xFFFFFF03
+        NO_PEER               = 0xFFFFFF04
+      end
+      
       def initialize(arg)
         if arg.is_a?(Symbol)
           case arg
-          when :no_export      ; @value=0xFFFFFF01
-          when :no_advertise   ; @value=0xFFFFFF02
-          when :no_export_sub_confed ; @value=0xFFFFFF03
-          when :no_peer        ; @value=0xFFFFFF04
+          when :no_export            ; @value=NO_EXPORT
+          when :no_advertise         ; @value=NO_ADVERTISE
+          when :no_export_sub_confed ; @value=NO_EXPORT_SUB_CONFED
+          when :no_peer              ; @value=NO_PEER
           else
-            raise ArgumentError, "invalid argument #{val}"
+            raise ArgumentError, "invalid argument #{arg.inspect}"
           end
         elsif arg.is_a?(String) and arg.split(':').size==2
           self.value=arg.split(':').collect { |n| n.to_i }.pack('n2').unpack('N')[0]
+        elsif arg.respond_to?(:to_i)
+          self.value= arg.to_i
         else
           self.value=arg
         end
       end
 
       def value=(val)
-        raise ArgumentError, "invalid argument #{val}" unless val.is_a?(Fixnum) or val.is_a?(Bignum)
+        raise ArgumentError, "invalid argument #{val.inspect}" unless val.is_a?(Integer)
         @value=val
       end
 
@@ -96,6 +103,7 @@ module BGP
           @communities << Community.new(arg)
         end
       end
+      self
     end
     alias << add
 
@@ -107,10 +115,6 @@ module BGP
       super(communities, method)
     end
 
-    def to_ary
-      @communities.collect { |c| c.to_i }
-    end
-
     def encode
       super(@communities.collect { |comm| comm.encode }.join)
     end
@@ -121,7 +125,7 @@ module BGP
     end
 
     def sort
-      Communities.new(to_ary.sort)
+      Communities.new(to_a.sort)
     end
 
     def sort!
@@ -132,8 +136,33 @@ module BGP
     def <=>(other)
       self.sort.to_shex <=> other.sort.to_shex
     end
+    
+    def has?(arg)
+      ! has_no?(arg)
+    end
 
-  end
+    def has_no?(arg)
+      @communities.find { |c| c.to_i == arg_comm_to_i(arg) }.nil? 
+    end
+    
+    %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
+
+    private
+    
+    def arg_comm_to_i(arg)
+      return arg if arg.is_a?(Integer)
+      Community.new(arg).to_i
+    end
 
+    def to_a
+      @communities.collect { |c| c.to_i }
+    end
+
+  end
+  
 end
 load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/local_pref.rb

@@ -46,6 +46,10 @@ module BGP
       raise ArgumentError, "invalid argument" unless val.is_a?(Integer)
       @local_pref=val
     end
+    
+    def +(val)
+      @local_pref +=val
+    end
 
     def to_i
       @local_pref

data/bgp/path_attributes/multi_exit_disc.rb

@@ -52,6 +52,10 @@ module BGP
       @med
     end
 
+    def +(val)
+      @med +=val
+    end
+
     def encode
       super([to_i].pack('N'))
     end

data/bgp/path_attributes/path_attribute.rb

@@ -27,6 +27,8 @@ module BGP
 
   class Path_attribute
     include BGP::ATTR
+    attr_reader :attributes
+
     def initialize(*args)
       if args.size <= 2 and args[0].is_a?(String) and args[0].is_packed?
         s = args[0]
@@ -45,10 +47,6 @@ module BGP
     end
     alias << add
     
-    def to_ary
-      @attributes
-    end
-    
     def to_s(method=:default,as4byte=false)
       "Path Attributes:" + ([""] + @attributes.collect { |a|
         if as4byte and a.is_a?(As_path)
@@ -90,7 +88,7 @@ module BGP
         find(Atomic_aggregate)
       when  AGGREGATOR, :aggregator
         find(Aggregator)
-      when  COMMUNITIES, :communities
+      when  COMMUNITIES, :communities, :community
         find(Communities)
       when ORIGINATOR_ID, :originator_id
         find(Originator_id)
@@ -105,6 +103,8 @@ module BGP
       when AS4_PATH, :as4_path
         find(As4_path)
       when AS4_AGGREGATOR, :as4_aggregator
+      else
+        find(type)
       end
     end
     
@@ -121,6 +121,10 @@ module BGP
       end
     end
     
+    def has_no?(arg)
+      ! has?(arg)
+    end
+    
     def encode(as4byte=false)
       [@attributes.compact.collect { |x| as4byte ? x.encode4 : x.encode }.join].pack('a*')
     end
@@ -128,7 +132,7 @@ module BGP
     def insert(*args)
       for arg in args
         next unless arg.is_a?(Attr)
-        to_ary.insert(0,arg)
+        attributes.insert(0,arg)
       end
       self
     end
@@ -136,7 +140,7 @@ module BGP
     def append(*args)
       for arg in args
         next unless arg.is_a?(Attr)
-        to_ary << (arg)
+        attributes << (arg)
       end
       self
     end
@@ -144,12 +148,11 @@ module BGP
     def replace(*args)
       for arg in args
         next unless arg.is_a?(Attr)
-        attr = to_ary.find { |x| x.class == arg.class }
-        if attr.nil?
-          append(arg)
+        ind = attributes.find_index { |x| x.class == arg.class }
+        if ind
+          attributes[ind] = arg
         else
-          index = to_ary.index(attr)
-          to_ary[index] = arg
+          append(arg)
         end
       end
       self
@@ -158,35 +161,63 @@ module BGP
     def delete(*klasses)
       for klass in klasses
         next unless klass.is_a?(Class)
-        to_ary.delete_if { |x| x.class == klass }
+        attributes.delete_if { |x| x.class == klass }
       end
       self
     end
-    
+
+    %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 
+    }.each do |attr| 
+      define_method("has_a_#{attr}_attr?") do
+        has? BGP.const_get(attr.capitalize)
+      end
+      eval "alias :has_an_#{attr}? :has_a_#{attr}_attr?" if (attr =~ /^[aeiou]/)
+    end
+
+    private
+
+    def att_sym_to_klass(sym)
+      case sym
+      when :communities, :community ; Communities
+      end
+    end
   end
-  
 end
 
 module BGP
 
   class Attr
-    Unknown = Class.new(Attr) do
-      attr_reader :type, :flags, :value
-      def initialize(*args)
-        if args.size>1
-          @flags, @type, len, @value=args
-        else
-          parse(*args)
+    unless const_defined? :Unknown
+      Unknown = Class.new(Attr) do
+        attr_reader :type, :flags, :value
+        def initialize(*args)
+          if args.size>1
+            @flags, @type, len, @value=args
+          else
+            parse(*args)
+          end
+        end
+        def encode
+          super(@value)
+        end
+        def parse(s)
+          @flags, @type, len, @value = super
         end
-      end
-      def encode
-        super(@value)
-      end
-      def parse(s)
-        @flags, @type, len, @value = super
       end
     end
-    
     include BGP::ATTR
     def self.factory(s, as4byte=false)
       flags, type = s.unpack('CC')
@@ -223,9 +254,8 @@ module BGP
         Unknown.new(s)
       end
     end
-
+    
   end
-  
 end
 
 load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bgp4r}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   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-12}
+  s.date = %q{2010-10-30}
   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 = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "bgp/messages/open.rb",
      "bgp/messages/route_refresh.rb",
      "bgp/messages/update.rb",
+     "bgp/misc/live_feed.rb",
      "bgp/neighbor.rb",
      "bgp/nlris/inet.rb",
      "bgp/nlris/label.rb",
@@ -71,10 +72,12 @@ Gem::Specification.new do |s|
      "bgp/path_attributes/path_attribute.rb",
      "bgp4r.gemspec",
      "bgp4r.rb",
+     "examples/a_live_feed",
      "examples/routegen",
      "examples/routegen.yml",
      "examples/simple.rb",
      "examples/unit-testing/malformed_update.rb",
+     "examples/unit-testing/no_export.rb",
      "examples/unit-testing/prepend_aspath.rb",
      "examples/unit-testing/unknown_transitive_attr.rb",
      "test/common_test.rb",
@@ -87,6 +90,7 @@ Gem::Specification.new do |s|
      "test/messages/route_refresh_test.rb",
      "test/messages/update_test.rb",
      "test/neighbor_test.rb",
+     "test/nlris/ext_nlri_test.rb",
      "test/nlris/inet_test.rb",
      "test/nlris/labeled_test.rb",
      "test/nlris/nlri_test.rb",
@@ -118,7 +122,7 @@ Gem::Specification.new do |s|
      "test/path_attributes/path_attribute_test.rb"
   ]
   s.homepage = %q{http://github.com/jesnault/bgp4r/tree/master}
-  s.rdoc_options = ["--quiet", "--title", "A BGP-4 Ruby Library", "--line-numbers"]
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["."]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
   s.rubyforge_project = %q{bgp4r}
@@ -137,6 +141,7 @@ Gem::Specification.new do |s|
      "test/messages/update_test.rb",
      "test/neighbor_test.rb",
      "test/nlris",
+     "test/nlris/ext_nlri_test.rb",
      "test/nlris/inet_test.rb",
      "test/nlris/labeled_test.rb",
      "test/nlris/nlri_test.rb",

data/examples/a_live_feed

@@ -0,0 +1,77 @@
+
+require 'bgp4r'
+require 'bgp/misc/live_feed'
+
+include BGP
+
+Log.create
+Log.level=Logger::DEBUG
+
+def start_peering
+  [@n100].each { |n| n.start }
+end
+
+class RecvMsgHandler
+  def initialize(q)
+    @q = q
+  end
+  def update(bgp_msg)
+    @q.enq bgp_msg if bgp_msg.is_a_notification?
+  end
+end
+
+N100 = Class.new(Neighbor)
+@n100 = N100.new(:my_as=> 100, 
+                 :remote_addr => '40.0.0.2', 
+                 :local_addr => '40.0.0.1', 
+                 :id=> '13.11.19.59')
+
+queue = Queue.new
+@n100.add_observer RecvMsgHandler.new(queue)
+
+start_peering
+
+feed = LiveFeed.new
+feed.open
+
+(1..20000).each do |_n|
+  
+  msg = Message.factory(feed.msg)
+  
+  if msg.is_an_update? and msg.has_a_path_attribute?
+    
+    path_attr = msg.path_attribute
+    
+    # pick and choose the update we want 
+    next if path_attr.has?(Mp_reach) || 
+          path_attr.has?(Mp_unreach) || 
+          path_attr.has?(Atomic_aggregate)
+    
+    # and set the path attribute.
+    path_attr.replace Next_hop.new('40.0.0.1')
+    path_attr[:as_path].find_sequence.prepend(100)
+    path_attr.has?(Communities) ? path_attr[Communities].add('13:11') : path_attr.insert(Communities.new'13:11')
+    
+    if queue.size > 1
+      puts $prev_msg
+      puts queue.deq
+      p queue.deq
+      exit
+    end
+    
+    # ship it!
+    @n100.send_message msg
+    $prev_msg = msg
+    
+  elsif msg.is_an_update? and msg.has_no_path_attribute?
+    
+    # it's a withdrawn, 
+    @n100.send_message msg
+    
+  end
+
+end
+
+sleep(200)
+
+__END__

data/examples/routegen

@@ -18,8 +18,6 @@ Log.create
 Log.level=Logger::DEBUG
 config = YAML::load_file(config_file)
 
-p config
-
 config.keys.each do |k|
   case k
   when 'neighbor'

data/examples/unit-testing/malformed_update.rb

@@ -73,9 +73,5 @@ class TestBgp < Test::Unit::TestCase
        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
-  
+    
 end

data/examples/unit-testing/no_export.rb

@@ -0,0 +1,111 @@
+require "test/unit"
+require 'bgp4r'
+require 'timeout'
+
+Thread.abort_on_exception=true
+
+class TestBgp < Test::Unit::TestCase
+  
+  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(m)
+      @q.enq m if m.is_an_update?
+    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_route_a_route_with_no_export_community_set_is_not_advertised
+    assert @n100.is_established?, "Expected to be in Established state. <> #{@n100.state}"
+    assert @n300.is_established?, "Expected to be in Established state. <> #{@n300.state}"
+    queue = Queue.new
+    @n300.add_observer RecvMsgHandler.new(queue)
+    
+    # advertise a bunch of routes and verity they are advertised as expected.
+    @n100.send_message an_exportable_update
+    msg = recv(queue)
+    assert msg, "Did not receive expected BGP update message."
+    assert msg.path_attribute.has_a_communities_attr?, "It should have contained a COMMUNITY attribute."
+    assert msg.path_attribute[:communities].has?('1311:1'), "It should have contained community 1311:11."
+    
+    # send it again with no_export set.
+    # we should be asked to withdraw the previously advertise routes.
+    @n100.send_message a_non_exportable_update 
+    msg = recv(queue)
+    assert(msg)
+    assert msg.is_an_update? 
+    assert msg.has_no_path_attribute?, "We should have received a route withdrawal with previous advertised routes."    
+    assert_equal "77.0.0.0/17\n78.0.0.0/18\n79.0.0.0/19", msg.withdrawn.to_s
+
+    # send it again, this time nothing to withdraw, hence no update to receive.
+    @n100.send_message a_non_exportable_update 
+    msg = recv(queue)
+    assert_nil(msg)    
+
+    # advertise yet again without no_export and we shall receive an update from n300
+    @n100.send_message an_exportable_update
+    msg = recv(queue)
+    assert msg, "Did not receive expected BGP update message."
+    assert msg.path_attribute.has_a_communities_attr?, "It should have contained a COMMUNITY attribute."
+    assert msg.path_attribute[:communities].has?('1311:1'), "It should have contained community 1311:11."
+  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 an_exportable_update
+    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 a_non_exportable_update
+    update = an_exportable_update.clone
+    update.path_attribute[:communities].add(:no_export)
+    update
+  end
+
+end

data/test/messages/message_test.rb

@@ -40,4 +40,11 @@ class Message_Test < Test::Unit::TestCase
     msg2 = MyMessage.new(msg1.encode)
     assert_equal('abcdefghihjklmopqrstuvwxyz',msg2.data)
   end
+  def test_2
+    msg = MyMessage.new
+    assert msg.respond_to? :is_an_update?
+    assert msg.respond_to? :is_an_open?
+    assert msg.respond_to? :is_a_notification?
+    assert msg.respond_to? :is_a_route_refresh?
+  end
 end

data/test/messages/update_test.rb

@@ -126,8 +126,36 @@ class Update_Test < Test::Unit::TestCase
     originator-id: 10.0.0.2
     cluster: 0.0.0.1
     "
-    
-    
   end
+  
+  def test_7
+    s = 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0072020000001F4001010040020A0204212C051319351AFE400304557200D9C00804212C045C175D76D6175D76DE1659299C175929981659235C16592D6417592D6417592D6617592D6217C3D228185D73241859284417C3FE84165C727015592190'
+    m = Update.new([s].pack('H*'), true)
+    pa = m.path_attribute
+    assert_equal '556533011 422910718', pa[As_path].as_path
+    assert_equal '85.114.0.217', pa[Next_hop].next_hop
+    pa.replace Next_hop.new('10.0.0.1')
+    assert_equal '10.0.0.1', pa[Next_hop].next_hop
+    pa[:as_path].find_sequence.prepend(100)
+    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
+  #   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
+  #   0000 01c0 0810 212c 044d 232a 232a 232a
+  #   fc9d 000d 000b f011 1202 0400 0023 2a00
+  #   000d dd00 0053 f900 0302 9e18 5bd9 c5
+  #   '.split.join
+  #   m = Update.new([s].pack('H*'))
+  #   p m
+  # end
+    
 
 end

data/test/nlris/ext_nlri_test.rb

@@ -0,0 +1,67 @@
+#--
+# Copyright 2008, 2009 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 'test/unit'  
+require 'bgp/nlris/nlris'
+
+class TestExtNlri < 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
+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

data/test/path_attributes/as_path_test.rb

@@ -85,6 +85,10 @@ class As_path_Test < Test::Unit::TestCase
     assert_equal('400218020300010002000301030001000200030303000100020003', path.to_shex)
     assert_equal('40021802030...', path.to_shex_len(10))
     assert_equal("[wTcr]  (2)    As Path: [400218020300010002000...] '1 2 3 {1, 2, 3} (1 2 3)'", path.to_s)
+    path.find_set.prepend(100)
+    assert_equal '1 2 3 {100, 1, 2, 3} (1 2 3)', path.as_path
+    path.find_sequence.prepend(100)
+    assert_equal '100 1 2 3 {100, 1, 2, 3} (1 2 3)', path.as_path
   end
   def test_3
     path = As_path.new(1,2,3)
@@ -105,7 +109,7 @@ class As_path_Test < Test::Unit::TestCase
     assert_equal("{1, 2, 3}", As_path.new(As_path::Set.new(1,2,3)).as_path)
     assert_equal("(1 2 3)", As_path.new(As_path::Segment.new(:confed_sequence,1,2,3)).as_path)
     assert_equal("[1, 2, 3]", As_path.new(As_path::Segment.new(:confed_set,1,2,3)).as_path)
-    assert_equal("[wTcr]  (2)    As Path: [400208040300010002000...] '[1, 2, 3]'", As_path.new(As_path::Segment.new(:confed_set,1,2,3)).to_s)
+    assert_equal("[wTcr]  (2)    As Path: [400208040300010002000...] '[1, 2, 3]'", As_path.new(As_path::Segment.new(:confed_set,1,2,3)).to_s)    
   end
   def test_5
     two_byte_as = '4002080203000100020003'

data/test/path_attributes/communities_test.rb

@@ -31,6 +31,7 @@ class Community_Test < Test::Unit::TestCase
     assert_equal(0xFFFFFF03,Communities::Community.new(:no_export_sub_confed).to_i)
     assert_equal(0xFFFFFF04,Communities::Community.new(:no_peer).to_i)
     assert_equal(0xdeadbeef,Communities::Community.new(0xdeadbeef).to_i)
+    assert_equal '5:1234', Communities::Community.new(Communities::Community.new('5:1234')).to_s
   end
 end
 class Communities_Test < Test::Unit::TestCase
@@ -51,7 +52,6 @@ class Communities_Test < Test::Unit::TestCase
     com1 = Communities.new("145:30", "145:40", "145:50", "145:60")
     com2 = Communities.new("145:30,145:40,145:50,145:60")
     assert_equal(com1.to_shex, com2.to_shex)
-    assert_equal(["0x91001e", "0x910028", "0x910032", "0x91003c"], com2.to_ary.collect { |c| "0x#{c.to_s(16)}" })
     assert_equal('c008100091001e00910028009100320091003c',com1.to_shex)
     com3 = Communities.new(0x91001E, 0x910028, 0x910032, 0x91003c)
     assert_equal('c008100091001e00910028009100320091003c',com3.to_shex)
@@ -70,6 +70,22 @@ class Communities_Test < Test::Unit::TestCase
     com3 = Communities.new(com1)
     assert_equal(com1.encode, com3.encode)
   end
+  def test_3
+    assert   Communities.new("145:60 145:10 145:30 145:20").has_no? '1:1'
+    assert ! Communities.new("145:60 145:10 145:30 145:20").has?(0xff)
+    assert   Communities.new("145:60 145:10 145:30 145:20").has?(Communities::Community.new('145:60'))
+    assert ! Communities.new("145:60 145:10 145:30 145:20").has?(Communities::Community.new(0xff))
+    assert ! Communities.new("145:60 145:10 145:30 145:20").has_no?('145:60')
+    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?
+  end
 end
 
 #MiniTest::Unit.autorun

data/test/path_attributes/local_pref_test.rb

@@ -40,4 +40,12 @@ 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,4 +43,12 @@ 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

data/test/path_attributes/path_attribute_test.rb

@@ -101,9 +101,9 @@ class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
     )
     
     path_attr.replace(
-      Origin.new(2),
       As_path.new(100,200),
       Local_pref.new(11),
+      Origin.new(2),
       Multi_exit_disc.new(21)
     )
     
@@ -135,4 +135,11 @@ class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
     assert_equal 0, sbin.size
   end
   
+  def test_6
+    assert @pa.has_a_origin_attr?
+    assert @pa.has_a_next_hop_attr?
+    assert @pa.has_a_local_pref_attr?
+    assert ! @pa.has_a_aggregator_attr?
+    assert ! @pa.has_a_mp_unreach_attr?
+  end  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jean-Michel Esnault
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -07:00
+date: 2010-10-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - bgp/messages/open.rb
 - bgp/messages/route_refresh.rb
 - bgp/messages/update.rb
+- bgp/misc/live_feed.rb
 - bgp/neighbor.rb
 - bgp/nlris/inet.rb
 - bgp/nlris/label.rb
@@ -82,10 +83,12 @@ files:
 - bgp/path_attributes/path_attribute.rb
 - bgp4r.gemspec
 - bgp4r.rb
+- examples/a_live_feed
 - examples/routegen
 - examples/routegen.yml
 - examples/simple.rb
 - examples/unit-testing/malformed_update.rb
+- examples/unit-testing/no_export.rb
 - examples/unit-testing/prepend_aspath.rb
 - examples/unit-testing/unknown_transitive_attr.rb
 - test/common_test.rb
@@ -98,6 +101,7 @@ files:
 - test/messages/route_refresh_test.rb
 - test/messages/update_test.rb
 - test/neighbor_test.rb
+- test/nlris/ext_nlri_test.rb
 - test/nlris/inet_test.rb
 - test/nlris/labeled_test.rb
 - test/nlris/nlri_test.rb
@@ -133,10 +137,7 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --quiet
-- --title
-- A BGP-4 Ruby Library
-- --line-numbers
+- --charset=UTF-8
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -173,6 +174,7 @@ test_files:
 - test/messages/route_refresh_test.rb
 - test/messages/update_test.rb
 - test/neighbor_test.rb
+- test/nlris/ext_nlri_test.rb
 - test/nlris/inet_test.rb
 - test/nlris/labeled_test.rb
 - test/nlris/nlri_test.rb