rethtool 0.0.5 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 7c47e7aabb6cba38c95f794a38efa55219bb47498be9af9704b4f5094deafb29
+  data.tar.gz: f93529f9a47f384d7c627c75f1229bf8c681dc33516d0211f997d0fa8e8b59db
+SHA512:
+  metadata.gz: e9db1ae33db6e52e63e5ccde81734e98fdd56e4121149dd04eb6c438281822b6067bf1bd2d059f293ae5921b1071747441fa2717b7e1850f6d7a5c251f5e28de
+  data.tar.gz: 67583a9ba405c0fc5b8b63db961a1760060aadc76b74f81abf4786e774dac7defee1f884af21079cb22890c94e40bac55f54d0050ca8d184596e5d183639424e

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.gitignore

@@ -0,0 +1,3 @@
+/pkg
+Gemfile.lock
+/.bundle

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Rakefile

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+Bundler::GemHelper.install_tasks
+
+task :default => :test
+
+require 'rdoc/task'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rethtool #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.8

data/lib/rethtool/driver_settings.rb

@@ -0,0 +1,36 @@
+require 'rethtool'
+require 'rethtool/ethtool_cmd'
+
+# Driver settings of a network interface.
+#
+# Create an instance of this class with the interface name as the only
+# parameter, then use the available instance methods to get the info you
+# seek:
+#
+#    if = Rethtool::DriverSettings.new("eth0")
+#    puts "Bus info is #{if.bus_info}"
+#
+class Rethtool::DriverSettings
+
+	# Create a new DriverSettings object.  Simply pass it the name of the
+	# interface you want to get the settings for.
+	def initialize(interface)
+		cmd_driver = Rethtool::EthtoolCmdDriver.new
+		cmd_driver.cmd = Rethtool::ETHTOOL_CMD_GDRVINFO
+		@driver_data = Rethtool.ioctl(interface, cmd_driver)
+	end
+
+	# Returns a string with the value of the interface driver (kernel module).
+	def driver
+		as_str(@driver_data.driver)
+	end
+
+	# Returns a string with the bus information of the interface.
+	def bus_info
+		as_str(@driver_data.bus_info)
+	end
+
+	def as_str(str)
+		str.pack('c*').delete("\000")
+	end
+end

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

data/lib/rethtool/ring_settings.rb

@@ -0,0 +1,69 @@
+require 'rethtool'
+require 'rethtool/ethtool_cmd'
+
+class Rethtool::RingSettings
+	def initialize(interface)
+		@interface = interface
+		cmd = Rethtool::EthtoolCmdRing.new
+		cmd.cmd = Rethtool::ETHTOOL_CMD_GRINGPARAM
+		@data = Rethtool.ioctl(interface, cmd)
+	end
+
+	def rx_max_pending
+		@data.rx_max_pending
+	end
+
+	def rx_mini_max_pending
+		@data.rx_mini_max_pending
+	end
+
+	def rx_jumbo_max_pending
+		@data.rx_jumbo_max_pending
+	end
+
+	def tx_max_pending
+		@data.tx_max_pending
+	end
+
+	def rx_pending
+		@data.rx_pending
+	end
+
+	def rx_mini_pending
+		@data.rx_mini_pending
+	end
+
+	def rx_jumbo_pending
+		@data.rx_jumbo_pending
+	end
+
+	def tx_pending
+		@data.tx_pending
+	end
+
+	def rx_pending=(value)
+		set(:rx_pending, value)
+	end
+
+	def rx_mini_pending=(value)
+		set(:rx_mini_pending, value)
+	end
+
+	def rx_jumbo_pending=(value)
+		set(:rx_jumbo_pending, value)
+	end
+
+	def tx_pending=(value)
+		set(:tx_pending, value)
+	end
+
+private
+
+	def set(what, value)
+    return if @data.send(what) == value
+		cmd = @data.clone
+		cmd.cmd = Rethtool::ETHTOOL_CMD_SRINGPARAM
+		cmd.send(:"#{what}=", value)
+		@data = Rethtool.ioctl(@interface, cmd)
+	end
+end

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/rethtool.gemspec

@@ -0,0 +1,24 @@
+Gem::Specification.new do |s|
+	s.name = "rethtool"
+	s.version = File.read(File.expand_path('../VERSION', __FILE__)).strip
+
+	s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+	s.authors = ["Matt Palmer"]
+	s.date = "2014-01-16"
+	s.email = "theshed+rethtool@hezmatt.org"
+	s.extra_rdoc_files = [
+	  "COPYING",
+	  "README.rdoc"
+	]
+	s.files = `git ls-files`.split("\n")
+	s.homepage = "https://github.com/mpalmer/rethtool"
+	s.licenses = ["GPLv3"]
+	s.require_paths = ["lib"]
+	s.summary = "Partial Ruby wrapper around the SIOCETHTOOL ioctl"
+
+	s.add_runtime_dependency(%q<cstruct>, [">= 0"])
+	s.add_development_dependency(%q<rake>, ["~> 10.0"])
+	s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+	s.add_development_dependency(%q<rdoc>, ["~> 2.4"])
+end
+

data/test/helper.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rethtool'
+
+class Test::Unit::TestCase
+end

data/test/test_rethtool.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestRethtool < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  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.8
 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: 
@@ -83,40 +74,44 @@ extra_rdoc_files:
 - COPYING
 - README.rdoc
 files:
+- ".document"
+- ".gitignore"
 - COPYING
+- Gemfile
 - README.rdoc
+- Rakefile
 - VERSION
 - lib/rethtool.rb
+- lib/rethtool/driver_settings.rb
 - lib/rethtool/ethtool_cmd.rb
 - lib/rethtool/ethtool_value.rb
 - lib/rethtool/interface_settings.rb
 - lib/rethtool/link_status.rb
-homepage: http://theshed.hezmatt.org/rethtool
+- lib/rethtool/ring_settings.rb
+- rethtool.gemspec
+- test/helper.rb
+- test/test_rethtool.rb
+homepage: https://github.com/mpalmer/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: 3.2.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Partial Ruby wrapper around the SIOCETHTOOL ioctl
 test_files: []