bgp4r 0.0.8 → 0.0.9

data/bgp/optional_parameters/route_refresh.rb

@@ -0,0 +1,36 @@
+#--
+# 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 'bgp/optional_parameters/capability'
+
+module BGP::OPT_PARM::CAP
+  class Route_refresh < BGP::OPT_PARM::Capability 
+    def initialize(code=OPT_PARM::CAP_ROUTE_REFRESH)
+      super(code)
+    end
+    def to_s
+      super + "\n    Route Refresh #{@code==128 ? "(Cisco) " : ""}(#{@code}), length: 2"
+    end
+  end
+end
+
+load "../../test/optional_parameters/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/{prefix_orf.rb → orfs/prefix_orf.rb}

@@ -21,19 +21,13 @@
 #++
 
 
-require 'bgp/nlri'
-require 'bgp/orf'
+require 'bgp/nlris/nlri'
+require 'bgp/orfs/orf'
 
 module BGP
   
   class Prefix_entry < Orf::Entry
-  
-    @_seqn_ = -10
-    class << self
-      attr_accessor :_seqn_ 
-      def seqn ; Address_prefix_orf_entry._seqn_ +=10 ;end
-    end
-
+    
     def initialize(*args)
       if args[0].is_a?(String) and args[0].is_packed?
         _parse_(*args)
@@ -184,7 +178,7 @@ class BGP::Prefix_orf < BGP::Orf
 
 end
 
-load "../test/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/orfs/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
 
 __END__
 

data/bgp/{aggregator.rb → path_attributes/aggregator.rb}

@@ -20,7 +20,7 @@
 # along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 
@@ -101,4 +101,4 @@ module BGP
 
 end
 
-load "../test/#{ 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/{as_path.rb → path_attributes/as_path.rb}

@@ -20,7 +20,7 @@
 # along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
     
@@ -219,5 +219,5 @@ module BGP
     
 end
 
-load "../test/#{ 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/{atomic_aggregate.rb → path_attributes/atomic_aggregate.rb}

@@ -21,7 +21,7 @@
 #++
 
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 
@@ -39,4 +39,4 @@ module BGP
 
 end
 
-load "../test/#{ 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/{attribute.rb → path_attributes/attribute.rb}

@@ -141,9 +141,9 @@ module BGP
       
       case mode
       when :brief
-        sprintf "%s %4s %10s: [%s]%s", flags, "(#{@type})", attribute_name, shex, "#{value.size>0 ? " '#{value}'" :''}"
+        sprintf "%s %4s %10s: [%s]%s", flags, "(#{@type})", attribute_name, shex, "#{value.size>0 ? " '#{value}'" : ''}"
       when :hexlify
-        s = sprintf "%s %4s %10s: [%s]%s", flags, "(#{@type})", attribute_name, shex, "#{value.size>0 ? " '#{value}" :''}"
+        s = sprintf "%s %4s %10s: [%s]%s", flags, "(#{@type})", attribute_name, shex, "#{value.size>0 ? " '#{value}" : ''}"
         s +="\n\n"
         if as4byte
           s += self.encode4.hexlify.join("\n")

data/bgp/path_attributes/attributes.rb

@@ -0,0 +1,21 @@
+
+module BGP
+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/{cluster_list.rb → path_attributes/cluster_list.rb}

@@ -21,7 +21,7 @@
 #++
 
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 
@@ -114,4 +114,4 @@ module BGP
 
 end
 
-load "../test/#{ 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/{communities.rb → path_attributes/communities.rb}

@@ -21,7 +21,7 @@
 #++
 
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 
 module BGP
@@ -136,4 +136,4 @@ module BGP
   end
 
 end
-load "../test/#{ 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/{extended_communities.rb → path_attributes/extended_communities.rb}

@@ -21,8 +21,8 @@
 #++
 
 
-require 'bgp/attribute'
-require 'bgp/extended_community'
+require 'bgp/path_attributes/attribute'
+require 'bgp/path_attributes/extended_community'
 
 module BGP
 
@@ -104,4 +104,4 @@ module BGP
 
 end
 
-load "../test/#{ 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/{extended_community.rb → path_attributes/extended_community.rb}

@@ -22,7 +22,7 @@
 
 
 require 'bgp/common'
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 

data/bgp/{local_pref.rb → path_attributes/local_pref.rb}

@@ -21,7 +21,7 @@
 #++
 
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 
@@ -72,4 +72,4 @@ module BGP
   end
 
 end
-load "../test/#{ 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/{mp_reach.rb → path_attributes/mp_reach.rb}

@@ -20,76 +20,10 @@
 # along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-
-require 'bgp/attribute'
-require 'bgp/nlri'
+require 'bgp/path_attributes/attribute'
+require 'bgp/nlris/nlris'
 
 module BGP
-
-    class Mp_unreach < Attr
-
-      attr_reader :safi, :nlris
-
-      def initialize(*args)
-        @safi, @nlris= 1, []
-        @flags, @type = OPTIONAL, MP_UNREACH
-        if args[0].is_a?(String) and args[0].is_packed?
-          parse(args[0])
-        elsif args[0].is_a?(self.class)
-          parse(args[0].encode, *args[1..-1])
-        elsif args[0].is_a?(Hash) and args.size==1
-          set(*args)
-        else
-          raise ArgumentError, "invalid argument" 
-        end
-      end
-
-      def afi
-        @afi ||= @nlris[0].afi
-      end
-
-      def set(h)
-        @safi = h[:safi]
-        case @safi
-        when 1,2
-          @nlris = [h[:prefix]].flatten.collect { |p| p.is_a?(Prefix) ? p : Prefix.new(p) }
-        when 4
-          @nlris = [h[:nlri]].flatten.collect { |n|
-            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]) }
-        else
-        end
-      end
-
-      def mp_unreach
-        "\n    AFI #{IANA.afi(afi)} (#{afi}), SAFI #{IANA.safi(safi)} (#{safi})" +
-        (['']+ @nlris.collect { |nlri| nlri.to_s }).join("\n      ")
-      end
-
-      def to_s(method=:default)
-        super(mp_unreach, method)
-      end
-
-      def parse(s)
-        @flags, @type, len, value = super(s)
-        @afi, @safi = value.slice!(0,3).unpack('nC')
-        while value.size>0
-          blen = value.slice(0,1).unpack('C')[0]
-          @nlris << Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi)
-        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*'))
-      end
-      
-    end
     
     class Mp_reach < Attr
       
@@ -205,4 +139,4 @@ module BGP
       
 end
 
-load "../test/#{ 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/mp_unreach.rb

@@ -0,0 +1,97 @@
+#--
+# 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/>.
+#++
+
+require 'bgp/path_attributes/attribute'
+require 'bgp/nlris/nlris'
+
+module BGP
+
+  class Mp_unreach < Attr
+
+    attr_reader :safi, :nlris
+
+    def initialize(*args)
+      @safi, @nlris= 1, []
+      @flags, @type = OPTIONAL, MP_UNREACH
+      if args[0].is_a?(String) and args[0].is_packed?
+        parse(args[0])
+      elsif args[0].is_a?(self.class)
+        parse(args[0].encode, *args[1..-1])
+      elsif args[0].is_a?(Hash) and args.size==1
+        set(*args)
+      else
+        raise ArgumentError, "invalid argument" 
+      end
+    end
+
+    def afi
+      @afi ||= @nlris[0].afi
+    end
+
+    def set(h)
+      @safi = h[:safi]
+      h[:nlri]   ||=[]
+      h[:prefix] ||=[]
+      @afi = h[:afi] if h[:afi]
+      case @safi
+      when 1,2
+        @nlris = [h[:prefix]].flatten.collect { |p| p.is_a?(Prefix) ? p : Prefix.new(p) }
+      when 4
+        @nlris = [h[:nlri]].flatten.collect { |n|
+          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]) }
+      else
+      end
+    end
+
+    def mp_unreach
+      "\n    AFI #{IANA.afi(afi)} (#{afi}), SAFI #{IANA.safi(safi)} (#{safi})" +
+      (['']+ @nlris.collect { |nlri| nlri.to_s }).join("\n      ")
+    end
+
+    def to_s(method=:default)
+      super(mp_unreach, method)
+    end
+
+    def parse(s)
+      @flags, @type, len, value = super(s)
+      @afi, @safi = value.slice!(0,3).unpack('nC')
+      while value.size>0
+        blen = value.slice(0,1).unpack('C')[0]
+        @nlris << Nlri.factory(value.slice!(0,(blen+7)/8+1), @afi, @safi)
+      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*'))
+    end
+
+  end
+end
+
+load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/{multi_exit_disc.rb → path_attributes/multi_exit_disc.rb}

@@ -21,7 +21,7 @@
 #++
 
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 
@@ -73,4 +73,4 @@ module BGP
   end
 
 end
-load "../test/#{ 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/{next_hop.rb → path_attributes/next_hop.rb}

@@ -21,7 +21,7 @@
 #++
 
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 
@@ -60,4 +60,4 @@ module BGP
   end
 
 end
-load "../test/#{ 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/{origin.rb → path_attributes/origin.rb}

@@ -21,7 +21,7 @@
 #++
 
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
   
@@ -84,5 +84,5 @@ module BGP
 
 end
 
-load "../test/#{ 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/{originator_id.rb → path_attributes/originator_id.rb}

@@ -21,7 +21,7 @@
 #++
 
 
-require 'bgp/attribute'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 
@@ -70,4 +70,4 @@ module BGP
 
 end
 
-load "../test/#{ 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_attribute.rb → path_attributes/path_attribute.rb}

@@ -20,8 +20,8 @@
 # along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-
-require 'bgp/attributes'
+require 'bgp4r'
+require 'bgp/path_attributes/attribute'
 
 module BGP
 
@@ -104,7 +104,7 @@ module BGP
         find(Extended_communities)
       when AS4_PATH, :as4_path
         find(As4_path)
-      when AS4_AGGREGATOR, :as4_aggregator        
+      when AS4_AGGREGATOR, :as4_aggregator
       end
     end
     
@@ -170,7 +170,7 @@ end
 module BGP
 
   class Attr
-    UnknownAttr = Class.new(Attr) do
+    Unknown = Class.new(Attr) do
       attr_reader :type, :flags, :value
       def initialize(*args)
         if args.size>1
@@ -220,8 +220,7 @@ module BGP
       when EXTENDED_COMMUNITY
         Extended_communities.new(s)
       else
-        # return  a generic unknown attr.
-        UnknownAttr.new(s)
+        Unknown.new(s)
       end
     end
 
@@ -229,4 +228,4 @@ module BGP
   
 end
 
-load "../test/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0