ether_ping 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/ether_ping

@@ -6,8 +6,8 @@ if ARGV.length < 3
   print <<END_USAGE
 Usage: #{$0} net_interface dest_mac [ether_type] 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)
+  ether_type: packet type for the Ethernet II frame, in hex (2 bytes)
   data: ping packet data, in hex (0-padded to 64 bytes)
 
 Available Ethernet interfaces:
@@ -32,7 +32,18 @@ client = EtherPing::Client.new interface, ether_type, dest_mac
 loop do
   print "Pinging #{dest_mac}... "
   STDOUT.flush
-  puts client.ping(data) ? "OK" : "Failed"
+  result = client.ping data
+  if result
+    if result == true
+      puts "OK"
+    else
+      puts "Failed"
+      puts "Expected:\n#{result.first.unpack('H*').first}"
+      puts "Received:\n#{result.last.unpack('H*').last}"
+    end
+  else
+    puts "Timed out"
+  end
   STDOUT.flush
   sleep 1
 end

data/ether_ping.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ether_ping}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Victor Costan}]
-  s.date = %q{2011-05-27}
+  s.date = %q{2011-05-29}
   s.description = %q{Contains an Ethernet-level ping server and client.}
   s.email = %q{victor@costan.us}
   s.executables = [%q{ether_ping_server}, %q{ether_ping}]

data/lib/ether_ping/client.rb

@@ -18,7 +18,8 @@ class Client
   
   # Pings over raw Ethernet sockets.
   #
-  # Returns true if the ping receives a response, false otherwise.
+  # Returns true if the ping response matches, an array of [expected,
+  # received] strings if it doesn't match, and false if the ping times out.
   def ping(data, timeout = 1)
     data = data.clone
     # Pad data to have at least 64 bytes.
@@ -28,9 +29,17 @@ class Client
     @socket.send ping_packet, 0
 
     response_packet = @source_mac + @dest_mac + @ether_type + data
-    response = @socket.recv response_packet.length * 2
     
-    response == response_packet
+    response = nil
+    begin
+      Timeout.timeout timeout do
+        response = @socket.recv response_packet.length * 2
+      end
+    rescue Timeout::Error
+      response = nil
+    end
+    return false unless response
+    response == response_packet || [response, response_packet]
   end
 end  # module EtherPing::Client
 

data/lib/ether_ping/server.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 require 'ethernet'
 
 # :nodoc: namespace
@@ -7,14 +9,14 @@ module EtherPing
 class Server
   module Connection
     def receive_data(packet)
-      source_mac = packet[0, 6].unpack('H*')
-      dest_mac = packet[6, 6].unpack('H*')
+      dest_mac = packet[0, 6].unpack('H*')
+      source_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.
+      # Exchange the source and destination MAC addresses.
       packet[0, 6], packet[6, 6] = packet[6, 6], packet[0, 6]
       send_data packet
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ether_ping
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 Z
+date: 2011-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime