New upstream release

.hgignore

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

debian/changelog

@@ -1,58 +1,20 @@
-ruby-linux-netlink (0.17-1+jessie1) testing; urgency=medium
-
-  * New upstream release
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 01 Apr 2015 22:51:34 +0100
-
-ruby-linux-netlink (0.16-1+jessie1) testing; urgency=medium
-
-  * Repackaged for jessie
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 01 Apr 2015 17:39:44 +0100
-
-ruby-linux-netlink (0.16-1+wheezy1) stable; urgency=medium
+linux-netlink-ruby (0.13-1+squeeze1) oldstable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patch@dynamo>  Tue, 26 Aug 2014 16:33:48 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 13 Nov 2013 16:15:43 +0000
 
-ruby-linux-netlink (0.15-1+wheezy1) stable; urgency=low
+linux-netlink-ruby (0.12-1+squeeze1) oldstable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 21 Jan 2014 10:01:20 +0000
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 Sep 2013 14:28:10 +0100
 
-ruby-linux-netlink (0.14-1+wheezy1) stable; urgency=low
+linux-netlink-ruby (0.11-1+squeeze1) oldstable; urgency=low
 
-  * New upstream release.
+  * New upstream version.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 14 Nov 2013 13:37:28 +0000
-
-ruby-linux-netlink (0.13-1+wheezy1) stable; urgency=low
-
-  * New upstream release.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 13 Nov 2013 16:16:36 +0000
-
-ruby-linux-netlink (0.12-1+wheezy1) stable; urgency=low
-
-  * New upstream release.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 Sep 2013 14:26:41 +0100
-
-ruby-linux-netlink (0.11-1+wheezy2) stable; urgency=low
-
-  * Switch to dpkg-source 3.0 (quilt) format.
-  * Added patch to remove rubygems requires.
-  * Renamed source package to fit in with the new guidelines.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 14:16:30 +0100
-
-linux-netlink-ruby (0.11-1+wheezy1) stable; urgency=low
-
-  * New upstream version, repackaged for wheezy.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 14:16:05 +0100
+ -- 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

@@ -1,18 +1,39 @@
-Source: ruby-linux-netlink
+Source: linux-netlink-ruby
 Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
 Section: ruby
 Priority: optional
-Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi
+Build-Depends:  debhelper (>= 7), cdbs, ruby1.8, ruby1.9.1, ruby-pkg-tools, rake
 Standards-Version: 3.8.0
-XS-Ruby-Versions: all 
 
-Package: ruby-linux-netlink
-Architecture: any
-Depends: ruby | ruby-interpreter, ruby-ffi, ${misc:Depends}
-Provides: liblinux-netlink-ruby1.8, liblinux-netlink-ruby1.9.1
-XB-Ruby-Versions: ${ruby:Versions}
+Package: liblinux-netlink-ruby
+Architecture: all
+Depends: liblinux-netlink-ruby1.8 | liblinux-netlink-ruby1.9.1, ${misc:Depends}
 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

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

debian/patches/remove-rubygems-requirements

@@ -1,32 +0,0 @@
-Removed "require rubygems" from everywhere.
---- a/lib/linux/iptables.rb
-+++ b/lib/linux/iptables.rb
-@@ -1,11 +1,6 @@
- require 'socket'
- require 'linux/constants'
--
--begin
--  require 'ffi'
--rescue LoadError
--  require('rubygems') ? retry : raise
--end
-+require 'ffi'
- 
- 
- # Good things about FFI::Struct:
---- a/lib/linux/sendmsg.rb
-+++ b/lib/linux/sendmsg.rb
-@@ -1,12 +1,7 @@
- # Patchup to add Socket#sendmsg and Socket#recvmsg for ruby 1.8
- 
- if BasicSocket.instance_methods.grep(/^sendmsg$/).empty?
--  begin
--    require 'ffi'
--  rescue LoadError
--    require('rubygems') ? retry : raise
--  end
--
-+  require 'ffi'
-     
-   class BasicSocket
-     module FFIExt

debian/patches/series

@@ -1 +0,0 @@
-remove-rubygems-requirements

debian/ruby-test-files.yaml

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

debian/rules

@@ -1,23 +1,11 @@
 #!/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
 
-%:
-	dh $@ --buildsystem=ruby --with ruby
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
-override_dh_auto_build-arch:
+makebuilddir::
 	rake lib/linux/c_struct_sizeof_size_t.rb
 
-override_dh_auto_clean:
+clean::
 	rake clean
-

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

lib/linux/constants.rb

@@ -310,27 +310,24 @@ module Linux
   VLAN_FLAG_MVRP          = 0x8
 
   # from linux/if_addr.h
-  IFA_UNSPEC      = 0
-  IFA_ADDRESS     = 1
-  IFA_LOCAL       = 2
-  IFA_LABEL       = 3
-  IFA_BROADCAST   = 4
-  IFA_ANYCAST     = 5
-  IFA_CACHEINFO   = 6
-  IFA_MULTICAST   = 7
-  IFA_FLAGS       = 8
+  IFA_UNSPEC		= 0
+  IFA_ADDRESS		= 1
+  IFA_LOCAL		= 2
+  IFA_LABEL		= 3
+  IFA_BROADCAST		= 4
+  IFA_ANYCAST		= 5
+  IFA_CACHEINFO		= 6
+  IFA_MULTICAST		= 7
 
-  IFA_F_SECONDARY      = 0x01
-  IFA_F_TEMPORARY      = IFA_F_SECONDARY
-  IFA_F_NODAD          = 0x02
-  IFA_F_OPTIMISTIC     = 0x04
-  IFA_F_DADFAILED      = 0x08
-  IFA_F_HOMEADDRESS    = 0x10
-  IFA_F_DEPRECATED     = 0x20
-  IFA_F_TENTATIVE      = 0x40
-  IFA_F_PERMANENT      = 0x80
-  IFA_F_MANAGETEMPADDR = 0x100
-  IFA_F_NOPREFIXROUTE  = 0x200
+  IFA_F_SECONDARY	= 0x01
+  IFA_F_TEMPORARY	= IFA_F_SECONDARY
+  IFA_F_NODAD		= 0x02
+  IFA_F_OPTIMISTIC	= 0x04
+  IFA_F_DADFAILED	= 0x08
+  IFA_F_HOMEADDRESS	= 0x10
+  IFA_F_DEPRECATED	= 0x20
+  IFA_F_TENTATIVE	= 0x40
+  IFA_F_PERMANENT	= 0x80
 
   # from linux/if_arp.h - selected subset
   ARPHRD_NETROM		= 0

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 = @socket.getsockname.unpack(SOCKADDR_PACK)[2]
-
+      @pid = opt[:pid] || $$
       @timeout = opt.has_key?(:timeout) ? opt[:timeout] : DEFAULT_TIMEOUT
       if opt.has_key?(:junk_handler)
         @junk_handler = opt[:junk_handler]
@@ -77,7 +75,7 @@ module Netlink
         }
       end
     end
-
+    
     # Close the Netlink socket
     def close
       @socket.close
@@ -87,7 +85,7 @@ module Netlink
     def next_seq
       @seq = (@seq + 1) & 0xffffffff
     end
-
+    
     # Add a header and send a single message over the socket.
     #   type:: the message type code
     #   msg:: the message to send (without header)
@@ -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|
-        return rmsg if rtype == resp_type
+      receive_responses(true, timeout) do |type,msg|
+        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
@@ -205,13 +203,13 @@ module Netlink
         end
       end
     end
-
+    
     # Receive one datagram from kernel. Validates the sender, and returns
     # the raw binary message. Raises an exception on timeout or if the
     # 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

@@ -122,7 +122,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

@@ -8,12 +8,12 @@ module Netlink
       def clear_cache
         # No cache
       end
-
+      
       def list(filter={}, &blk)
         @rtsocket.link.list(filter.merge(:kind=>"vlan"))
       end
       alias :each :list
-
+            
       # Higher-level API to manipulate VLAN interface.
       #    nl.vlans.add(
       #      :link=>"lo",
@@ -24,15 +24,15 @@ module Netlink
       def add(opt)
         @rtsocket.link.add(vlan_options(opt))
       end
-
+      
       def change(opt)
         @rtsocket.link.change(vlan_options(opt))
       end
-
+      
       def replace(opt)
         @rtsocket.link.replace(vlan_options(opt))
       end
-
+      
       # Delete vlan given :link and :vlan_id. If you want to delete
       # by :index then call link.delete instead.
       def delete(opt)
@@ -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.12"
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Brian Candler", "Matthew Bloch", "Patrick Cherry", "Alex Young", "Nicholas Thomas"]
+  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

@@ -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,7 +15,7 @@ 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
 
@@ -21,47 +25,12 @@ class TestAddr < Test::Unit::TestCase
       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
-
-      ips = (10..20).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(&: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(