bgp4r 0.0.12 → 0.0.13

data/README.rdoc

@@ -26,15 +26,18 @@ while a Path_attribute object or Nlri object is added to an Update object.
       :version=> 4, 
       :my_as=> 100, 
       :remote_addr => '192.168.1.200', 
-      :local_addr => '192.168.1.5', 
       :id=> '1.1.1.1', 
       :holdtime=> 20
 
-   neighbor.capability :as4_byte
-   neighbor.capability :route_refresh
-   neighbor.capability :route_refresh, 128
-   neighbor.capability :mbgp, :ipv4, :unicast
-   neighbor.capability :mbgp, :ipv4, :multicast
+   neighbor.capability_mbgp_ipv4_unicast  
+   neighbor.capability_mbgp_ipv4_multicast
+   neighbor.capability_mbgp_ipv4_mpls_vpn_unicast
+   neighbor.capability_mbgp_ipv6_mpls_vpn_multicast
+   neighbor.capability_mbgp_nsap_mpls_vpn_unicast
+   neighbor.capability_mbgp_nsap_unicast  
+   neighbor.capability_route_refresh
+   neighbor.capability_route_refresh 128  
+   neighbor.capability_four_byte_as
 
 
 = Ruby classes representing BGP messages, attributes, and nlri
@@ -90,21 +93,24 @@ while a Path_attribute object or Nlri object is added to an Update object.
     :version=> 4, 
     :my_as=> 100, 
     :remote_addr => '192.168.1.200', 
-    :local_addr => '192.168.1.5', 
     :id=> '1.1.1.1', :holdtime=> 20
 
 ==== Set its capabilities:
 
-  neighbor.capability :as4_byte
-  neighbor.capability :route_refresh
-  neighbor.capability :route_refresh, 128
-  neighbor.capability :mbgp, :ipv4, :unicast
-  neighbor.capability :mbgp, :ipv4, :multicast
+  neighbor.capability_mbgp_ipv4_unicast  
+  neighbor.capability_mbgp_ipv4_multicast
+  neighbor.capability_mbgp_ipv4_mpls_vpn_unicast
+  neighbor.capability_mbgp_ipv6_mpls_vpn_multicast
+  neighbor.capability_mbgp_nsap_mpls_vpn_unicast
+  neighbor.capability_mbgp_nsap_unicast  
+  neighbor.capability_route_refresh
+  neighbor.capability_route_refresh 128  
+  neighbor.capability_four_byte_as
 
 
 ==== Start peering:
 
-  neighbor.start :auto_retry
+  neighbor.start :auto_retry=> true
 
 ==== Build an BGP Update object made up of a Path_attribute and a Nlri objects:
 
@@ -229,7 +235,7 @@ Source code is hosted on github.
 
 ==== Install the gem
 
-  sudo gem install bgp4r
+sudo gem install bgp4r
 
 == Requirements
 
@@ -247,4 +253,4 @@ 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/>.
+along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.

data/bgp/common.rb

@@ -13,6 +13,19 @@
 #    You should have received a copy of the GNU General Public License
 #    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
 
+module Kernel
+  alias :require_orig :require
+  
+  def my_caller(caller)
+    caller.split('/')
+  end
+  
+  def require(*args)
+    #puts format("%-20s : %s", "require '#{args}'", caller[0])
+    require_orig(*args)
+  end
+end
+
 require 'ipaddr'
 require 'logger'
 
@@ -31,18 +44,6 @@ class IPAddr
     end
   end
 
-  #TODO: if not used, get rid of it.
-  def self.new_nlri4(arg)
-    if arg.is_a?(String) and arg.is_packed?
-      arg +=([0]*3).pack('C*')
-      plen, *nlri = arg.unpack('CC4')
-      ipaddr = nlri.collect { |n| n.to_s }.join('.') + "/" + plen .to_s
-      IPAddr.new(ipaddr)
-    else
-      IPAddr.new(arg)
-    end
-  end
-  
   def mlen
     @_jme_mlen_ ||= _mlen_
   end

data/bgp/iana.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.
 #
@@ -20,39 +20,40 @@
 # along with BGP4R.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-
+# 
+# http://www.iana.org/assignments/address-family-numbers/
+# 
 module IANA
-  def self.afi(afi)
-    case afi
-    when AFI::IP   ; 'IPv4'
-    when AFI::IP6  ; 'IPv6'
-    else
-      ''
-    end
-  end
   def self.afi?(arg)
-    @h_afis ||= AFI.set_h_afis
-    @h_afis[arg]
+    afis[arg]
   end
-  def self.safi?(arg)
+  def self.afi(arg)
+    arg.is_a?(Fixnum) ? arg : afis[arg]
+  end
+  def self.safi(arg)
+    arg.is_a?(Fixnum) ? arg : safis[arg]
+  end
+  def self.safis
     @h_safis ||= SAFI.set_h_safis
-    @h_safis[arg]
   end
-  def self.safi(safi)
-    case safi
-    when SAFI::UNICAST_NLRI       ; 'Unicast'
-    when SAFI::MULTICAST_NLRI     ; 'Multicast'
+  def self.afis
+    @h_afis ||= AFI.set_h_afis
+  end
+  def self.safi?(arg)
+    case arg
+    when SAFI::UNICAST            ; 'Unicast'
+    when SAFI::MULTICAST          ; 'Multicast'
     when SAFI::LABEL_NLRI         ; 'Labeled NLRI'
     when SAFI::MCAST_VPN          ; 'Multicast VPN'
     when SAFI::MPLS_VPN_UNICAST   ; 'Labeled VPN Unicast'
     when SAFI::MPLS_VPN_Multicast ; 'Labeled VPN Multicast'
     else
-      ''
+      safis[arg]
     end
   end
   module AFI
-    IP = 1
-    IP6 = 2 
+    IPv4 = 1
+    IPv6 = 2
     NSAP = 3
     HDLC = 4
     BBN = 5
@@ -79,9 +80,8 @@ module IANA
     def self.set_h_afis
       h_afis = Hash.new
       constants.each do |c|
-        h_afis.store(c.downcase.to_sym, const_get(c))
-        h_afis.store(const_get(c), c.split('_').collect { |w| w }.join(' '))
-        # h_afis.store(const_get(c), c.downcase.to_sym)
+        h_afis.store(c.to_s.downcase.to_sym, const_get(c))
+        h_afis.store(const_get(c), c.to_s.split('_').collect { |w| w }.join(' '))
       end
       h_afis
     end
@@ -90,13 +90,13 @@ module IANA
     def self.set_h_safis
       h_safis = Hash.new
       constants.each do |c|
-        h_safis.store(c.downcase.to_sym, const_get(c))
-        h_safis.store(const_get(c), c.split('_').collect { |w| w }.join(' '))
+        h_safis.store(c.to_s.downcase.to_sym, const_get(c))
+        h_safis.store(const_get(c), c.to_s.split('_').collect { |w| w }.join(' '))
       end
       h_safis
     end
-    UNICAST_NLRI = 1
-    MULTICAST_NLRI = 2
+    UNICAST = 1
+    MULTICAST = 2
     LABEL_NLRI = 4
     MCAST_VPN = 5
     MULTI_SEGMENT_PW_NLRI = 6
@@ -115,180 +115,3 @@ module IANA
     VPN_AUTO_DISCOVERY = 140
   end
 end
-
-__END__
-
-http://www.iana.org/assignments/address-family-numbers/
-
-
-
-Registry:
-Number       Description                                                       Reference
-----------   ----------------------------------------------------------------  -----------------
-0            Reserved
-1            IP (IP version 4)
-2            IP6 (IP version 6)
-3            NSAP
-4            HDLC (8-bit multidrop)
-5            BBN 1822
-6            802 (includes all 802 media plus Ethernet "canonical format")
-7            E.163
-8            E.164 (SMDS, Frame Relay, ATM)
-9            F.69 (Telex)
-10           X.121 (X.25, Frame Relay)
-11           IPX
-12           Appletalk
-13           Decnet IV
-14           Banyan Vines
-15           E.164 with NSAP format subaddress                                 [UNI-3.1][Malis]
-16           DNS (Domain Name System)
-17           Distinguished Name                                                [Lynn]
-18           AS Number                                                         [Lynn]
-19           XTP over IP version 4                                             [Saul] 
-20           XTP over IP version 6                                             [Saul]
-21           XTP native mode XTP                                               [Saul]
-22           Fibre Channel World-Wide Port Name                                [Bakke]
-23           Fibre Channel World-Wide Node Name                                [Bakke]
-24           GWID                                                              [Hegde]
-25           AFI for L2VPN information                                         [RFC4761]
-26-16383     Unassigned
-16384        EIGRP Common Service Family                                       [Savage]
-16385        EIGRP IPv4 Service Family                                         [Savage]
-16386        EIGRP IPv6 Service Family                                         [Savage]
-16387-32767  Unassigned
-32768-65534  Unassigned
-65535        Reserved
-
-
-http://www.iana.org/assignments/safi-namespace
-
-
-Registries included below
-- SAFI Values
-
-
-Registry Name: SAFI Values
-Reference: [RFC4760]
-Range      Registration Procedures                              Note
----------  ---------------------------------------------------  --------------------
-1-63       Standards Action or Early Allocation policy
-64-127     First Come First Served
-128-240    Some recognized assignments below, others Reserved 
-241-254    Reserved for Private Use                             Not to be assigned
-
-Registry:
-Value    Description                                     Reference
--------  ----------------------------------------------  ---------
-0        Reserved                                        [RFC4760]
-
-1        Network Layer Reachability Information used     [RFC4760]
-         for unicast forwarding	
-
-2        Network Layer Reachability Information used     [RFC4760] 
-         for multicast forwarding
-	
-3        Reserved                                        [RFC4760]
-
-4        Network Layer Reachability Information (NLRI)   [RFC3107]
-         with MPLS Labels
-
-5        MCAST-VPN                                       [draft-ietf-l3vpn-2547bis-mcast-bgp]
-         (TEMPORARY - Expires 2009-06-19)
-
-6        Network Layer Reachability Information used     [draft-ietf-pwe3-dynamic-ms-pw]
-         for Dynamic Placement of Multi-Segment
-         Pseudowires
-         (TEMPORARY - Expires 2009-08-23)
-
-7        Encapsulation SAFI                              [RFC-ietf-softwire-encaps-safi-05.txt]
-
-8-63     Unassigned
-
-64       Tunnel SAFI                                     [Nalawade]
-
-65       Virtual Private LAN Service (VPLS)              [RFC4761]
-
-66       BGP MDT SAFI                                    [Nalawade]
-
-67       BGP 4over6 SAFI                                 [Cui]
-
-68       BGP 6over4 SAFI                                 [Cui]
-
-69       Layer-1 VPN auto-discovery information          [RFC-ietf-l1vpn-bgp-auto-discovery-05.txt]
-
-70-127   Unassigned 
-
-128      MPLS-labeled VPN address                        [RFC4364]
-
-129      Multicast for BGP/MPLS IP Virtual Private       [RFC2547]
-         Networks (VPNs)
-
-130-131  Reserved                                        [RFC4760]
-
-132      Route Target constrains                         [RFC4684]
-
-133      Dissemination of flow specification rules       [draft-marques-idr-flow-spec]
-
-134      Dissemination of flow specification rules       [draft-marques-idr-flow-spec]
-
-135-139  Reserved                                        [RFC4760]
-
-140      VPN auto-discovery                              [draft-ietf-l3vpn-bgpvpn-auto]
-
-141-240  Reserved                                        [RFC4760]
-
-241-254  Private Use                                     [RFC4760]
-
-255      Reserved                                        [RFC4760]
-
-
-References
-----------
-[RFC2547]  E. Rosen and Y. Rekhter, "BGP/MPLS VPNs", RFC 2547, March 1999.
-
-[RFC3107]  Y. Rekhter and E. Rosen, "Carrying Label Information in 
-           BGP-4", RFC 3107, May 2001.
-
-[RFC4364]  E. Rosen and Y. Rekhter, "BGP/MPLS IP VPNs", RFC 4364, February 2006.
-
-[RFC4684]  P. Marques, R. Bonica, L. Fang, L. Martini, R. Raszuk, K. Patel
-           and J. Guichard, "Constrained VPN Route Distribution", RFC 4684,
-           November 2006.
-
-[RFC4760]  T. Bates, R. Chandra, D. Katz and Y. Rekhter, "Multiprotocol 
-           Extensions for BGP-4", RFC 4760, January 2007.
-
-[RFC4761]  K. Kompella and Y. Rekhter, "Virtual Private LAN Service 
-           (VPLS) Using BGP for Auto-discovery and Signaling", RFC 4761,
-           January 2007.
-
-[RFC-ietf-l1vpn-bgp-auto-discovery-05.txt] 
-           H. Brahim, D. Fedyk, Y. Rekhter, "BGP-based Auto-Discovery for 
-           Layer-1 VPNs", RFC XXXX, Month Year.
-           
-[draft-ietf-l3vpn-bgpvpn-auto]  Work in progress
-
-[draft-ietf-pwe3-dynamic-ms-pw] Work in progress
-
-[draft-marques-idr-flow-spec]   Work in progress
-
-[draft-ietf-l3vpn-2547bis-mcast-bgp] Work in progress
-
-[RFC-ietf-softwire-encaps-safi-05.txt]
-           P. Mohapatra, E. Rosen, "BGP Encapsulation SAFI and BGP Tunnel 
-           Encapsulation Attribute", RFC XXXX, Month Year.
-
-People
-------
-[Bates] Tony Bates, <tbates&cisco.com>, July 2000. 
-
-[Cui]  Yong Cui, <cuiyong&tsinghua.edu.cn>, 15 August 2006, 20 September 2006.
-
-[Nalawade]  Gargi Nalawade, <gargi&cisco.com>, January 2004. 
-           (draft-nalawade-kapoor-tunnel-safi-01.txt)  
-           (draft-nalawade-idr-mdt-safi-00.txt), February 2004.
-
-(created 2000-07)
-
-[] 
-

data/bgp/io.rb

@@ -52,7 +52,6 @@ module BGP
               s.write obj.respond_to?(:encode) ? obj.encode : obj
             end
           rescue IOError, Errno::ECONNRESET, Errno::EBADF => e
-            puts "ECONNRESET"
             changed and notify_observers(:ev_conn_reset, e)
           ensure
             Log.debug "Exiting #{Thread.current['name']}"

data/bgp/messages/capability.rb

@@ -174,4 +174,4 @@ module BGP
   end
 end
 
-load "../../test/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/messages/message.rb

@@ -94,5 +94,5 @@ module ::BGP
 
 end
 
-load "../../test/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
 

data/bgp/messages/open.rb

@@ -115,4 +115,4 @@ end
 
 end
 
-load "../../test/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/messages/route_refresh.rb

@@ -87,7 +87,6 @@ class Orf
   end
 end
 
-#FIXME: Unit-test
 class Orf_route_refresh < Message
   
   attr_accessor :orfs
@@ -116,11 +115,11 @@ class Orf_route_refresh < Message
   end
   
   def afi
-    IANA.afi(@afi)
+    IANA.afi?(@afi)
   end
   
   def safi
-     IANA.safi(@safi)
+     IANA.safi?(@safi)
   end
   
   def afi=(val)
@@ -149,9 +148,7 @@ class Orf_route_refresh < Message
   def parse(s)
     @afi, reserved, @safi, orfs= super(s).unpack('nCCa*')
     while orfs.size>0
-      #puts "orfs before factory: #{orfs.unpack('H*')}"
       @orfs << Orf.factory(orfs.is_packed)
-      #puts "orfs after factory: #{orfs.unpack('H*')}"
     end
   end
   
@@ -162,7 +159,7 @@ class Orf_route_refresh < Message
   def to_s
     msg = self.encode
     "ORF Route Refresh (#{ROUTE_REFRESH}), length: #{msg.size}\n" +   
-    "AFI #{IANA.afi(@afi)} (#{@afi}), SAFI #{IANA.safi(@safi)} (#{@safi}):\n" +
+    "AFI #{IANA.afi?(@afi)} (#{@afi}), SAFI #{IANA.safi?(@safi)} (#{@safi}):\n" +
     @orfs.collect { |orf| orf.to_s}.join("\n")
   end
   
@@ -178,4 +175,4 @@ class Orf_route_refresh < Message
   
 end
 
-end
+end

data/bgp/messages/update.rb

@@ -55,7 +55,7 @@ class BGP::Update < BGP::Message
     end
   end
 
-  def initialize(*args)
+  def initialize(*args, &block)
     @nlri, @path_attribute, @withdrawn=nil,nil,nil
     @session_info = Info.new
     if args[0].is_a?(String) and args[0].is_packed?
@@ -70,6 +70,11 @@ class BGP::Update < BGP::Message
       @msg_type=UPDATE
       set(*args)
     end
+    if block
+      @path_attribute ||= Path_attribute.new
+      @nlri ||= Nlri.new
+      instance_eval(&block)
+    end
   end
 
   def set(*args)
@@ -80,8 +85,6 @@ class BGP::Update < BGP::Message
         self.path_attribute = arg
       elsif arg.is_a?(Nlri)
         self.nlri = arg
-      elsif arg.is_a?(Ext_Nlri)
-        self.nlri = arg
       end
     }
   end
@@ -155,8 +158,6 @@ class BGP::Update < BGP::Message
         p e
         raise
       end
-    elsif val.is_a?(Ext_Nlri)
-      @nlri = val
     elsif val.is_a?(Nlri)
       val.to_s.split.each { |n| self << n }
     else
@@ -192,10 +193,12 @@ class BGP::Update < BGP::Message
     end
   end
 
+  private
+
   def encoded_nlri
     @nlri.encode if @nlri
   end
 
 end
 
-load "../../test/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/messages/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0 

data/bgp/misc/live_feed.rb

@@ -38,7 +38,6 @@ class LiveFeed
   end
   alias msg read
   alias readmessage read
-
 end
-# 
+
 

data/bgp/neighbor/add_path_cap.rb

@@ -48,7 +48,7 @@ module BGP
         return false unless speaker and peer
         case sr
         when :recv, 'recv'
-          speaker.has?(:recv, afi, safi) && peer.has?(:send, afi, safi)
+          speaker.has?(:recv, afi, safi) && peer.has?(:send, afi, safi)        
         when :send, 'send'
           speaker.has?(:send, afi, safi) && peer.has?(:recv, afi, safi)
         else
@@ -66,14 +66,14 @@ module BGP
       def method_missing(name, *args, &block)
         if (/^(send|recv)_(ipv4|ipv6|inet|inet6)_(.+)\?$/ =~ name.to_s)
           case $2
-          when 'ipv4', 'inet'   ; afi = IANA.afi?(:ip)
-          when 'ipv6', 'inet6'  ; afi = IANA.afi?(:ip6)
+          when 'ipv4', 'inet'   ; afi = IANA.afi?(:ipv4)
+          when 'ipv6', 'inet6'  ; afi = IANA.afi?(:ipv6)
           else
             super
           end
           case $3
-          when 'unicast'            ; safi = IANA.safi?(:unicast_nlri)
-          when 'multicast'          ; safi = IANA.safi?(:multicast_nlri)
+          when 'unicast'            ; safi = IANA.safi?(:unicast)
+          when 'multicast'          ; safi = IANA.safi?(:multicast)
           when 'mpls_vpn_unicast'   ; safi = IANA.safi?(:mpls_vpn_unicast)
           when 'mpls_vpn_multicast' ; safi = IANA.safi?(:mpls_vpn_multicast)
           else
@@ -85,16 +85,17 @@ module BGP
         end
       end
 
-    private
+      private
 
-    def def_method(name, action, afi, safi)
-      self.class.instance_eval do
-        define_method("#{name}") do
-          path_id? action, afi, safi
+      def def_method(name, action, afi, safi)
+        return if respond_to? :name
+        self.class.instance_eval do
+          define_method("#{name}") do
+            path_id? action, afi, safi
+          end
         end
+        __send__ name
       end
-      __send__ name
-    end
 
     end
     
@@ -122,4 +123,4 @@ module BGP
   
 end
 
-load "../../test/neighbor/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/neighbor/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/neighbor/neighbor.rb

@@ -27,7 +27,6 @@ require 'bgp/io'
 require 'bgp/neighbor/add_path_cap'
 
 module BGP
-
   class Neighbor
     include Observable
     
@@ -46,12 +45,7 @@ module BGP
     def initialize(*args)
       @opt_parms = []
       if args.size==1 and args[0].is_a?(Hash)
-        @version = args[0][:version] if args[0][:version]
-        @my_as = args[0][:my_as] if args[0][:my_as]
-        @holdtime = args[0][:holdtime] if args[0][:holdtime]
-        @id = args[0][:id] if args[0][:id]
-        @remote_addr = args[0][:remote_addr] if args[0][:remote_addr]
-        @local_addr = args[0][:local_addr] if args[0][:local_addr]
+        set args[0]
       else
         @version, @my_as, @holdtime, @id, @remote_addr, @local_addr  = args
       end
@@ -63,22 +57,20 @@ module BGP
       event_dispatch
     end
     
+    def set(h)
+      [:version, :my_as, :holdtime, :id, :remote_addr, :local_addr].each do |name|
+        instance_variable_set("@#{name}", h[name]) if h.has_key?(name)
+      end
+    end
+    
     [:Idle, :Established, :OpenRecv, :OpenConfirm, :Active, :OpenSent].each do |state|
       define_method("is_#{state.to_s.downcase}?") do
         @state == state
       end
     end
     
-    # FIXME:
-    #  neighbor.add_capability 
-    #  neighbor.remove_capability 
-    #  neighbor.capability :as4_byte | :as4 | :as4byte
-    #  neighbor.capability :route_refresh, :rr
-    #  neighbor.capability :route_refresh, 128
-    #  neighbor.capability :mbgp, :ipv4, :unicast
-    #  neighbor.capability :mbgp, :ipv4, :multicast
-    
     def capability(*args)
+
       @opt_parms << if args[0].is_a?(Symbol)
         case args[0]
         when :route_refresh, :rr
@@ -99,6 +91,25 @@ module BGP
       end
     end
     alias :add_cap :capability
+    
+    def method_missing(name, *args, &block)
+      if name.to_s =~ /^(capability|add_capability)_(.+)$/
+        r = $2.dup
+        @opt_parms << if r =~ /mbgp_(.+)/
+          OPT_PARM::CAP::Mbgp.send $1
+        elsif r =~ /(rr|route_refresh)/
+          OPT_PARM::CAP::Route_refresh.new( *args)
+        elsif r =~ /(4byte_as|as4byte|four_(byte|octet)_as)/
+          OPT_PARM::CAP::As4.new(@my_as)
+        elsif r =~ /(gr|graceful_restart)/
+          OPT_PARM::CAP::Graceful_restart.new( *args)
+        else
+          super
+        end
+      else
+        super
+      end
+    end
 
     def state
       "#{@state}"
@@ -110,7 +121,7 @@ module BGP
         @restart_thread = Thread.new do
           Thread.current['name']='restart'
           loop do
-            enable if @state == :Idle
+            start if @state == :Idle
             sleep(4)
           end
         end
@@ -213,6 +224,7 @@ module BGP
     def stop
       @socket.close  if defined?(@socket) and not @socket.closed?
       clean
+      @open=nil
       new_state :Idle, "Disable"
     end
 
@@ -334,4 +346,4 @@ module BGP
 
 end
 
-load "../../test/neighbor/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
+load "../../test/unit/neighbor/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0