ethernet 0.1.0 → 0.1.1

data/Gemfile

@@ -9,7 +9,7 @@ gem 'system-getifaddrs', '~> 0.1.1', :platform => :ruby,
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'rdoc', '~> 3.6.1'
+  gem 'rdoc', '>= 3.6.1'
   gem 'rspec', '~> 2.6.0'
   gem 'bundler', '~> 1.0.0'
   gem 'jeweler', '~> 1.6.0'

data/Gemfile.lock

@@ -27,6 +27,6 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.0)
   rcov
-  rdoc (~> 3.6.1)
+  rdoc (>= 3.6.1)
   rspec (~> 2.6.0)
   system-getifaddrs (~> 0.1.1)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ethernet.gemspec

@@ -5,14 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ethernet}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Victor Costan}, %q{HaoQi Li}]
   s.date = %q{2011-05-27}
   s.description = %q{Provides a Socket-like API that bypasses TCP/IP. Useful for exotic devices and FPGA development.}
   s.email = %q{victor@costan.us}
-  s.executables = [%q{ethernet_ping}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -27,12 +26,10 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "bin/ethernet_ping",
     "ethernet.gemspec",
     "lib/ethernet.rb",
     "lib/ethernet/devices.rb",
     "lib/ethernet/frame_socket.rb",
-    "lib/ethernet/ping.rb",
     "lib/ethernet/provisioning.rb",
     "lib/ethernet/raw_socket_factory.rb",
     "spec/ethernet/devices_spec.rb",
@@ -54,14 +51,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<system-getifaddrs>, ["~> 0.1.1"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.6.1"])
+      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.6.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<system-getifaddrs>, ["~> 0.1.1"])
-      s.add_dependency(%q<rdoc>, ["~> 3.6.1"])
+      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.6.0"])
@@ -69,7 +66,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<system-getifaddrs>, ["~> 0.1.1"])
-    s.add_dependency(%q<rdoc>, ["~> 3.6.1"])
+    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.6.0"])

data/lib/ethernet.rb

@@ -42,7 +42,3 @@ require 'ethernet/devices.rb'
 require 'ethernet/frame_socket.rb'
 require 'ethernet/provisioning.rb'
 require 'ethernet/raw_socket_factory.rb'
-
-
-# TODO(pwnall): move to separate gem
-require 'ethernet/ping.rb'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ethernet
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Victor Costan
@@ -39,7 +39,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 29
         segments: 
@@ -114,8 +114,8 @@ dependencies:
   name: rcov
 description: Provides a Socket-like API that bypasses TCP/IP. Useful for exotic devices and FPGA development.
 email: victor@costan.us
-executables: 
-- ethernet_ping
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -131,12 +131,10 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/ethernet_ping
 - ethernet.gemspec
 - lib/ethernet.rb
 - lib/ethernet/devices.rb
 - lib/ethernet/frame_socket.rb
-- lib/ethernet/ping.rb
 - lib/ethernet/provisioning.rb
 - lib/ethernet/raw_socket_factory.rb
 - spec/ethernet/devices_spec.rb

data/bin/ethernet_ping

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'ethernet' #'scratchpad'
-
-if ARGV.length < 4
-  print <<END_USAGE
-Usage: #{$0} net_interface ether_type dest_mac data
-  net_interface: name of the Ethernet interface, e.g. eth0
-  ether_type: packet type for the Ethernet II frame, in hex (2 bytes)
-  dest_mac: destination MAC for the ping packets, in hex (6 bytes)
-  data: ping packet data, in hex (0-padded to 64 bytes)
-END_USAGE
-  exit 1
-end
- 
-interface = ARGV[0]
-ether_type = [ARGV[1]].pack('H*').unpack('n').first
-dest_mac = ARGV[2]
-data = [ARGV[3]].pack('H*')
-
-#client = Scratchpad::Ethernet::PingClient.new interface, ether_type, dest_mac
-client = Ethernet::PingClient.new interface, ether_type, dest_mac
-
-loop do
-  print "Pinging #{dest_mac}... "
-  STDOUT.flush
-  puts client.ping(data) ? "OK" : "Failed"
-  STDOUT.flush
-  sleep 1
-end

data/lib/ethernet/ping.rb

@@ -1,89 +0,0 @@
-# TODO(pwnall): move to separate gem
-
-
-# copied from victor's scratchpad/lib/scratchpad/ethernet/ping.rb
-# changes see raw_socket.rb
-# :%s/if_name/eth_device/g
-# .get_interface_mac() --> .mac()
-# Ethernet.socket --> Ethernet::RawSocket.socket
-# Ethernet.mac --> Ethernet::RawSocket.mac
-
-# :nodoc: namespace # module Scratchpad
-
-# :nodoc: namespace
-module Ethernet
-
-# Responder for ping utility using raw Ethernet sockets.
-class PingServer
-  module Connection
-    def receive_data(packet)
-      source_mac = packet[0, 6].unpack('H*')
-      dest_mac = packet[6, 6].unpack('H*')
-      ether_type = packet[12, 2].unpack('H*')
-      
-      puts "Src: #{source_mac} Dst: #{dest_mac} Eth: #{ether_type}\n"
-      puts packet[14..-1].unpack('H*')
-      
-      # Exchange the source and destination ARP addresses.
-      packet[0, 6], packet[6, 6] = packet[6, 6], packet[0, 6]
-      send_data packet
-    end
-  end
-
-  class ConnectionWrapper
-    include Connection
-    
-    def initialize(socket)
-      @socket = socket
-    end
-    
-    def send_data(data)
-      @socket.send data, 0
-    end
-  end
-  
-  def run
-    connection = ConnectionWrapper.new @socket
-    loop do
-      packet = @socket.recv 65536
-      connection.receive_data packet
-    end
-  end
-  
-  def initialize(eth_device, ether_type)
-    @socket = Ethernet::RawSocket.socket eth_device, ether_type
-  end
-end  # module Ethernet::PingServer
-  
-# Ping utility 
-class PingClient
-  def initialize(eth_device, ether_type, destination_mac)
-    @socket = Ethernet::RawSocket.socket eth_device, ether_type
-    @source_mac = [Ethernet::RawSocket.mac(eth_device).unpack('H*').first].pack('H*')[0, 6]
-    @dest_mac = [destination_mac].pack('H*')[0, 6]
-    @ether_type = [ether_type].pack('n')    
-  end
-  
-  attr_reader :socket
-  attr_reader :source_mac
-  attr_reader :dest_mac
-  
-  # Pings over raw Ethernet sockets.
-  #
-  # Returns true if the ping receives a response, false otherwise.
-  def ping(data, timeout = 1)
-    data = data.clone
-    # Pad data to have at least 64 bytes.
-    data += "\0" * (64 - data.length) if data.length < 64
- 
-    ping_packet = @dest_mac + @source_mac + @ether_type + data
-    @socket.send ping_packet, 0
-
-    response_packet = @source_mac + @dest_mac + @ether_type + data
-    response = @socket.recv response_packet.length * 2
-    
-    response == response_packet
-  end
-end  # module Ethernet::PingClient
-
-end  # namespace Ethernet