Added tag 0.14 for changeset b75625aab29e

.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,49 +0,0 @@
-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

@@ -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
@@ -290,7 +329,7 @@ module Linux
   IFA_F_TENTATIVE	= 0x40
   IFA_F_PERMANENT	= 0x80
 
-  # from linux/if_arp.h
+  # from linux/if_arp.h - selected subset
   ARPHRD_NETROM		= 0
   ARPHRD_ETHER		= 1
   ARPHRD_EETHER		= 2

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