nfnetlink 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e039ab509c97a99fea8c133ac430107da73aca7
-  data.tar.gz: 98f4d8d484e37e5108fa01a21c76dd812c66a23f
+  metadata.gz: 56759251fb9b704112db8a1489cc29f3e652c97a
+  data.tar.gz: b2c3d5c831ee7114c28551a202e4b750de6113d2
 SHA512:
-  metadata.gz: c6aa7996c8ae420235fa6e787ca0b83a0f6190172cfc665411ede0444997bd9e0c4c6ee3d689aa74e421b16cb01d184d41b4a166494064526fad1727db544f58
-  data.tar.gz: bb77c6132f5b1c41a9465e8658c68142a128c2044c2c08b38900360f6d4c23bb20c96f63a441b23a21c759230e8a9fc2d488a5407330df00e0e94a66fa2a5630
+  metadata.gz: 759bce571acea422ec8efd3d48d4f1359190fbdbe2d381fe4a5d0a866455010939b3bd9b8b780719783b966f3fd3d2ca74aeff51a0630ff7a60eb8dbfaa49c83
+  data.tar.gz: 092ad37e73975bf62e6b7a6398009833b1b32cf51753ad059447480e9cc9a30a22bb02a84e2c1355ba70d431aa7275a321645e03b3c4295d99b8608508daa873

data/lib/nfnetlink.rb

@@ -89,6 +89,7 @@ module Netfilter
             @nlif_handle = Netlink.nlif_open
             raise NetlinkError, "nlif_open has failed" if @nlif_handle.null?
 
+            query_table
             ObjectSpace.define_finalizer(self, proc { Netlink.nlif_close(@nlif_handle) })
         end
 
@@ -98,7 +99,7 @@ module Netfilter
         # Returns nil if interface does not exist.
         #
         def [](index)
-            update_table 
+            update_table
             get_iface(index)
         end
 
@@ -107,23 +108,37 @@ module Netfilter
         #
         def each
             update_table
-
-            index = 1
-            loop do
+            for index in 1..65535
                 iface = get_iface(index)
-                break if iface.nil?
+                next if iface.nil?
 
                 yield(iface)
-                index += 1
             end
         end
 
         private
 
         #
-        # Update the internal list of interfaces.
+        # Process netlink events and updates list of interfaces.
         #
         def update_table
+            nlif_fd = Netlink.nlif_fd(@nlif_handle)
+            raise NetlinkError, "nlif_fd has failed" if nlif_fd < 0
+
+            nlif_io = IO.new(nlif_fd)
+            rs, _ws, _es = IO.select([nlif_io], [], [], 0)    
+
+            if rs and rs.length > 0 and rs[0] == nlif_io
+                if Netlink.nlif_catch(@nlif_handle) < 0
+                    raise NetlinkError, "nlif_catch has failed"
+                end
+            end
+        end
+
+        #
+        # Gets the internal list of interfaces.
+        #
+        def query_table 
             if Netlink.nlif_query(@nlif_handle) < 0
                 raise NetlinkError, "nlif_query has failed"
             end
@@ -150,7 +165,8 @@ module Netfilter
                 flags = ifflags.read_bytes(ifflags.total).unpack("I")[0]
                 flags_set = IFFLAGS.select { |bit, name| flags & bit != 0 }.values
 
-                { :name => name, 
+                { :index => index,
+                  :name => name,
                   :flags => flags_set }
             end
         end

data/samples/list_interfaces.rb

@@ -3,5 +3,5 @@
 require 'nfnetlink'
 
 Netfilter::Netlink.interfaces.each do |iface|
-    puts "%12s: %s" % [ iface[:name], iface[:flags].join(", ") ]
+    puts "[%d] %12s: %s" % [ iface[:index], iface[:name], iface[:flags].join(", ") ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nfnetlink
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Guillaume Delugré
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi