Merged in another test fix

debian/changelog

@@ -1,24 +1,8 @@
-ruby-linux-netlink (0.18-1+jessie1) stable; urgency=medium
-
-  * Fixed new massive IP test thing to work with ruby1.8 and also non-root users
-  * Make sure link exists before proceeding with test
-  * Scaled back the massive allocation of IPs from 11 /24s to 4.
-  * Updated linux header constants
-  * Updated to 0.18
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Mon, 17 Oct 2016 13:09:35 +0100
-
-ruby-linux-netlink (0.17-1+jessie1) testing; urgency=medium
+ruby-linux-netlink (0.17-1+wheezy1) stable; 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
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 01 Apr 2015 22:44:51 +0100
 
 ruby-linux-netlink (0.16-1+wheezy1) stable; urgency=medium
 

lib/linux/constants.rb

@@ -36,7 +36,6 @@ 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
@@ -54,8 +53,6 @@ module Linux
   NLMSG_DONE		= 0x3
   NLMSG_OVERRUN		= 0x4
 
-  NLMSG_MIN_TYPE = 0x10
-
   NETLINK_ADD_MEMBERSHIP	= 1
   NETLINK_DROP_MEMBERSHIP	= 2
   NETLINK_PKTINFO		= 3
@@ -63,9 +60,6 @@ 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
@@ -77,7 +71,6 @@ 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
@@ -140,12 +133,6 @@ 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
@@ -177,7 +164,6 @@ module Linux
   RTPROT_NTK		= 15
   RTPROT_DHCP		= 16
   RTPROT_MROUTED = 17
-  RTPROT_BABEL = 42
 
   # RT#scope, IFAddr#scope
   RT_SCOPE_UNIVERSE	= 0
@@ -191,7 +177,6 @@ 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
@@ -216,21 +201,11 @@ 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
@@ -249,7 +224,6 @@ module Linux
   RTAX_RTO_MIN		= 13
   RTAX_INITRWND		= 14
   RTAX_QUICKACK   = 15
-  RTAX_CC_ALGO    = 16
 
   # from linux/if_link.h
   IFLA_UNSPEC		= 0
@@ -287,14 +261,6 @@ 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
@@ -309,30 +275,12 @@ 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
@@ -347,16 +295,11 @@ 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 # don't talk to other macvlans
-  MACVLAN_MODE_VEPA  = 2 # talk to other ports through ext bridge
-  MACVLAN_MODE_BRIDGE  = 4 # talk to bridge ports directly
-  MACVLAN_MODE_PASSTHRU  = 8 # take over the underlying device
-  MACVLAN_MODE_SOURCE = 16 # use source MAC address list to assign
+  MACVLAN_MODE_PRIVATE	= 1
+  MACVLAN_MODE_VEPA	= 2
+  MACVLAN_MODE_BRIDGE	= 4
+  MACVLAN_MODE_PASSTHRU	= 8
 
   # TODO: VXLAN and VF stuff is missing here
 
@@ -388,8 +331,6 @@ module Linux
   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
@@ -451,10 +392,8 @@ 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

netlinkrb.gemspec

@@ -5,7 +5,7 @@ $:.unshift lib unless $:.include? lib
 
 Gem::Specification.new do |s|
   s.name = "netlinkrb"
-  s.version = "0.18"
+  s.version = "0.17"
   s.platform = Gem::Platform::RUBY
   s.authors = ["Brian Candler", "Matthew Bloch", "Patrick Cherry", "Alex Young", "Nicholas Thomas"]
   s.email = ["matthew@bytemark.co.uk"]