rethtool 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4db6e4f08553fb426f053a306cb165aaa72bdd4b
+  data.tar.gz: 91cc79990c7f9b4c2e74e36ca66886f7c9d8c1a0
+SHA512:
+  metadata.gz: f15308539e56008091de3c06b2f0b54a6fe6d9defdb817249668b6f5b3414fbe4faa1243878994303fcb27c5dfab0c13075d3e6fd5e1b47c75afe735d8e130bc
+  data.tar.gz: 8a7775619bcaaa5075df7cb4757b8d2f5a314b2bd96e1a831154b45115611b0c9fc863c8249674a1f547db9930fa7afb2263309ea669c0a3943ed40f7bfb508c

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/rethtool.rb

@@ -19,8 +19,11 @@ class Rethtool
 	SIOCETHTOOL = 0x8946
 
 	# From /u/i/linux/ethtool.h
-	ETHTOOL_CMD_GLINK = 0x0000000a
-	ETHTOOL_CMD_GSET  = 0x00000001
+	ETHTOOL_CMD_GLINK      = 0x0000000a
+	ETHTOOL_CMD_GSET       = 0x00000001
+	ETHTOOL_CMD_GDRVINFO   = 0x00000003
+	ETHTOOL_CMD_GRINGPARAM = 0x00000010
+	ETHTOOL_CMD_SRINGPARAM = 0x00000011
 
 	class << self
 		# Issue an SIOCETHTOOL ioctl.  ecmd must respond to #data (such
@@ -31,12 +34,11 @@ class Rethtool
 		def ioctl(interface, ecmd)
 			sock = Socket.new(Socket::AF_INET, Socket::SOCK_DGRAM, 0)
 
-			ifreq = [interface, ecmd.data].pack("a16p")
+			rv = ecmd.clone
+			ifreq = [interface, ecmd.data].pack("a16P#{rv.data.length}")
 
 			sock.ioctl(SIOCETHTOOL, ifreq)
 
-			rv = ecmd.class.new
-			rv.data = ifreq.unpack("a16p")[1]
 			rv
 		end
 	end
@@ -44,3 +46,4 @@ end
 
 require 'rethtool/interface_settings'
 require 'rethtool/link_status'
+require 'rethtool/ring_settings'

data/lib/rethtool/ethtool_cmd.rb

@@ -21,3 +21,29 @@ class Rethtool::EthtoolCmd < CStruct
 	uint32 :reserved2
 	uint32 :reserved3
 end
+
+class Rethtool::EthtoolCmdDriver < CStruct
+        uint32 :cmd
+        char   :driver,[32]
+        char   :version,[32]
+        char   :fw_version,[32]
+        char   :bus_info,[32]
+        char   :reserved1,[32]
+        char   :reserved2,[16]
+        uint32 :n_stats
+        uint32 :testinfo_len
+        uint32 :eedump_len
+        uint32 :regdump_len
+end
+
+class Rethtool::EthtoolCmdRing < CStruct
+	uint32 :cmd
+	uint32 :rx_max_pending
+	uint32 :rx_mini_max_pending
+	uint32 :rx_jumbo_max_pending
+	uint32 :tx_max_pending
+	uint32 :rx_pending
+	uint32 :rx_mini_pending
+	uint32 :rx_jumbo_pending
+	uint32 :tx_pending
+end

data/lib/rethtool/interface_settings.rb

@@ -39,9 +39,20 @@ class Rethtool::InterfaceSettings
 		@interface = interface
 		cmd = Rethtool::EthtoolCmd.new
 		cmd.cmd = Rethtool::ETHTOOL_CMD_GSET
-		
 		@data = Rethtool.ioctl(interface, cmd)
+
+		@driver_info = Rethtool::DriverSettings.new(interface)
 	end
+
+        # Returns a string with the value of the interface driver (kernel module).
+        def driver
+		@driver_info.driver
+        end
+
+        # Returns a string with the bus information of the interface.
+        def bus_info
+		@driver_info.bus_info
+        end
 	
 	# Return an array of the modes supported by the interface.  Returns an
 	# array of Mode objects.
@@ -128,11 +139,25 @@ class Rethtool::InterfaceSettings
 			  1 << 17 => Mode.new(1000, :full, 'KX'),
 			  1 << 18 => Mode.new(10000, :full, 'KX4'),
 			  1 << 19 => Mode.new(10000, :full, 'KR'),
-			  1 << 20 => Mode.new(10000, :fec, 'R')
+			  1 << 20 => Mode.new(10000, :fec, 'R'),
+			  1 << 21 => Mode.new(20000, :full, 'MLD2'),
+			  1 << 22 => Mode.new(20000, :full, 'KR2'),
+			  1 << 23 => Mode.new(40000, :full, 'KR4'),
+			  1 << 24 => Mode.new(40000, :full, 'CR4'),
+			  1 << 25 => Mode.new(40000, :full, 'SR4'),
+			  1 << 26 => Mode.new(40000, :full, 'LR4'),
+			  1 << 27 => Mode.new(56000, :full, 'KR4'),
+			  1 << 28 => Mode.new(56000, :full, 'CR4'),
+			  1 << 29 => Mode.new(56000, :full, 'SR4'),
+			  1 << 30 => Mode.new(56000, :full, 'LR4'),
 	}
 
 	# Turn a uint32 of bits into a list of supported modes.  Sigh.
 	def modes(data)
 		PossibleModes.find_all { |m| (m[0] & data) > 0 }.map { |m| m[1] }
 	end
+
+        def as_str(str)
+                str.pack('c*').delete("\000")
+        end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rethtool
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Matt Palmer
@@ -14,65 +13,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cstruct
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 description: 
@@ -94,28 +85,24 @@ files:
 homepage: http://theshed.hezmatt.org/rethtool
 licenses:
 - GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2868922360395750442
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: Partial Ruby wrapper around the SIOCETHTOOL ioctl