emonti-dnet-ffi 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/dnet-ffi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dnet-ffi}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Monti"]
-  s.date = %q{2009-09-13}
+  s.date = %q{2009-09-17}
   s.description = %q{Ruby FFI bindings for the libdnet raw network library}
   s.email = %q{emonti@matasano.com}
   s.extra_rdoc_files = [
@@ -44,6 +44,8 @@ Gem::Specification.new do |s|
      "lib/dnet/typedefs.rb",
      "lib/dnet/udp.rb",
      "lib/dnet/util.rb",
+     "samples/eth_send_raw.rb",
+     "samples/ifconfig-alike.rb",
      "samples/udp_send_raw.rb",
      "spec/addr_spec.rb",
      "spec/arp_spec.rb",

data/lib/dnet/addr.rb

@@ -23,7 +23,8 @@ module Dnet
   class Addr < ::FFI::Struct
     include ::FFI::DRY::StructHelper
 
-    ADDR_TYPES = [ nil, :eth, :ip, :ip6 ] # A mapping of dnet address types
+    # A mapping of dnet address types
+    ADDR_TYPES = [ nil, :link, :inet, :inet6 ] 
 
     # struct addr { ... };
     dsl_layout do
@@ -53,7 +54,8 @@ module Dnet
     # leaves setting :bits up to chance depending on which hash key gets
     # plucked first in set_fields() because of how ip_aton() works under 
     # the hood.
-    def set_fields(params)
+    def set_fields(params=nil)
+      params ||= {}
       if params[:bits] and params[:addr]
         raise( ::ArgumentError, 
            "Don't use :addr and :bits fields together. "+
@@ -66,6 +68,7 @@ module Dnet
     # Looks up this object's 'atype' member against ADDR_TYPES
     # Returns a symbol for the type or nil a type is not found.
     def addr_type; ADDR_TYPES[ self[:atype] ] ; end
+    alias lookup_atype addr_type
 
     # Returns a human-readable network address from self. Uses dnet(3)'s
     # addr_ntoa function under the hood.

data/lib/dnet/eth.rb

@@ -9,21 +9,26 @@ module Dnet
     # struct eth_addr { ... } eth_addr_t;
     dsl_layout{ array :data, [:uchar, ETH_ADDR_LEN] }
 
-    MAC_RX = /^[a-f0-9]{1,2}([:-]?)(?:[a-f0-9]{1,2}\1){4}[a-f0-9]{1,2}$/i
-
     # Adds the ability to initialize a new EthAddr with a mac address
     # string such as 'de:ad:be:ef:ba:be'. This argument is only parsed
     # if it is passed as the only String argument.
     def initialize(*args)
       if args.size == 1 and (s=args[0]).is_a? String
-        raise "bad mac address" unless s =~ MAC_RX
-        raw = ::Dnet::Util.unhexify(s, /[:-]/)
-        super(::FFI::MemoryPointer.from_string(raw))
+        super()
+        self.addr = s
       else
         super(*args)
       end
     end
     
+    def addr=(val)
+      unless val.to_s =~ /^#{Dnet::Util::RX_MAC_ADDR}$/
+        raise(ArgumentError, "invalid mac address #{val.inspect}")
+      end
+      raw = ::Dnet::Util.unhexify(val, /[:-]/)
+      self[:data].to_ptr.write_string(raw, ETH_ADDR_LEN)
+    end
+
     # Returns the MAC address as an array of unsigned char values.
     def chars; self[:data].to_a ; end
 
@@ -42,13 +47,31 @@ module Dnet
       include ::FFI::DRY::StructHelper
       include ::Dnet::NetEndianHelper
       
+      module Etype
+        include ::FFI::DRY::ConstMap
+        slurp_constants ::Dnet, "ETH_TYPE_"
+        def list; @@list ||= super();  end
+      end
+
       dsl_layout do
         struct :dst,   EthAddr, :desc => 'destination address'
         struct :src,   EthAddr, :desc => 'source address'
         field  :etype, :ushort, :desc => 'ethernet payload type'
       end
-    end
 
+      def lookup_etype
+        Etype[ self.etype ]
+      end
+
+      alias _divert_set_eth etype=
+
+      def etype=(val)
+        if val.kind_of? String or val.kind_of? Symbol
+          val = Etype[ val ] or raise(ArgumentError, "invalid eth type #{val}")
+        end
+        _divert_set_eth(val)
+      end
+    end
 
     # Obtains a new handle to transmit raw Ethernet frames via the specified
     # network device.

data/lib/dnet/intf.rb

@@ -53,7 +53,7 @@ module Dnet
         def self.list; @@list ||= super();  end
       end
 
-      def lookup_itype; Flags[self[:itype]]; end
+      def lookup_itype; Itype[self[:itype]]; end
 
       # Returns a newly instantiated and allocated copy of this interface entry
       def copy

data/lib/dnet/ip.rb

@@ -46,11 +46,36 @@ module Dnet
         field :dst,     :uint32,  :desc => 'destination address'
       end
 
+      # Overrides set_fields to supply a default value for the 'v_hl' field.
+      #
+      #   v  = 4
+      #   hl = 5 # number of 32-bit words - 20 bytes (size of hdr without opts)
+      #
       def set_fields(params=nil)
         params ||= {}
         super({:v_hl => 0x45}.merge(params))
       end
 
+      # Sets the value of the hl field. This field is a 4-bit value occupying
+      # the lower 4 bits of the 'v_hl' field.
+      #
+      # This value is the size of the IP header (including opts if present)
+      # in 32-bit words. The byte size maximum is 15*4 - 60 bytes.
+      def hl=(val)
+        raise(ArgumentError, "value for header length too high") if val > 0xf
+        self[:v_hl] &= 0xf0
+        self[:v_hl] += val
+      end
+
+      # Returns the value of the hl field. This field is a 4-bit value occupying
+      # the lower 4 bits of the 'v_hl' field.
+      #
+      # This value is the size of the IP header (including opts if present)
+      # in 32-bit words. The byte size maximum is 15*4 - 60 bytes.
+      def hl
+        self[:v_hl] & 0x0f
+      end
+
       # Type of service (ip_tos), RFC 1349 ("obsoleted by RFC 2474")
       #
       # Contains mappings for all the IP_TOS_[A-Z].* flags constants

data/lib/dnet/util.rb

@@ -2,6 +2,7 @@
 module Dnet
   module Util
     RX_IP4_ADDR = /(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/
+    RX_MAC_ADDR = /(?:(?:[a-f0-9]{1,2}[:-])?{5}[a-f0-9]{1,2})/i
 
     # A number of helper methods which can be used to extend class, instance, 
     # or module
@@ -39,7 +40,7 @@ module Dnet
       
       # takes a IPv4 number and returns it as a 32-bit number
       def ipv4_atol(str)
-        unless str =~ /^#{RX_IP4_ADDR}$/
+        unless str =~ /^#{::Dnet::Util::RX_IP4_ADDR}$/
           raise(::ArgumentError, "invalid IP address #{str.inspect}")
         else
           u32=0

data/samples/eth_send_raw.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+begin ; require 'rubygems'; rescue LoadError ; end
+require 'dnet'
+include Dnet
+
+unless dev=ARGV.shift
+  STDERR.puts "Usage: #{File.basename $0} interface"
+  exit 1
+end
+
+STDERR.puts "Input data via stdin:"
+data = STDIN.read
+
+begin
+  sent = Eth::Handle.open(dev) {|h| h.eth_send(data) }
+rescue Exception => e
+  STDERR.puts "Error: <#{e.class}> - #{e}"
+  STDERR.puts " ** try running as root?" if e.is_a? Dnet::HandleError
+  exit 1
+end
+
+if sent == data.size
+  puts "Sent: #{sent} bytes"
+  exit 0
+else
+  STDERR.puts "Error: expected #{data.size} sent bytes - got #{sent}"
+  exit 1
+end

data/samples/ifconfig-alike.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+begin; require 'rubygems' ; rescue LoadError; end
+require 'dnet'
+
+@arg_if = ARGV.shift
+
+module Dumper
+  def self.dump_if_inet(a)
+    return "#{a.lookup_atype} address: #{a.string} net: #{a.net.string} "+
+           "bcast: #{a.bcast.string}"
+  end
+
+  def self.dump_if_inet6(a)
+    return "#{a.lookup_atype} address: #{a.string} net: #{a.net.string} "
+  end
+
+  def self.dump_if_link(a)
+    return "#{a.lookup_atype} address: #{a.string}"
+  end
+end
+
+Dnet::IntfHandle.each_entry do |entry|
+  next if @arg_if and entry.if_name != @arg_if
+
+  puts("#{entry.if_name}: "+
+       "type=#{entry.lookup_itype.downcase} "+
+       "flags=#{entry.flags}<#{entry.lookup_flags.join(',')}> "+
+       "mtu #{entry.mtu}\n" )
+
+  [:if_addr, :link_addr, :dst_addr].each do |addr_field|
+    addr = entry.send(addr_field)
+    if kind=addr.lookup_atype
+      puts "    " + Dumper.__send__(:"dump_if_#{kind}", addr)
+    end
+  end
+
+  entry.aliases.each do |alias_addr|
+    if kind = alias_addr.lookup_atype
+      puts "    alias: " + Dumper.__send__(:"dump_if_#{kind}", alias_addr)
+    end
+  end
+end
+

data/samples/udp_send_raw.rb

@@ -54,21 +54,17 @@ blob.write(udp_hdr.to_ptr, Udp::Hdr.size)
 blob.write(data)
 
 begin
-  10.times do
-    blob.rewind
-    sent = Ip::Handle.open { |h| h.ip_send(blob.read) }
-    if sent != tot_sz
-      raise "expected #{tot_sz} bytes sent, but got #{sent}"
-    else
-      STDERR.puts "Sent: #{sent} bytes"
-    end
+  blob.rewind
+  sent = Ip::Handle.open { |h| h.ip_send(blob.read) }
+
+  if sent != tot_sz
+    raise "expected #{tot_sz} bytes sent, but got #{sent}"
+  else
+    STDERR.puts "Sent: #{sent} bytes"
   end
-rescue ::Dnet::HandleError => e
-  STDERR.puts "Error: <#{e.class}> - #{e}"
-  STDERR.puts " ** try running as root?"
-  exit 1
 rescue Exception => e
   STDERR.puts "Error: <#{e.class}> - #{e}"
+  STDERR.puts " ** try running as root?" if e.is_a? Dnet::HandleError
   exit 1
 ensure
   blob.release

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emonti-dnet-ffi
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Eric Monti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-13 00:00:00 -07:00
+date: 2009-09-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,8 @@ files:
 - lib/dnet/typedefs.rb
 - lib/dnet/udp.rb
 - lib/dnet/util.rb
+- samples/eth_send_raw.rb
+- samples/ifconfig-alike.rb
 - samples/udp_send_raw.rb
 - spec/addr_spec.rb
 - spec/arp_spec.rb
@@ -76,6 +78,7 @@ files:
 - spec/tun_spec.rb
 has_rdoc: false
 homepage: http://github.com/emonti/dnet-ffi
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -96,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby FFI bindings for libdnet