ether_shell 0.9.0 → 0.9.1

data/Gemfile

@@ -1,13 +1,14 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "activesupport", ">= 2.3.5"
+gem 'ethernet', '>= 0.1.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.5.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem 'rdoc', '>= 3.6.1'
+  gem 'rspec', '~> 2.6.0'
+  gem 'bundler', '~> 1.0.0'
+  gem 'jeweler', '~> 1.5.2'
+  gem 'rcov', '>= 0'
 end

data/Gemfile.lock

@@ -2,27 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
+    ethernet (0.1.1)
+      system-getifaddrs (~> 0.1.1)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+    rake (0.9.0)
     rcov (0.9.9)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rdoc (3.6.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.3)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
+    system-getifaddrs (0.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  ethernet (>= 0.1.0)
   jeweler (~> 1.5.2)
   rcov
-  rspec (~> 2.5.0)
+  rdoc (>= 3.6.1)
+  rspec (~> 2.6.0)

data/README.rdoc

@@ -48,7 +48,11 @@ documetation. You're most likely interested in the spec for ShellDsl.
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+== Author
+
+Victor Costan victor@costan.us
+
 == Copyright
 
-Copyright (c) 2011 Massachusetts Institute of Technology. See LICENSE.txt for
-further details.
+Copyright (c) 2011 Massachusetts Institute of Technology. 
+See LICENSE.txt for further details.

data/Rakefile

@@ -39,7 +39,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/ether_shell.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ether_shell}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Victor Costan"]
-  s.date = %q{2011-03-22}
-  s.default_executable = %q{ether_shell}
+  s.authors = [%q{Victor Costan}]
+  s.date = %q{2011-05-27}
   s.description = %q{IRB session specialized for testing Ethernet devices}
   s.email = %q{victor@costan.us}
-  s.executables = ["ether_shell"]
+  s.executables = [%q{ether_shell}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -32,11 +31,7 @@ Gem::Specification.new do |s|
     "ether_shell.gemspec",
     "lib/ether_shell.rb",
     "lib/ether_shell/expectation_error.rb",
-    "lib/ether_shell/high_socket.rb",
-    "lib/ether_shell/raw_socket.rb",
     "lib/ether_shell/shell_dsl.rb",
-    "spec/ether_shell/high_socket_spec.rb",
-    "spec/ether_shell/raw_socket_spec.rb",
     "spec/ether_shell/shell_dsl_spec.rb",
     "spec/ether_shell_spec.rb",
     "spec/spec_helper.rb",
@@ -44,13 +39,11 @@ Gem::Specification.new do |s|
     "spec/support/shell_stub.rb"
   ]
   s.homepage = %q{http://github.com/pwnall/ether_shell}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.4}
   s.summary = %q{IRB session specialized for testing Ethernet devices}
   s.test_files = [
-    "spec/ether_shell/high_socket_spec.rb",
-    "spec/ether_shell/raw_socket_spec.rb",
     "spec/ether_shell/shell_dsl_spec.rb",
     "spec/ether_shell_spec.rb",
     "spec/spec_helper.rb",
@@ -62,20 +55,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_runtime_dependency(%q<ethernet>, [">= 0.1.0"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.6.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["> 1.2.3"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_dependency(%q<ethernet>, [">= 0.1.0"])
+      s.add_dependency(%q<rdoc>, [">= 3.6.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rspec>, ["> 1.2.3"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+    s.add_dependency(%q<ethernet>, [">= 0.1.0"])
+    s.add_dependency(%q<rdoc>, [">= 3.6.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/ether_shell.rb

@@ -3,6 +3,4 @@ module EtherShell
 end
 
 require 'ether_shell/expectation_error.rb'
-require 'ether_shell/high_socket.rb'
-require 'ether_shell/raw_socket.rb'
 require 'ether_shell/shell_dsl.rb'

data/lib/ether_shell/shell_dsl.rb

@@ -1,3 +1,5 @@
+require 'ethernet'
+
 # :nodoc: namespace
 module EtherShell
 
@@ -15,7 +17,7 @@ module ShellDsl
   def connect(eth_device, ether_type, dest_mac)
     raise "Already connected. did you forget to call disconnect?" if @_socket
     mac_bytes = EtherShell::ShellDsl.parse_mac_data dest_mac
-    @_socket = EtherShell::HighSocket.new eth_device, ether_type
+    @_socket = Ethernet.socket eth_device, ether_type
     @_socket.connect mac_bytes
     if @_verbose
       print ['Connected to ', mac_bytes.unpack('H*').first, ' using ',

data/spec/ether_shell/shell_dsl_spec.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe 'ShellDsl' do
-  let(:eth_device) { 'eth0' }
+  let(:eth_device) { Ethernet::Devices.all.sort.first }
   let(:eth_type) { 0x0800 }
   let(:eth_type_hex) { '0800' }
-  let(:mac) { EtherShell::RawSocket.mac eth_device }
+  let(:mac) { Ethernet::Devices.mac eth_device }
   let(:dest_mac) { "\x00\x11\x22\x33\x44\x55" }
   let(:dest_mac_hex) { '001122334455' }
   let(:bcast_mac) do
@@ -38,7 +38,7 @@ describe 'ShellDsl' do
     end
     
     it 'should not accept a socket again' do
-      raw_socket = EtherShell::HighSocket.new eth_device, eth_type
+      raw_socket = Ethernet.socket eth_device, eth_type
       lambda {
         shell.socket raw_socket
       }.should raise_error(RuntimeError)
@@ -55,7 +55,7 @@ describe 'ShellDsl' do
   
   describe 'connected to a live socket' do
     let(:live_socket) do
-      socket = EtherShell::HighSocket.new eth_device, eth_type
+      socket = Ethernet.socket eth_device, eth_type
       socket.connect bcast_mac
       socket
     end
@@ -90,7 +90,7 @@ describe 'ShellDsl' do
       ])
     end
     let(:stubbed_shell_socket) do
-      socket = EtherShell::HighSocket.new socket_stub, eth_type, mac
+      socket = Ethernet::FrameSocket.new socket_stub, eth_type, mac
       socket.connect dest_mac
       socket
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ether_shell
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,28 +15,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -04:00
-default_executable: ether_shell
+date: 2011-05-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
-        - 2
-        - 5
         - 0
-        version: 2.5.0
-  version_requirements: *id001
-  name: rspec
+        - 1
+        - 0
+        version: 0.1.0
   prerelease: false
+  version_requirements: *id001
+  name: ethernet
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 3
+        - 6
+        - 1
+        version: 3.6.1
+  prerelease: false
+  version_requirements: *id002
+  name: rdoc
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  prerelease: false
+  version_requirements: *id003
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +78,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id002
-  name: bundler
   prerelease: false
+  version_requirements: *id004
+  name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +94,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id003
-  name: jeweler
   prerelease: false
+  version_requirements: *id005
+  name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +108,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: rcov
   prerelease: false
+  version_requirements: *id006
+  name: rcov
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -93,9 +124,9 @@ dependencies:
         - 2
         - 3
         version: 1.2.3
-  version_requirements: *id005
-  name: rspec
   prerelease: false
+  version_requirements: *id007
+  name: rspec
 description: IRB session specialized for testing Ethernet devices
 email: victor@costan.us
 executables: 
@@ -119,17 +150,12 @@ files:
 - ether_shell.gemspec
 - lib/ether_shell.rb
 - lib/ether_shell/expectation_error.rb
-- lib/ether_shell/high_socket.rb
-- lib/ether_shell/raw_socket.rb
 - lib/ether_shell/shell_dsl.rb
-- spec/ether_shell/high_socket_spec.rb
-- spec/ether_shell/raw_socket_spec.rb
 - spec/ether_shell/shell_dsl_spec.rb
 - spec/ether_shell_spec.rb
 - spec/spec_helper.rb
 - spec/support/raw_socket_stub.rb
 - spec/support/shell_stub.rb
-has_rdoc: true
 homepage: http://github.com/pwnall/ether_shell
 licenses: 
 - MIT
@@ -159,13 +185,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: IRB session specialized for testing Ethernet devices
 test_files: 
-- spec/ether_shell/high_socket_spec.rb
-- spec/ether_shell/raw_socket_spec.rb
 - spec/ether_shell/shell_dsl_spec.rb
 - spec/ether_shell_spec.rb
 - spec/spec_helper.rb

data/lib/ether_shell/high_socket.rb

@@ -1,122 +0,0 @@
-# :nodoc: namespace
-module EtherShell
-
-# Wraps an Ethernet socket and abstracts away the Ethernet II frame.
-class HighSocket
-  # Creates a wrapper around a raw Ethernet socket.
-  #
-  # Args:
-  #   raw_socket_or_device:: a raw Ethernet socket or a string containing an
-  #                          Ethernet device name
-  #   ether_type:: 2-byte Ethernet packet type number
-  #   mac_address:: 6-byte MAC address for the Ethernet socket (optional if
-  #                 raw_socket_or_device is an Ethernet device name)
-  #
-  # Raises:
-  #   RuntimeError:: if mac isn't exactly 6-bytes long
-  def initialize(raw_socket_or_device, ether_type, mac_address = nil)
-    check_mac mac_address if mac_address
-    
-    if raw_socket_or_device.respond_to? :to_str
-      @source_mac = mac_address || RawSocket.mac(raw_socket_or_device)
-      @socket = RawSocket.socket raw_socket_or_device, ether_type
-    else
-      raise 'MAC address needed with raw socket' unless mac_address
-      @source_mac = mac_address.dup
-      @socket = raw_socket_or_device
-    end
-    
-    @dest_mac = nil
-    @ether_type = [ether_type].pack('n')
-  end
-
-  # Sets the destination MAC address for future calls to send.
-  #
-  # Args:
-  #   mac:: 6-byte MAC address for the Ethernet socket
-  #
-  # Raises:
-  #   RuntimeError:: if mac isn't exactly 6-bytes long
-  def connect(mac_address)
-    check_mac mac_address
-    @dest_mac = mac_address
-  end
-  
-  # Closes the underlying socket.
-  def close
-    @socket.close
-  end
-  
-  # Sends an Ethernet II frame.
-  #
-  # Args:
-  #   data:: the data bytes to be sent
-  #
-  # Raises:
-  #   RuntimeError:: if connect wasn' previously called
-  def send(data, send_flags = 0)
-    raise "Not connected" unless @dest_mac
-    send_to @dest_mac, data, send_flags
-  end
-  
-  # Sends an Ethernet II frame.
-  #
-  # Args:
-  #   mac_address:: the destination MAC address
-  #   data:: the data bytes to be sent
-  #
-  # Raises:
-  #   RuntimeError:: if connect wasn' previously called
-  def send_to(mac_address, data, send_flags = 0)
-    check_mac mac_address
-
-    padding = (data.length < 46) ? "\0" * (46 - data.length) : ''
-    packet = [mac_address, @source_mac, @ether_type, data, padding].join
-    @socket.send packet, send_flags
-  end
-  
-  # Receives an Ethernet II frame.
-  #
-  # Args:
-  #   buffer_size:: optional maximum packet size argument passed to the raw
-  #                 socket's recv method
-  #
-  # Returns the data and the source MAC address in the frame.
-  #
-  # This will discard incoming frames that don't match the MAC address that the
-  # socket is connected to, or the Ethernet packet type.
-  def recv(buffer_size = 8192)
-    raise "Not connected" unless @dest_mac
-    loop do
-      data, mac_address = recv_from buffer_size
-      return data if @dest_mac == mac_address
-    end
-  end
-  
-  # Receives an Ethernet II frame.
-  #
-  # Args:
-  #   buffer_size:: optional maximum packet size argument passed to the raw
-  #                 socket's recv method
-  #
-  # Returns the data in the frame.
-  #
-  # This will discard incoming frames that don't match the MAC address that the
-  # socket is connected to, or the Ethernet packet type.
-  def recv_from(buffer_size = 8192)
-    loop do
-      packet = @socket.recv buffer_size
-      next unless packet[12, 2] == @ether_type
-      next unless packet[0, 6] == @source_mac
-      return packet[14..-1], packet[6, 6]
-    end
-  end
-  
-  # Raises an exception if the given MAC address is invalid.
-  def check_mac(mac_address)
-    raise "Invalid MAC address" unless mac_address.length == 6
-  end
-  private :check_mac
-end  # class EtherShell::HighSocket
-
-end  # namespace EtherShell

data/lib/ether_shell/raw_socket.rb

@@ -1,102 +0,0 @@
-require 'socket'
-
-# :nodoc: namespace
-module EtherShell
-
-# Low-level socket creation functionality.
-module RawSocket
-  # A raw socket will receive all Ethernet frames, and send raw frames.
-  #
-  # Args:
-  #   eth_device:: device name for the Ethernet card, e.g. 'eth0'
-  #   ether_type:: Ethernet protocol number
-  def self.socket(eth_device = nil, ether_type = nil)
-    ether_type ||= all_ethernet_protocols
-    socket = Socket.new raw_address_family, Socket::SOCK_RAW, htons(ether_type)
-    socket.setsockopt Socket::SOL_SOCKET, Socket::SO_BROADCAST, true
-    set_socket_eth_device(socket, eth_device, ether_type) if eth_device
-    socket
-  end
-  
-  # The MAC address for an Ethernet card.
-  #
-  # Args:
-  #   eth_device:: device name for the Ethernet card, e.g. 'eth0'
-  def self.mac(eth_device)
-    case RUBY_PLATFORM
-    when /linux/
-      # /usr/include/net/if.h, structure ifreq
-      ifreq = [eth_device].pack 'a32'
-      # 0x8927 is SIOCGIFHWADDR in /usr/include/bits/ioctls.h
-      socket.ioctl 0x8927, ifreq
-      ifreq[18, 6]
-    else
-      raise "Unsupported platform #{RUBY_PLATFORM}"
-    end
-  end
-
-  class <<self
-    # Sets the Ethernet interface and protocol type for a socket.
-    def set_socket_eth_device(socket, eth_device, ether_type)
-      case RUBY_PLATFORM
-      when /linux/
-        if_number = get_interface_number eth_device
-        # struct sockaddr_ll in /usr/include/linux/if_packet.h
-        socket_address = [raw_address_family, htons(ether_type), if_number,
-                          0xFFFF, 0, 0, ""].pack 'SSISCCa8'
-        socket.bind socket_address
-      else
-        raise "Unsupported platform #{RUBY_PLATFORM}"
-      end
-      socket
-    end
-    private :set_socket_eth_device
-    
-    # The interface number for an Ethernet interface.
-    def get_interface_number(eth_device)
-      case RUBY_PLATFORM
-      when /linux/
-        # /usr/include/net/if.h, structure ifreq
-        ifreq = [eth_device].pack 'a32'
-        # 0x8933 is SIOCGIFINDEX in /usr/include/bits/ioctls.h
-        socket.ioctl 0x8933, ifreq
-        ifreq[16, 4].unpack('I').first
-      else
-        raise "Unsupported platform #{RUBY_PLATFORM}"
-      end
-    end
-    private :get_interface_number
-    
-    # The protocol number for listening to all ethernet protocols.
-    def all_ethernet_protocols
-      case RUBY_PLATFORM
-      when /linux/
-        3
-      else
-        raise "Unsupported platform #{RUBY_PLATFORM}"
-      end
-    end
-    private :all_ethernet_protocols
-    
-    # The AF / PF number for raw sockets.
-    def raw_address_family
-      case RUBY_PLATFORM
-      when /linux/
-        17  # cat /usr/include/bits/socket.h | grep PF_PACKET
-      when /darwin/
-        18  # cat /usr/include/sys/socket.h | grep AF_LINK
-      else
-        raise "Unsupported platform #{RUBY_PLATFORM}"
-      end
-    end
-    private :raw_address_family
-  
-    # Converts a 16-bit integer from host-order to network-order.
-    def htons(short_integer)
-      [short_integer].pack('n').unpack('S').first
-    end
-    private :htons
-  end
-end  # module EtherShell::RawSocket
-
-end  # namespace EtherShell

data/spec/ether_shell/high_socket_spec.rb

@@ -1,102 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe 'HighSocket' do
-  let(:eth_device) { 'eth0' }
-  let(:eth_type) { 0x0800 }
-  let(:mac) { EtherShell::RawSocket.mac eth_device }
-  let(:dest_mac) { "\x00\x11\x22\x33\x44\x55" }
-  let(:bcast_mac) { "\xff" * 6 }
-  
-  shared_examples_for 'a real socket' do
-    it 'should output a packet' do
-      @socket.send_to dest_mac, "\r\n"
-    end
-
-    it 'should receive some network noise' do
-      @socket.recv_from.first.should_not be_empty
-    end
-  end
-
-  describe 'on eth0' do
-    before { @socket = EtherShell::HighSocket.new eth_device, eth_type }
-    after { @socket.close }
-
-    it_should_behave_like 'a real socket'
-  end
-  
-  describe 'from raw socket' do
-    before do
-      raw_socket = EtherShell::RawSocket.socket eth_device, eth_type
-      @socket = EtherShell::HighSocket.new raw_socket, eth_type, mac
-    end
-    after { @socket.close }
-
-    it_should_behave_like 'a real socket'
-  end
-  
-  describe 'stubbed' do
-    let(:socket_stub) do
-      RawSocketStub.new([
-        [mac, dest_mac, "\x88\xB7", 'Wrong Ethernet type'].join,
-        [bcast_mac, dest_mac, [eth_type].pack('n'), 'Wrong dest MAC'].join,
-        [mac, bcast_mac, [eth_type].pack('n'), 'Bcast'].join,
-        [mac, dest_mac, [eth_type].pack('n'), 'Correct'].join,
-      ])
-    end
-    let(:socket) { EtherShell::HighSocket.new socket_stub, eth_type, mac }
-    
-    shared_examples_for 'after a small send call' do
-      it 'should send a single packet' do
-        socket_stub.sends.length.should == 1
-      end
-      it 'should pad the packet' do
-        socket_stub.sends.first.length.should == 60
-      end
-      it 'should assemble packet correctly in send' do
-        gold = [dest_mac, mac, [eth_type].pack('n'), 'Send data'].join
-        socket_stub.sends.first[0, gold.length].should == gold
-      end
-    end
-    
-    describe 'send_to' do
-      before { socket.send_to dest_mac, 'Send data' }
-      it_should_behave_like 'after a small send call'
-    end
-    
-    describe 'recv_from' do
-      it 'should filter down to the correct packet' do
-        socket.recv_from.should == ['Bcast', bcast_mac]
-      end
-    end
-    
-    describe 'unconnected' do
-      it 'should complain in recv' do
-        lambda { socket.recv }.should raise_error(RuntimeError)
-      end
-
-      it 'should complain in send' do
-        lambda { socket.send 'Send data' }.should raise_error(RuntimeError)
-      end
-    end
-    
-    describe 'connected' do
-      before { socket.connect dest_mac }
-      
-      describe 'send' do
-        before { socket.send 'Send data' }
-        it_should_behave_like 'after a small send call'
-      end
-      
-      describe 'recv' do
-        it 'should filter down to the correct packet' do
-          socket.recv.should == 'Correct'
-        end
-      end
-    end
-    
-    it 'should delegate close' do
-      socket_stub.should_receive(:close).once
-      socket.close
-    end
-  end
-end

data/spec/ether_shell/raw_socket_spec.rb

@@ -1,41 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe 'RawSocket' do
-  let(:eth_device) { 'eth0' }
-  let(:mac) { EtherShell::RawSocket.mac eth_device }
-  
-  describe 'mac' do
-    let(:golden_mac) do
-      hex_mac = `ifconfig #{eth_device}`[/HWaddr .*$/][7..-1]
-      [hex_mac.gsub(':', '').strip].pack('H*')
-    end
-    
-    it 'should have 6 bytes' do
-      mac.length.should == 6
-    end
-    
-    it 'should match ifconfig output' do
-      mac.should == golden_mac
-    end
-  end
-  
-  describe 'socket' do
-    let(:eth_type) { 0x88B7 }
-    
-    before { @socket = EtherShell::RawSocket.socket eth_device }
-    after { @socket.close }
-    
-    it 'should be able to receive data' do
-      @socket.should respond_to(:recv)
-    end
-    
-    it 'should output a packet' do
-      packet = [mac, mac, [eth_type].pack('n'), "\r\n" * 32].join
-      @socket.send packet, 0
-    end
-
-    it 'should receive some network noise' do
-      @socket.recv(8192).should_not be_empty
-    end
-  end
-end