New upstream release

.hgignore

@@ -1,4 +1,6 @@
-^debian/liblinux-netlink-ruby
+^debian/liblinux-netlink-ruby(1.8|1.9.1)?$
 ~$
 ^.config-liblinux-netlink-ruby
 ^debian/files$
+^debian/.*\.substvars$
+^debian/.*\.debhelper.log$

debian/changelog

@@ -1,3 +1,9 @@
+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.

lib/linux/constants.rb

@@ -233,11 +233,14 @@ module Linux
   IFLA_STATS64		= 23
   IFLA_VF_PORTS		= 24
   IFLA_PORT_SELF	= 25
-  IFLA_AF_SPEC    = 26
-  IFLA_GROUP      = 27
-  IFLA_NET_NS_FD  = 28
-  IFLA_EXT_MASK   = 29 
-  IFLA_PROMISCUITY = 30
+  IFLA_AF_SPEC          = 26
+  IFLA_GROUP            = 27
+  IFLA_NET_NS_FD        = 28
+  IFLA_EXT_MASK         = 29 
+  IFLA_PROMISCUITY      = 30
+  IFLA_NUM_TX_QUEUES    = 31
+  IFLA_NUM_RX_QUEUES    = 32
+  IFLA_CARRIER          = 33
 
   IFLA_INFO_UNSPEC	= 0
   IFLA_INFO_KIND	= 1	# "vlan", "gre" etc

lib/linux/netlink/route/link_handler.rb

@@ -65,6 +65,9 @@ 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

netlinkrb.gemspec

@@ -5,9 +5,9 @@ $:.unshift lib unless $:.include? lib
 
 Gem::Specification.new do |s|
   s.name = "netlinkrb"
-  s.version = "0.11"
+  s.version = "0.12"
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Brian Candler", "Patrick Cherry", "Alex Young"]
+  s.authors = ["Brian Candler", "Matthew Bloch", "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

@@ -16,11 +16,12 @@ class TestAddr < Test::Unit::TestCase
   context "With netlink route socket" do
     setup do
       @ip = $ip
+      @ifname = nil
     end
 
     teardown do
       begin
-        delete_test_interface
+        delete_test_interface(@ifname)
       rescue KeyError, IndexError
         # Do nothing
       end
@@ -38,28 +39,29 @@ class TestAddr < Test::Unit::TestCase
             :kind => "dummy"
           )
         )
+      rescue Errno::EOPNOTSUPP
+        # Ugh, fall back to eth0
+        ifname = "eth0"
       rescue Errno::EPERM => err
-        if self.respond_to?(:skip)
-          skip err.to_s
-        else
-          puts "Skipping #{self.method_name} -- #{err.to_s}"
-          return nil
-        end
+        do_skip err.to_s
       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}
 
-        #
-        # Bring the link up
-        #
-        @ip.link.change(
-         :index => link.index,
-         :flags => link.flags | Linux::IFF_UP | Linux::IFF_RUNNING
-       )
+      return if link.nil?
+      return unless link.linkinfo and "dummy" == link.linkinfo.kind
+
+      #
+      # Bring the link up
+      #
+      @ip.link.change(
+        :index => link.index,
+        :flags => link.flags | Linux::IFF_UP | Linux::IFF_RUNNING
+      )
 
       link = @ip.link.list.find{|l| l.ifname == ifname}
 
@@ -71,6 +73,7 @@ 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)
 
       #
@@ -87,19 +90,39 @@ 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 = "test_#{$$}")
+    def delete_test_interface(ifname) 
+      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
         @ip.link.delete(:index => ifname)
       end
     end
-      
-    test "Add and remove dummy interface" do
-      ifname = create_test_interface
-      return if ifname.nil?
 
-      delete_test_interface(ifname)
+    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
+      return if @ifname.nil?
+      
+      link = @ip.link.list.find{|x| x.ifname == @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"})
@@ -107,23 +130,26 @@ class TestAddr < Test::Unit::TestCase
     end
 
     def add_and_remove_addr(testaddr, pfx)
-      ifname = create_test_interface
-      return if ifname.nil?
+      @ifname = create_test_interface
+      return if @ifname.nil?
 
-      addrs1 = addrlist({:index => ifname})
+      link = @ip.link.list.find{|x| x.ifname == @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
 
@@ -158,22 +184,24 @@ class TestAddr < Test::Unit::TestCase
     end
   
     test "Add and remove vlan" do
-      ifname = create_test_interface
-      return if ifname.nil?
+      @ifname = create_test_interface
+      return if @ifname.nil?
 
-      vlans1 = vlanlist(ifname)
+      link = @ip.link.list.find{|x| x.ifname == @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
@@ -191,13 +219,17 @@ class TestAddr < Test::Unit::TestCase
     end
     
     def add_and_remove_route(info)
-      ifname = create_test_interface
-      return if ifname.nil?
+      @ifname = create_test_interface
+      return if @ifname.nil?
 
-      set_interface_up(ifname) 
+      set_interface_up(@ifname) 
 
-      info[:oif] = ifname
-      ifidx = @ip.link.list.find{|x| x.ifname == info[:oif]}.index
+      info[:oif] = @ifname
+
+      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