bgp4r 0.0.4 → 0.0.5

data/bgp/common.rb

@@ -121,16 +121,17 @@ class String
   alias packed? :is_packed?
   
   def hexlify
-    return self unless is_packed?
-    s=self.dup
-    ls=[""]
-    n=0
+    return self unless is_packed? or self.size==0
+    l,n,ls,s=0,0,[''],self.dup
     while s.size>0
       l = s.slice!(0,16)
-      ls << format("0x%4.4x: %s", n,
-          l.unpack("n#{l.size/2}").collect { |x| format("%4.4x",x) }.join(' '))
+      ls << format("0x%4.4x:  %s", n, l.unpack("n#{l.size/2}").collect { |x| format("%4.4x",x) }.join(' '))
       n+=1
     end
+    if l.size%2 >0
+      ns = if l.size>1 then 1 else 0 end
+      ls.last << format("%s%2.2x",' '*ns,l[-1].unpack('C')[0])
+    end
     ls
   end
   

data/bgp/message.rb

@@ -479,7 +479,19 @@ module BGP
     end
     
     def <<(val)
-      #TODO add attr or nlri
+      if val.is_a?(Attr)
+        @path_attribute ||= Path_attribute.new
+        @path_attribute << val
+      elsif val.is_a?(String)
+        begin 
+          Nlri.new(val)
+          @nlri ||=Nlri.new
+          @nlri << val
+        rescue => e
+        end
+      elsif val.is_a?(Nlri)
+        val.to_s.split.each { |n| self << n }
+      end
     end
 
     def to_s(as4byte=false, fmt=:tcpdump)

data/bgp4r.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bgp4r}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean-Michel Esnault"]
-  s.date = %q{2009-06-30}
+  s.date = %q{2010-08-14}
   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 = [
@@ -76,7 +76,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["."]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
   s.rubyforge_project = %q{bgp4r}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A BGP-4 Ruby Library}
   s.test_files = [
     "test/aggregator_test.rb",
@@ -106,7 +106,6 @@ Gem::Specification.new do |s|
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
-
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end

data/examples/routegen.yml

@@ -5,16 +5,16 @@ neighbor:
   router id: 1.1.1.1
   my as: 100
   holdtime: 180
-  local address: 199.0.0.5
-  neighbor address: 199.0.0.6
+  local address: 192.168.1.6
+  neighbor address: 192.168.1.199
   capabilities: 
   - four byte as
 routes: 
   nlris: 11.0.0.0/28, 1999, 127
-  next hop: 199.0.0.5
+  next hop: 192.168.1.6
   local pref: 100
   med: 100
-  origin: 0
+  origin: 1
   communities: 100:1 200:1 300:1
   as path: 200 300 400 500
 

data/test/common_test.rb

@@ -59,8 +59,18 @@ class Common_Test < Test::Unit::TestCase
     assert_equal('10.32.0.0/12', ip3 ^ 2)
   end
   def test_string_1      
-    sbin = ['0a000001'].pack('H*')
-    assert_equal('0x0000: 0a00 0001',sbin.hexlify.join)
+    sbin = ['00'].pack('H*')
+    assert_equal '0x0000:  00', sbin.hexlify.join
+    sbin = ['0001'].pack('H*')
+    assert_equal '0x0000:  0001', sbin.hexlify.join
+    sbin = ['000102'].pack('H*')
+    assert_equal '0x0000:  0001 02', sbin.hexlify.join
+    sbin = ['000102030405060708090a0b0c0d0e0f'].pack('H*')
+    assert_equal '0x0000:  0001 0203 0405 0607 0809 0a0b 0c0d 0e0f', sbin.hexlify.join
+    sbin = ['000102030405060708090a0b0c0d0e0f10'].pack('H*')
+    sbin = ['000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20'].pack('H*')
+    assert_equal '0x0001:  1011 1213 1415 1617 1819 1a1b 1c1d 1e1f', sbin.hexlify[2]
+    assert_equal '0x0002:  20', sbin.hexlify[3]
   end
   def test_nlri
     assert_equal('14000000', IPAddr.new_nlri4(['101400'].pack('H*')).to_shex)

data/test/message_test.rb

@@ -107,6 +107,24 @@ class Update_Test < Test::Unit::TestCase
     # Ship it!
     assert_equal(3*2, an_update.encode4.size - an_update.encode.size)
   end
+  
+  def test_5
+    an_update = Update.new( Path_attribute.new( Origin.new(1),
+                                                Next_hop.new('10.0.0.1'),
+                                                Multi_exit_disc.new(100)
+                                                ))
+    assert ! an_update.path_attribute.has?(Local_pref), "Should not contain a Local Pref attr."
+    an_update << Local_pref.new(113)
+    assert an_update.path_attribute.has?(Local_pref), "Should contain a Local Pref attr."
+    assert_nil  an_update.nlri
+    an_update << '77.0.0.0/17'
+    assert_equal Nlri, an_update.nlri.class
+    assert_equal 1, an_update.nlri.size
+    an_update << '88.0.0.0/18'
+    assert_equal 2, an_update.nlri.size
+    an_update << Nlri.new('21.0.0.0/11', '22.0.0.0/22')
+    assert_equal 4, an_update.nlri.size
+  end
 
 end
 

data/test/origin_test.rb

@@ -52,6 +52,6 @@ class Origin_Test < Test::Unit::TestCase
   def test_6
     assert_equal("[wTcr]  (1)     Origin: [40010100] 'igp'", Origin.new.to_s)
     assert_equal("[wTcr]  (1)     Origin: [40010100] 'igp'", Origin.new(:igp).to_s)
-    assert_equal("Origin (1), length: 1, Flags [T]: igp\n   0x0000: ", Origin.new.to_s(:tcpdump))
+    assert_equal("Origin (1), length: 1, Flags [T]: igp\n   0x0000:  00", Origin.new.to_s(:tcpdump))
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bgp4r
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jean-Michel Esnault
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2010-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -92,21 +97,27 @@ rdoc_options:
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: bgp4r
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A BGP-4 Ruby Library