Updated packaging for wheezy.

.hgignore

@@ -1,4 +1,4 @@
-^debian/liblinux-netlink-ruby(1.8|1.9.1)?$
+^debian/ruby-linux-netlink$
 ~$
 ^.config-liblinux-netlink-ruby
 ^debian/files$

debian/changelog

@@ -1,44 +1,8 @@
-linux-netlink-ruby (0.17-1+squeeze1) oldstable; urgency=medium
+linux-netlink-ruby (0.11-1+wheezy1) stable; urgency=low
 
-  * New upstream release
+  * New upstream version, repackaged for wheezy.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 01 Apr 2015 22:48:55 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 13:57:06 +0100
-
-linux-netlink-ruby (0.16-1+squeeze1) oldstable; urgency=low
-
-  * New upstream release.
-
- -- Patrick J Cherry <patch@dynamo>  Tue, 26 Aug 2014 16:32:44 +0100
-
-linux-netlink-ruby (0.15-1+squeeze1) oldstable; urgency=low
-
-  * New upstream release.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 21 Jan 2014 10:02:54 +0000
-
-linux-netlink-ruby (0.14-1+squeeze1) oldstable; urgency=low
-
-  * New upstream release.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 14 Nov 2013 11:59:05 +0000
-
-linux-netlink-ruby (0.13-1+squeeze1) oldstable; urgency=low
-
-  * New upstream release.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 13 Nov 2013 16:15:43 +0000
-
-linux-netlink-ruby (0.12-1+squeeze1) oldstable; urgency=low
-
-  * New upstream release.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 Sep 2013 14:28:10 +0100
-
-linux-netlink-ruby (0.11-1+squeeze1) oldstable; urgency=low
-
-  * New upstream version.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 13:52:09 +0100
 
 linux-netlink-ruby (0.10-6) stable; urgency=low
 

debian/control

@@ -3,37 +3,16 @@ Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
 Section: ruby
 Priority: optional
-Build-Depends:  debhelper (>= 7), cdbs, ruby1.8, ruby1.9.1, ruby-pkg-tools, rake
+Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi
 Standards-Version: 3.8.0
+XS-Ruby-Versions: all 
 
-Package: liblinux-netlink-ruby
+Package: ruby-linux-netlink
-Architecture: all
+Architecture: any
-Depends: liblinux-netlink-ruby1.8 | liblinux-netlink-ruby1.9.1, ${misc:Depends}
+Depends: ruby | ruby-interpreter, ruby-ffi, ${misc:Depends}
+Provides: liblinux-netlink-ruby1.8, liblinux-netlink-ruby1.9.1
+XB-Ruby-Versions: ${ruby:Versions}
 Description: Netlink socket library for Ruby
  This library provides an API for using a Linux Netlink socket, for doing
  things like manipulating IP interfaces and routes programmatically, and
  capturing packets from ULOG.
- .
- This is the metapackage for all versions of Ruby.
-
-Package: liblinux-netlink-ruby1.8
-Architecture: any
-Depends: ruby1.8 (>= 1.8.7), libffi-ruby1.8, ${misc:Depends}
-Description: Netlink socket library for Ruby 1.8
- This library provides an API for using a Linux Netlink socket, for doing
- things like manipulating IP interfaces and routes programmatically, and
- capturing packets from ULOG.
- .
- This is the version for Ruby 1.8.7.
- 
-
-Package: liblinux-netlink-ruby1.9.1
-Architecture: any
-Depends: ruby1.9.1, libffi-ruby1.9.1, ${misc:Depends}
-Description: Netlink socket library for Ruby 1.9.1
- This library provides an API for using a Linux Netlink socket, for doing
- things like manipulating IP interfaces and routes programmatically, and
- capturing packets from ULOG.
- .
- This is the version for Ruby 1.9.1.
-

debian/liblinux-netlink-ruby1.9.1.examples

@@ -1 +0,0 @@
-examples/*

debian/ruby-test-files.yaml

@@ -0,0 +1,2 @@
+---
+- test/t_route.rb

debian/rules

@@ -1,11 +1,23 @@
 #!/usr/bin/make -f
 #
+# export DH_VERBOSE=1
+#
+# Uncomment to ignore all test failures (but the tests will run anyway)
+# export DH_RUBY_IGNORE_TESTS=all
+#
+# Uncomment to ignore some test failures (but the tests will run anyway).
+# Valid values:
+# export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+#
+# If you need to specify the .gemspec (eg there is more than one)
+# export DH_RUBY_GEMSPEC=gem.gemspec
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
-include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+	dh $@ --buildsystem=ruby --with ruby
 
-makebuilddir::
+override_dh_auto_build-arch:
 	rake lib/linux/c_struct_sizeof_size_t.rb
 
-clean::
+override_dh_auto_clean:
 	rake clean
+

lib/linux/constants.rb

@@ -58,8 +58,6 @@ module Linux
   NETLINK_PKTINFO		= 3
   NETLINK_BROADCAST_ERROR	= 4
   NETLINK_NO_ENOBUFS		= 5
-  NETLINK_RX_RING	= 6
-  NETLINK_TX_RING = 7
   
   NETLINK_UNCONNECTED		= 0
   NETLINK_CONNECTED		= 1
@@ -125,15 +123,6 @@ module Linux
   RTM_GETDCB		= 78
   RTM_SETDCB		= 79
 
-
-  RTM_NEWNETCONF = 80
-  RTM_GETNETCONF = 82
-
-  RTM_NEWMDB = 84
-  RTM_DELMDB = 85
-  RTM_GETMDB = 86
-
-
   # RT#type
   RTN_UNSPEC		= 0
   RTN_UNICAST		= 1
@@ -163,7 +152,6 @@ module Linux
   RTPROT_XORP		= 14
   RTPROT_NTK		= 15
   RTPROT_DHCP		= 16
-  RTPROT_MROUTED = 17
   
   # RT#scope, IFAddr#scope
   RT_SCOPE_UNIVERSE	= 0
@@ -200,12 +188,6 @@ module Linux
   RTA_CACHEINFO		= 12
   RTA_TABLE		= 15
   RTA_MARK		= 16
-  RTA_MFC_STATS = 17
-
-  # Keys for RT#nh_flags
-  RTNH_F_DEAD	    = 1    # Nexthop is dead (used by multipath)
-  RTNH_F_PERVASIVE	= 2  # Do recursive gateway lookup
-  RTNH_F_ONLINK    = 4   # Gateway is forced on link
   
   # Keys for RT#metrics
   RTAX_UNSPEC		= 0
@@ -223,7 +205,6 @@ module Linux
   RTAX_FEATURES		= 12
   RTAX_RTO_MIN		= 13
   RTAX_INITRWND		= 14
-  RTAX_QUICKACK   = 15
     
   # from linux/if_link.h
   IFLA_UNSPEC		= 0
@@ -252,29 +233,11 @@ module Linux
   IFLA_STATS64		= 23
   IFLA_VF_PORTS		= 24
   IFLA_PORT_SELF	= 25
-  IFLA_AF_SPEC          = 26
+  IFLA_AF_SPEC    = 26
-  IFLA_GROUP            = 27
+  IFLA_GROUP      = 27
-  IFLA_NET_NS_FD        = 28
+  IFLA_NET_NS_FD  = 28
   IFLA_EXT_MASK   = 29 
-  IFLA_PROMISCUITY      = 30
+  IFLA_PROMISCUITY = 30
-  IFLA_NUM_TX_QUEUES    = 31
-  IFLA_NUM_RX_QUEUES    = 32
-  IFLA_CARRIER          = 33
-  IFLA_PHYS_PORT_ID  = 34
-
-  BRIDGE_MODE_UNSPEC = 0
-  BRIDGE_MODE_HAIRPIN = 1
-
-  IFLA_BRPORT_UNSPEC        = 0
-  IFLA_BRPORT_STATE         = 1 # Spanning tree state
-  IFLA_BRPORT_PRIORITY      = 2 # "             priority
-  IFLA_BRPORT_COST          = 3 # "             cost
-  IFLA_BRPORT_MODE          = 4 # mode (hairpin)
-  IFLA_BRPORT_GUARD         = 5 # bpdu guard
-  IFLA_BRPORT_PROTECT       = 6 # root port protection
-  IFLA_BRPORT_FAST_LEAVE    = 7 # multicast fast leave
-  IFLA_BRPORT_LEARNING      = 8 # mac learning
-  IFLA_BRPORT_UNICAST_FLOOD = 9 # flood unicast traffic
 
   IFLA_INFO_UNSPEC	= 0
   IFLA_INFO_KIND	= 1	# "vlan", "gre" etc
@@ -287,52 +250,44 @@ module Linux
   IFLA_VLAN_FLAGS	= 2	# struct ifla_vlan_flags
   IFLA_VLAN_EGRESS_QOS	= 3	# followed by instance of IFLA_VLAN_QOS_*
   IFLA_VLAN_INGRESS_QOS	= 4	# followed by instance of IFLA_VLAN_QOS_*
-  IFLA_VLAN_PROTOCOL    = 5
   
   IFLA_VLAN_QOS_UNSPEC	= 0
-  IFLA_VLAN_QOS_MAPPING = 1
+  IFLA_VLAN_QOS_MAPPING	= 1
   
   IFLA_MACVLAN_UNSPEC	= 0
   IFLA_MACVLAN_MODE	= 1
-  IFLA_MACVLAN_FLAGS	= 2
   
   MACVLAN_MODE_PRIVATE	= 1
   MACVLAN_MODE_VEPA	= 2
   MACVLAN_MODE_BRIDGE	= 4
   MACVLAN_MODE_PASSTHRU	= 8
   
-  # TODO: VXLAN and VF stuff is missing here
-
   # linux/if_vlan.h
   VLAN_FLAG_REORDER_HDR		= 0x1
   VLAN_FLAG_GVRP		= 0x2
   VLAN_FLAG_LOOSE_BINDING	= 0x4
-  VLAN_FLAG_MVRP          = 0x8
   
   # from linux/if_addr.h
-  IFA_UNSPEC      = 0
+  IFA_UNSPEC		= 0
-  IFA_ADDRESS     = 1
+  IFA_ADDRESS		= 1
-  IFA_LOCAL       = 2
+  IFA_LOCAL		= 2
-  IFA_LABEL       = 3
+  IFA_LABEL		= 3
-  IFA_BROADCAST   = 4
+  IFA_BROADCAST		= 4
-  IFA_ANYCAST     = 5
+  IFA_ANYCAST		= 5
-  IFA_CACHEINFO   = 6
+  IFA_CACHEINFO		= 6
-  IFA_MULTICAST   = 7
+  IFA_MULTICAST		= 7
-  IFA_FLAGS       = 8
 
-  IFA_F_SECONDARY      = 0x01
+  IFA_F_SECONDARY	= 0x01
-  IFA_F_TEMPORARY      = IFA_F_SECONDARY
+  IFA_F_TEMPORARY	= IFA_F_SECONDARY
-  IFA_F_NODAD          = 0x02
+  IFA_F_NODAD		= 0x02
-  IFA_F_OPTIMISTIC     = 0x04
+  IFA_F_OPTIMISTIC	= 0x04
-  IFA_F_DADFAILED      = 0x08
+  IFA_F_DADFAILED	= 0x08
-  IFA_F_HOMEADDRESS    = 0x10
+  IFA_F_HOMEADDRESS	= 0x10
-  IFA_F_DEPRECATED     = 0x20
+  IFA_F_DEPRECATED	= 0x20
-  IFA_F_TENTATIVE      = 0x40
+  IFA_F_TENTATIVE	= 0x40
-  IFA_F_PERMANENT      = 0x80
+  IFA_F_PERMANENT	= 0x80
-  IFA_F_MANAGETEMPADDR = 0x100
-  IFA_F_NOPREFIXROUTE  = 0x200
 
-  # from linux/if_arp.h - selected subset
+  # from linux/if_arp.h
   ARPHRD_NETROM		= 0
   ARPHRD_ETHER		= 1
   ARPHRD_EETHER		= 2

lib/linux/netlink/message.rb

@@ -187,7 +187,7 @@ module Netlink
             warn "Duplicate attribute #{name} (#{code}): #{attrs[name].inspect} -> #{val.inspect}" if attrs[name]
             attrs[name] = val
           else
-            warn "Unknown attribute #{code}, in class #{self}, value #{val.inspect}" if $DEBUG
+            warn "Unknown attribute #{code}, in class #{self}, value #{val.inspect}"
             attrs[code] = val
           end
         end

lib/linux/netlink/nlsocket.rb

@@ -25,7 +25,7 @@ module Netlink
     # Check the sockaddr on a received message. Raises an error if the AF
     # is not AF_NETLINK or the PID is not 0 (this is important for security)
     def self.check_sockaddr(str)
-      af, _, pid, _ = str.unpack(SOCKADDR_PACK)
+      af, pad, pid, groups = str.unpack(SOCKADDR_PACK)
       raise "Bad AF #{af}!" if af != Socket::AF_NETLINK
       raise "Bad PID #{pid}!" if pid != 0
     end
@@ -58,16 +58,14 @@ module Netlink
     #   :timeout => N (seconds, default to DEFAULT_TIMEOUT. Pass nil for no timeout)
     #   :junk_handler => lambda { ... } for unexpected packets
     def initialize(opt)
-      @socket = opt[:socket] || ::Socket.new(
+      @socket ||= opt[:socket] || ::Socket.new(
         Socket::AF_NETLINK,
         Socket::SOCK_DGRAM,
         opt[:protocol] || (raise "Missing :protocol")
       )
       @socket.bind(NLSocket.sockaddr(opt)) unless opt[:socket]
       @seq = opt[:seq] || Time.now.to_i
-
+      @pid = opt[:pid] || $$
-      @pid = @socket.getsockname.unpack(SOCKADDR_PACK)[2]
-
       @timeout = opt.has_key?(:timeout) ? opt[:timeout] : DEFAULT_TIMEOUT
       if opt.has_key?(:junk_handler)
         @junk_handler = opt[:junk_handler]
@@ -137,8 +135,8 @@ module Netlink
     # (Compare: rtnl_talk in lib/libnetlink.c, with answer=NULL)
     def cmd(type, msg, flags=NLM_F_REQUEST, resp_type=NLMSG_ERROR, timeout=@timeout, sockaddr=SOCKADDR_DEFAULT)
       send_request(type, msg, flags|NLM_F_ACK, sockaddr)
-      receive_responses(true, timeout) do |rtype,rmsg|
+      receive_responses(true, timeout) do |type,msg|
-        return rmsg if rtype == resp_type
+        return msg if type == resp_type
         false
       end
     end
@@ -146,7 +144,7 @@ module Netlink
     # Discard all waiting messages
     def drain
       while select([@socket], nil, nil, 0)
-        mesg, _, _, _ = @socket.recvmsg
+        mesg, sender, rflags, controls = @socket.recvmsg
         raise EOFError unless mesg
       end
     end
@@ -211,7 +209,7 @@ module Netlink
     # kernel closes the socket.
     def recvmsg(timeout=@timeout)
       if select([@socket], nil, nil, timeout)
-        mesg, sender, _, _ = @socket.recvmsg
+        mesg, sender, rflags, controls = @socket.recvmsg
         raise EOFError unless mesg
         sender = sender.to_sockaddr if sender.respond_to? :to_sockaddr
         NLSocket.check_sockaddr(sender)

lib/linux/netlink/route/addr_handler.rb

@@ -24,10 +24,6 @@ module Netlink
         :pack   => lambda { |val,obj| val.to_a.pack("L*") },
         :unpack => lambda { |str,obj| IFACacheInfo.new(*(str.unpack("L*"))) }
     rtattr :multicast, IFA_MULTICAST, :l3addr
-
-    # TODO: is there any difference between flags and ifa_flags? The latter only
-    # shows up on newer kernels
-    rtattr :ifa_flags, IFA_FLAGS, :uint
   end
 
   module Route

lib/linux/netlink/route/link_handler.rb

@@ -65,9 +65,6 @@ module Netlink
     rtattr :net_ns_fd, IFLA_NET_NS_FD
     rtattr :ext_mask, IFLA_EXT_MASK   
     rtattr :promiscuity, IFLA_PROMISCUITY
-    rtattr :num_tx_queues, IFLA_NUM_TX_QUEUES
-    rtattr :num_rx_queues, IFLA_NUM_RX_QUEUES
-    rtattr :carrier, IFLA_CARRIER
  
     # Return the best stats available (64bit or 32bit)
     def stats
@@ -122,7 +119,6 @@ module Netlink
       :unpack => lambda { |str,obj| VlanFlags.parse(str) }
     rtattr :egress_qos, IFLA_VLAN_EGRESS_QOS
     rtattr :ingress_qos, IFLA_VLAN_INGRESS_QOS
-    rtattr :protocol, IFLA_VLAN_PROTOCOL, :ushort
   end
 
   module Route

lib/linux/netlink/route/vlan_handler.rb

@@ -59,7 +59,6 @@ module Netlink
         end
         li.data.egress_qos = opt.delete(:egress_qos) if opt.has_key?(:egress_qos)
         li.data.ingress_qos = opt.delete(:ingress_qos) if opt.has_key?(:ingress_qos)
-        li.data.protocol = opt.delete(:protocol) if opt.has_key?(:protocol)
         opt
       end
     end

netlinkrb.gemspec

@@ -5,9 +5,9 @@ $:.unshift lib unless $:.include? lib
 
 Gem::Specification.new do |s|
   s.name = "netlinkrb"
-  s.version = "0.17"
+  s.version = "0.11"
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Brian Candler", "Matthew Bloch", "Patrick Cherry", "Alex Young", "Nicholas Thomas"]
+  s.authors = ["Brian Candler", "Patrick Cherry", "Alex Young"]
   s.email = ["matthew@bytemark.co.uk"]
   s.summary = "Interface to Linux' Netlink API"
   s.description = "Ruby native interface to the Netlink API which avoids shelling out to command-line tools as much as possible."

test/t_route.rb

@@ -1,6 +1,10 @@
-require File.expand_path( File.join(File.dirname(__FILE__), 'test_helper') )
+require File.join(File.dirname(__FILE__), 'test_helper')
 require 'linux/netlink/route'
 
+# Note: multiple sockets bound to the same PID seem to cause timeout problems.
+# (Should we use different algorithm for generating the PID? PID + seq?)
+$ip ||= Linux::Netlink::Route::Socket.new
+
 #
 # Ruby 1.8.7 appears to lack the KeyError constant.
 #
@@ -11,62 +15,21 @@ end
 class TestAddr < Test::Unit::TestCase
   context "With netlink route socket" do
     setup do
-      @ip =  Linux::Netlink::Route::Socket.new
+      @ip = $ip
-      @ifname = nil
     end
 
     teardown do
       begin
-        delete_test_interface(@ifname)
+        delete_test_interface
       rescue KeyError, IndexError
         # Do nothing
       end
-
-      @ip.close
     end
 
     test "Read link type" do
       assert_equal Linux::ARPHRD_LOOPBACK, @ip.link["lo"].type
     end
 
-    test "Both sockets work if two are open at the same time" do
-      begin
-        @ip2 = Linux::Netlink::Route::Socket.new
-
-        assert_kind_of Enumerable, @ip.route.list
-        assert_kind_of Enumerable, @ip2.route.list
-      ensure
-        @ip2.close
-      end
-    end
-
-    test "massively parallel IP address addition" do
-      @ifname = create_test_interface
-      return if @ifname.nil?
-      
-      link = @ip.link.list.find{|x| x.ifname == @ifname} 
-      return if link.nil?
-
-      ips = (10..13).map {|y| (1..254).map {|z| "10.100.#{y}.#{z}" } }.flatten.compact
-
-      threads = ips.map {|ip|
-        Thread.new {
-          Linux::Netlink::Route::Socket.new.addr.add(
-            :index => @ifname,
-            :local => ip,
-            :prefixlen => 8
-          )
-        }
-      }
-
-      threads.map{|t| t.join }
-
-      created = @ip.addr.list(:index => @ifname, :family => Socket::AF_INET).
-        map {|ifaddr| ifaddr.address.to_s }
-
-      ips.each {|ip| assert created.include?( ip ), "#{ip} was not created" }
-    end
-
     def create_test_interface(ifname = "test_#{$$}")
       begin
         @ip.link.add(
@@ -75,29 +38,28 @@ class TestAddr < Test::Unit::TestCase
             :kind => "dummy"
           )
         )
-      rescue Errno::EOPNOTSUPP
-        # Ugh, fall back to eth0
-        ifname = "eth0"
       rescue Errno::EPERM => err
-        do_skip err.to_s
+        if self.respond_to?(:skip)
+          skip err.to_s
+        else
+          puts "Skipping #{self.method_name} -- #{err.to_s}"
+          return nil
+        end
       end
 
       return ifname
     end
 
     def set_interface_up(ifname)
-      link = @ip.link.list.find{|l| l.ifname == ifname}
+        link = @ip.link.list.find{|l| l.ifname == ifname}
 
-      return if link.nil?
+        #
-      return unless link.linkinfo and "dummy" == link.linkinfo.kind
+        # Bring the link up
-
+        #
-      #
+        @ip.link.change(
-      # Bring the link up
+         :index => link.index,
-      #
+         :flags => link.flags | Linux::IFF_UP | Linux::IFF_RUNNING
-      @ip.link.change(
+       )
-        :index => link.index,
-        :flags => link.flags | Linux::IFF_UP | Linux::IFF_RUNNING
-      )
 
       link = @ip.link.list.find{|l| l.ifname == ifname}
 
@@ -109,7 +71,6 @@ class TestAddr < Test::Unit::TestCase
       link = @ip.link.list.find{|l| l.ifname == ifname}
 
       return if link.nil?
-      return unless link.linkinfo and "dummy" == link.linkinfo.kind
       return unless link.flags == (link.flags | Linux::IFF_UP | Linux::IFF_RUNNING)
 
       #
@@ -126,11 +87,7 @@ class TestAddr < Test::Unit::TestCase
       assert_equal(0, link.flags & Linux::IFF_RUNNING, "Link still has the IFF_RUNNING flag set") 
     end
 
-    def delete_test_interface(ifname) 
+    def delete_test_interface(ifname = "test_#{$$}")
-      unless @ip.link[ifname] and @ip.link[ifname].linkinfo and "dummy" == @ip.link[ifname].linkinfo.kind
-        return nil
-      end
-
       begin
         set_interface_down(ifname)
       ensure
@@ -138,27 +95,11 @@ class TestAddr < Test::Unit::TestCase
       end
     end
       
-    def do_skip(msg)
-      if self.respond_to?(:skip)
-        skip msg
-      else
-        puts "Skipping #{self.method_name} -- #{msg}"
-      end
-      return nil
-    end
-
     test "Add and remove dummy interface" do
-      @ifname = create_test_interface
+      ifname = create_test_interface
-      return if @ifname.nil?
+      return if ifname.nil?
 
-      link = @ip.link.list.find{|x| x.ifname == @ifname} 
+      delete_test_interface(ifname)
-      return if link.nil?
-
-      unless link.linkinfo and "dummy" == link.linkinfo.kind
-        return do_skip("Could not create dummy interface")
-      end
-
-      delete_test_interface(@ifname)
     end
     
     def addrlist(opt = {:index=>"lo"})
@@ -166,26 +107,23 @@ class TestAddr < Test::Unit::TestCase
     end
 
     def add_and_remove_addr(testaddr, pfx)
-      @ifname = create_test_interface
+      ifname = create_test_interface
-      return if @ifname.nil?
+      return if ifname.nil?
 
-      link = @ip.link.list.find{|x| x.ifname == @ifname} 
+      addrs1 = addrlist({:index => ifname})
-      return if link.nil?
-      
-      addrs1 = addrlist({:index => @ifname})
       assert !addrs1.include?(testaddr)
 
-      @ip.addr.add(:index=>@ifname, :local=>testaddr, :prefixlen=>pfx)
+      @ip.addr.add(:index=>ifname, :local=>testaddr, :prefixlen=>pfx)
       assert_raises(Errno::EEXIST) {
-        @ip.addr.add(:index=>@ifname, :local=>testaddr, :prefixlen=>pfx)
+        @ip.addr.add(:index=>ifname, :local=>testaddr, :prefixlen=>pfx)
       }
 
-      addrs2 = addrlist({:index => @ifname})
+      addrs2 = addrlist({:index => ifname})
       assert addrs2.include?(testaddr), "#{addrs2.inspect} doesn't include #{testaddr}"
       
-      @ip.addr.delete(:index=>@ifname, :local=>testaddr, :prefixlen=>pfx)
+      @ip.addr.delete(:index=>ifname, :local=>testaddr, :prefixlen=>pfx)
       
-      addrs3 = addrlist({:index => @ifname})
+      addrs3 = addrlist({:index => ifname})
       assert_equal addrs1, addrs3
     end
 
@@ -220,24 +158,22 @@ class TestAddr < Test::Unit::TestCase
     end
   
     test "Add and remove vlan" do
-      @ifname = create_test_interface
+      ifname = create_test_interface
-      return if @ifname.nil?
+      return if ifname.nil?
 
-      link = @ip.link.list.find{|x| x.ifname == @ifname}
+      vlans1 = vlanlist(ifname)
-      return if link.nil?
-
-      vlans1 = vlanlist(@ifname)
       assert !vlans1.include?(1234)
 
-      @ip.vlan.add(:link=>@ifname, :vlan_id=>1234)
+      @ip.vlan.add(:link=>ifname, :vlan_id=>1234)
 
-      vlans2 = vlanlist(@ifname)
+      vlans2 = vlanlist(ifname)
       assert vlans2.include?(1234)
 
-      @ip.vlan.delete(:link=>@ifname, :vlan_id=>1234)
+      @ip.vlan.delete(:link=>ifname, :vlan_id=>1234)
 
-      vlans3 = vlanlist(@ifname)
+      vlans3 = vlanlist(ifname)
       assert_equal vlans1, vlans3
+      @ip.link.delete(:index => ifname)
     end
 
     def routes
@@ -255,17 +191,13 @@ class TestAddr < Test::Unit::TestCase
     end
     
     def add_and_remove_route(info)
-      @ifname = create_test_interface
+      ifname = create_test_interface
-      return if @ifname.nil?
+      return if ifname.nil?
 
-      set_interface_up(@ifname) 
+      set_interface_up(ifname) 
 
-      info[:oif] = @ifname
+      info[:oif] = ifname
-
+      ifidx = @ip.link.list.find{|x| x.ifname == info[:oif]}.index
-      link = @ip.link.list.find{|x| x.ifname == info[:oif]}
-      return if link.nil?
-
-      ifidx = link.index
 
       assert_equal 0, routes.select { |x| x == [info[:dst], info[:dst_len], ifidx] }.size