Updated to 0.18

Otherwise I get

Error: test_massively_parallel_IP_address_addition(TestAddr::TestWithNetlinkRouteSocket)
  Errno::EMFILE: Too many open files - socket(2)
  lib/linux/netlink/nlsocket.rb:61:in `initialize'
  lib/linux/netlink/nlsocket.rb:61:in `new'
  lib/linux/netlink/nlsocket.rb:61:in `initialize'
  lib/linux/netlink/route.rb:21:in `initialize'
  test/t_route.rb:54:in `new'
  test/t_route.rb:54:in `block (4 levels) in <class:TestAddr>'

.hgignore

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

debian/changelog

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

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

debian/control

@@ -1,39 +0,0 @@
-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), cdbs, ruby1.8, ruby1.9.1, ruby-pkg-tools, rake
-Standards-Version: 3.8.0
-
-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/copyright

@@ -1,20 +0,0 @@
-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/liblinux-netlink-ruby1.8.examples

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

debian/liblinux-netlink-ruby1.9.1.examples

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

debian/rules

@@ -1,11 +0,0 @@
-#!/usr/bin/make -f
-#
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
-
-makebuilddir::
-	rake lib/linux/c_struct_sizeof_size_t.rb
-
-clean::
-	rake clean

lib/linux/constants.rb

@@ -36,6 +36,7 @@ module Linux
   NLM_F_ACK    = 4
   NLM_F_ECHO    = 8
   NLM_F_DUMP_INTR = 16
+  NLM_F_DUMP_FILTERED = 32
   NLM_F_ROOT    = 0x100
   NLM_F_MATCH    = 0x200
   NLM_F_ATOMIC    = 0x400
@@ -53,6 +54,8 @@ module Linux
   NLMSG_DONE    = 0x3
   NLMSG_OVERRUN    = 0x4
 
+  NLMSG_MIN_TYPE = 0x10
+
   NETLINK_ADD_MEMBERSHIP  = 1
   NETLINK_DROP_MEMBERSHIP  = 2
   NETLINK_PKTINFO    = 3
@@ -60,6 +63,9 @@ module Linux
   NETLINK_NO_ENOBUFS    = 5
   NETLINK_RX_RING  = 6
   NETLINK_TX_RING = 7
+  NETLINK_LISTEN_ALL_NSID = 8
+  NETLINK_LIST_MEMBERSHIPS = 9
+  NETLINK_CAP_ACK = 10
 
   NETLINK_UNCONNECTED    = 0
   NETLINK_CONNECTED    = 1
@@ -71,6 +77,7 @@ module Linux
   NLA_ALIGNTO      = 4  # same on i686 and x86_64
 
   # from linux/rtnetlink.h.
+  RTM_BASE      = 16
   RTM_NEWLINK    = 16
   RTM_DELLINK    = 17
   RTM_GETLINK    = 18
@@ -133,6 +140,12 @@ module Linux
   RTM_DELMDB = 85
   RTM_GETMDB = 86
 
+  RTM_NEWNSID = 88
+  RTM_DELNSID = 89
+  RTM_GETNSID = 90
+
+  RTM_NEWSTATS = 92
+  RTM_GETSTATS = 94
 
   # RT#type
   RTN_UNSPEC    = 0
@@ -164,6 +177,7 @@ module Linux
   RTPROT_NTK    = 15
   RTPROT_DHCP    = 16
   RTPROT_MROUTED = 17
+  RTPROT_BABEL = 42
 
   # RT#scope, IFAddr#scope
   RT_SCOPE_UNIVERSE  = 0
@@ -177,6 +191,7 @@ module Linux
   RTM_F_CLONED    = 0x200
   RTM_F_EQUALIZE  = 0x400
   RTM_F_PREFIX    = 0x800
+  RTM_F_LOOKUP_TABLE = 0x1000
 
   # RT#table (reserved values)
   RT_TABLE_UNSPEC  = 0
@@ -201,11 +216,21 @@ module Linux
   RTA_TABLE    = 15
   RTA_MARK    = 16
   RTA_MFC_STATS = 17
+  RTA_VIA = 18
+  RTA_NEWDST = 19
+  RTA_PREF = 20
+  RTA_ENCAP_TYPE = 21
+  RTA_ENCAP = 22
+  RTA_EXPIRES = 23
+  RTA_PAD = 24
 
   # 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
+  RTNH_F_OFFLOAD   = 8   # offloaded route
+  RTNH_F_LINKDOWN  = 16  # carrier-down on nexthop
+
 
   # Keys for RT#metrics
   RTAX_UNSPEC    = 0
@@ -224,6 +249,7 @@ module Linux
   RTAX_RTO_MIN    = 13
   RTAX_INITRWND    = 14
   RTAX_QUICKACK   = 15
+  RTAX_CC_ALGO    = 16
 
   # from linux/if_link.h
   IFLA_UNSPEC    = 0
@@ -261,6 +287,14 @@ module Linux
   IFLA_NUM_RX_QUEUES    = 32
   IFLA_CARRIER          = 33
   IFLA_PHYS_PORT_ID  = 34
+  IFLA_CARRIER_CHANGES = 35
+  IFLA_PHYS_SWITCH_ID = 36
+  IFLA_LINK_NETNSID = 37
+  IFLA_PHYS_PORT_NAME = 38
+  IFLA_PROTO_DOWN = 39
+  IFLA_GSO_MAX_SEGS = 40
+  IFLA_GSO_MAX_SIZE = 41
+  IFLA_PAD = 42
 
   BRIDGE_MODE_UNSPEC = 0
   BRIDGE_MODE_HAIRPIN = 1
@@ -275,12 +309,30 @@ module Linux
   IFLA_BRPORT_FAST_LEAVE    = 7 # multicast fast leave
   IFLA_BRPORT_LEARNING      = 8 # mac learning
   IFLA_BRPORT_UNICAST_FLOOD = 9 # flood unicast traffic
+  IFLA_BRPORT_PROXYARP      = 10 # proxy ARP
+  IFLA_BRPORT_LEARNING_SYNC = 11 # mac learning sync from device
+  IFLA_BRPORT_PROXYARP_WIFI = 12 # proxy ARP for Wi-Fi
+  IFLA_BRPORT_ROOT_ID       = 13 # designated root
+  IFLA_BRPORT_BRIDGE_ID     = 14 # designated bridge
+  IFLA_BRPORT_DESIGNATED_PORT = 15
+  IFLA_BRPORT_DESIGNATED_COST = 16
+  IFLA_BRPORT_ID = 17
+  IFLA_BRPORT_NO = 18
+  IFLA_BRPORT_TOPOLOGY_CHANGE_ACK = 19
+  IFLA_BRPORT_CONFIG_PENDING = 20
+  IFLA_BRPORT_MESSAGE_AGE_TIMER = 21
+  IFLA_BRPORT_FORWARD_DELAY_TIMER = 22
+  IFLA_BRPORT_HOLD_TIMER = 23
+  IFLA_BRPORT_FLUSH = 24
+  IFLA_BRPORT_MULTICAST_ROUTER = 25
+  IFLA_BRPORT_PAD = 26
 
   IFLA_INFO_UNSPEC  = 0
   IFLA_INFO_KIND  = 1  # "vlan", "gre" etc
   IFLA_INFO_DATA  = 2  # packed rtattrs specific to type, e.g. vlan
   IFLA_INFO_XSTATS  = 3
 
+
   # INFO_DATA for INFO_KIND == "vlan"
   IFLA_VLAN_UNSPEC  = 0
   IFLA_VLAN_ID    = 1  # ushort
@@ -295,11 +347,16 @@ module Linux
   IFLA_MACVLAN_UNSPEC  = 0
   IFLA_MACVLAN_MODE  = 1
   IFLA_MACVLAN_FLAGS  = 2
+  IFLA_MACVLAN_MACADDR_MODE = 3
+  IFLA_MACVLAN_MACADDR = 4
+  IFLA_MACVLAN_MACADDR_DATA = 5
+  IFLA_MACVLAN_MACADDR_COUNT = 6
 
-  MACVLAN_MODE_PRIVATE	= 1
+  MACVLAN_MODE_PRIVATE  = 1 # don't talk to other macvlans
-  MACVLAN_MODE_VEPA	= 2
+  MACVLAN_MODE_VEPA  = 2 # talk to other ports through ext bridge
-  MACVLAN_MODE_BRIDGE	= 4
+  MACVLAN_MODE_BRIDGE  = 4 # talk to bridge ports directly
-  MACVLAN_MODE_PASSTHRU	= 8
+  MACVLAN_MODE_PASSTHRU  = 8 # take over the underlying device
+  MACVLAN_MODE_SOURCE = 16 # use source MAC address list to assign
 
   # TODO: VXLAN and VF stuff is missing here
 
@@ -318,6 +375,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
@@ -328,6 +386,10 @@ module Linux
   IFA_F_DEPRECATED     = 0x20
   IFA_F_TENTATIVE      = 0x40
   IFA_F_PERMANENT      = 0x80
+  IFA_F_MANAGETEMPADDR = 0x100
+  IFA_F_NOPREFIXROUTE  = 0x200
+  IFA_F_MCAUTOJOIN     = 0x400
+  IFA_F_STABLE_PRIVACY = 0x800
 
   # from linux/if_arp.h - selected subset
   ARPHRD_NETROM    = 0
@@ -389,8 +451,10 @@ module Linux
   NF_INET_NUMHOOKS  = 5
 
   NFPROTO_UNSPEC  = 0
+  NFPROTO_INET    = 1
   NFPROTO_IPV4    = 2
   NFPROTO_ARP    = 3
+  NFPROTO_NETDEV = 5
   NFPROTO_BRIDGE  = 7
   NFPROTO_IPV6    = 10
   NFPROTO_DECNET  = 12

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

netlinkrb.gemspec

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