New upstream release.

"pid" is not "process id" in netlink, but rather, "port id". If you bind to a
sockaddr == 0 then Linux automatically assigns your socket a port id - which
happens to be the same as the process ID for the first one concurrently open.

For the second and subsequent concurrently-open sockets, binding 0 (as most
users of this library will do) gets you back a random high-numbered port id.

This change preserves the existing use case (one port open in the process,
binding to 0) while fixing multiple-ports-open-in-the-same-process, socket-is-
passed-in-and-pid-is-not-specified, and specific-pid-is-requested-but-could-
not-bind-to-it.

We're probably still not thread-safe - the seq handling looks dodgy - but at
least now we can use multiple sockets in separate threads and have them all
work.

Using the same socket from multiple threads is a slightly niche use case, and
it's tempting to say "don't do this" instead...

.hgignore

@@ -1,3 +1,7 @@
+^debian/ruby-linux-netlink$
 ~$
 ^.config-liblinux-netlink-ruby
-^debian/$
+^.pc/
+^debian/files$
+^debian/.*\.substvars$
+^debian/.*\.debhelper.log$

debian/changelog

@@ -0,0 +1,81 @@
+ruby-linux-netlink (0.16-1+wheezy1) stable; urgency=medium
+
+  * New upstream release.
+
+ -- Patrick J Cherry <patch@dynamo>  Tue, 26 Aug 2014 16:33:48 +0100
+
+ruby-linux-netlink (0.15-1+wheezy1) stable; urgency=low
+
+  * New upstream release.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 21 Jan 2014 10:01:20 +0000
+
+ruby-linux-netlink (0.14-1+wheezy1) stable; urgency=low
+
+  * New upstream release.
+
+ -- 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
+
+linux-netlink-ruby (0.10-6) stable; urgency=low
+
+  * Add ip rule support
+
+ -- Nick Thomas <nick@bytemark.co.uk>  Thu,  5 Jul 2012 15:19:42 +0100
+
+linux-netlink-ruby (0.10-5) stable; urgency=low
+
+  * Updated rattr constants to work with linux 3.2.
+  * Updated link handler to have new rattrs. 
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Mon, 11 Jun 2012 10:53:37 +0100
+
+linux-netlink-ruby (0.10-4) unstable; urgency=low
+
+  * Removed dependency on gcc, in favour of having arch-dependent packages
+    which rely on build-time ascertation of sizeof size_t.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 24 Jan 2012 15:56:46 +0000
+
+linux-netlink-ruby (0.10-3) unstable; urgency=low
+
+  * Updated version number to cover the previous changes.
+
+ -- Steve Kemp <steve@bytemark.co.uk>  Thu, 12 Jan 2012 12:00:21 +0000
+
+linux-netlink-ruby (0.10-2) unstable; urgency=low
+
+  * Added NlSocket.open and scope handling.
+
+ -- Matthew Bloch <matthew@bytemark.co.uk>  Wed, 18 May 2011 15:27:00 +0100
+
+linux-netlink-ruby (0.10-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 May 2011 17:17:45 +0100

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,18 @@
+Source: ruby-linux-netlink
+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
+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}
+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.

debian/copyright

@@ -0,0 +1,20 @@
+Ruby Netlink
+============
+
+Copyright (c) 2011 Bytemark Computer Consulting Ltd
+
+Licence:
+
+This program 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 2 of the License, or
+(at your option) any later version.
+
+This program 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.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in ‘/usr/share/common-licenses/GPL’ or in the dpkg
+source as the file ‘COPYING’

debian/patches/remove-rubygems-requirements

@@ -0,0 +1,32 @@
+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

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

debian/ruby-linux-netlink.examples

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

debian/ruby-test-files.yaml

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

debian/rules

@@ -0,0 +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
+
+%:
+	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_build-arch:
+	rake lib/linux/c_struct_sizeof_size_t.rb
+
+override_dh_auto_clean:
+	rake clean
+

debian/source/format

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

lib/linux/constants.rb

@@ -58,6 +58,8 @@ 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
@@ -123,6 +125,15 @@ 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
@@ -152,6 +163,7 @@ module Linux
   RTPROT_XORP		= 14
   RTPROT_NTK		= 15
   RTPROT_DHCP		= 16
+  RTPROT_MROUTED = 17
 
   # RT#scope, IFAddr#scope
   RT_SCOPE_UNIVERSE	= 0
@@ -188,6 +200,12 @@ 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
@@ -205,6 +223,7 @@ module Linux
   RTAX_FEATURES		= 12
   RTAX_RTO_MIN		= 13
   RTAX_INITRWND		= 14
+  RTAX_QUICKACK   = 15
 
   # from linux/if_link.h
   IFLA_UNSPEC		= 0
@@ -241,6 +260,21 @@ module Linux
   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
@@ -253,22 +287,27 @@ 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_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
@@ -279,6 +318,7 @@ module Linux
   IFA_ANYCAST     = 5
   IFA_CACHEINFO   = 6
   IFA_MULTICAST   = 7
+  IFA_FLAGS       = 8
 
   IFA_F_SECONDARY      = 0x01
   IFA_F_TEMPORARY      = IFA_F_SECONDARY
@@ -289,8 +329,10 @@ module Linux
   IFA_F_DEPRECATED     = 0x20
   IFA_F_TENTATIVE      = 0x40
   IFA_F_PERMANENT      = 0x80
+  IFA_F_MANAGETEMPADDR = 0x100
+  IFA_F_NOPREFIXROUTE  = 0x200
 
-  # from linux/if_arp.h
+  # from linux/if_arp.h - selected subset
   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}"
+            warn "Unknown attribute #{code}, in class #{self}, value #{val.inspect}" if $DEBUG
             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, pad, pid, groups = str.unpack(SOCKADDR_PACK)
+      af, _, pid, _ = str.unpack(SOCKADDR_PACK)
       raise "Bad AF #{af}!" if af != Socket::AF_NETLINK
       raise "Bad PID #{pid}!" if pid != 0
     end
@@ -58,14 +58,16 @@ 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]
@@ -135,8 +137,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 |type,msg|
+      receive_responses(true, timeout) do |rtype,rmsg|
-        return msg if type == resp_type
+        return rmsg if rtype == resp_type
         false
       end
     end
@@ -144,7 +146,7 @@ module Netlink
     # Discard all waiting messages
     def drain
       while select([@socket], nil, nil, 0)
-        mesg, sender, rflags, controls = @socket.recvmsg
+        mesg, _, _, _ = @socket.recvmsg
         raise EOFError unless mesg
       end
     end
@@ -209,7 +211,7 @@ module Netlink
     # kernel closes the socket.
     def recvmsg(timeout=@timeout)
       if select([@socket], nil, nil, timeout)
-        mesg, sender, rflags, controls = @socket.recvmsg
+        mesg, sender, _, _ = @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,6 +24,10 @@ 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,6 +122,7 @@ 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,6 +59,7 @@ 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

test/t_route.rb

@@ -1,10 +1,6 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require File.expand_path( 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.
 #
@@ -15,7 +11,7 @@ end
 class TestAddr < Test::Unit::TestCase
   context "With netlink route socket" do
     setup do
-      @ip = $ip
+      @ip =  Linux::Netlink::Route::Socket.new
       @ifname = nil
     end
 
@@ -25,12 +21,25 @@ 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
+
     def create_test_interface(ifname = "test_#{$$}")
       begin
         @ip.link.add(