packetfu 1.1.0 → 1.1.1

data/examples/arphood.rb

@@ -2,21 +2,24 @@
 
 # A simple local network fingerprinter. Uses the OUI list.
 
+require 'examples'
+require 'packetfu'
+require 'open-uri'
+
 $oui_prefixes = {}
 $arp_results = []
 def build_oui_list
 	if ARGV[0].nil?
-		require 'open-uri'
 		puts "Fetching the oui.txt from IEEE, it'll be a second. Avoid this with #{$0} <filename>."
 	oui_file = open("http://standards.ieee.org/regauth/oui/oui.txt")
 	else
-	oui_file =	File.open(ARGV[0])
+	oui_file =	File.open(ARGV[0], "rb")
 	end
 	oui_file.each do |oui_line|
 		maybe_oui = oui_line.scan(/^[0-9a-f]{2}\-[0-9a-f]{2}\-[0-9a-f]{2}/i)[0]
 		unless maybe_oui.nil?
 			oui_value = maybe_oui
-			oui_vendor = oui_line.split(/\(hex\)\s*/)[1] || "PRIVATE"
+			oui_vendor = oui_line.split(/\(hex\)\s*/n)[1] || "PRIVATE"
 			$oui_prefixes[oui_value] = oui_vendor.chomp
 		end
 	end
@@ -27,24 +30,24 @@ build_oui_list
 $root_ok = true if Process.euid.zero?
 
 def arp_everyone
-	require 'packetfu'
 	my_net = PacketFu::Config.new(PacketFu::Utils.whoami?(:iface => 'wlan0'))
 	threads = []
-	network = "192.168.1"
-	puts "Arping around..."
+	network = "192.168.2"
+	print "Arping around..."
 	253.times do |i|
 		threads[i] = Thread.new do
 			this_host = network + ".#{i+1}"
+			print "." 
 			colon_mac = PacketFu::Utils.arp(this_host,my_net.config)
 			unless colon_mac.nil?
 				hyphen_mac = colon_mac.tr(':','-').upcase[0,8]
 			else
 				hyphen_mac = colon_mac = "NOTHERE"
 			end
-				$arp_results <<  "%s : %s / %s" % [this_host,colon_mac,$oui_prefixes[hyphen_mac]]
+			$arp_results <<  "%s : %s / %s" % [this_host,colon_mac,$oui_prefixes[hyphen_mac]]
 		end
-		threads.join
 	end
+	threads.join
 end
 
 if $root_ok

data/lib/packetfu/packet.rb

@@ -345,7 +345,7 @@ module PacketFu
 				end
 			end
 			table
-			if @headers.last.members.include? :body
+			if @headers.last.members.map {|x| x.to_sym }.include? :body
 				body_part = [:body, self.payload, @headers.last.body.class.name]
 			end
 			table << body_part

data/lib/packetfu/version.rb

@@ -1,7 +1,7 @@
 module PacketFu
 
 	# Check the repo's for version release histories
-	VERSION = "1.1.0" 
+	VERSION = "1.1.1" # Fixes for 1.8 
 
 	# Returns PacketFu::VERSION
 	def self.version

metadata

@@ -2,7 +2,7 @@
 name: packetfu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Tod Beardsley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 -05:00
+date: 2011-06-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency