nmap-parser 0.3.1 → 0.3.2

data/BUGS

@@ -1,2 +1,4 @@
-If you find any bugs, please report them to me: katterjohn@gmail.com
+If you find any bugs, please report them to me:
+
+	Kris Katterjohn <katterjohn[at]gmail.com>
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007, 2008, 2009 Kris Katterjohn
+Copyright (c) 2007-2009 Kris Katterjohn
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README

@@ -3,7 +3,7 @@
 == Kris Katterjohn                                      katterjohn@gmail.com ==
 ===============================================================================
 
-$Id: README 91 2009-01-01 20:50:08Z kjak $
+$Id: README 126 2009-02-08 15:32:04Z kjak $
 
 
 OVERVIEW
@@ -13,10 +13,11 @@ This library provides a Ruby interface to Nmap's scan data.  It can run Nmap
 and parse its XML output directly from the scan, parse a file containing the
 XML data from a separate scan, parse a String of XML data from a scan, or parse
 XML data from an object via its read() method.  This information is presented
-in an easy-to-use and intuitive fashion for storing and manipulating.
+in an easy-to-use and intuitive fashion for storage and manipulation.
 
-This is not just some Ruby port of Anthony Persaud's Perl Nmap::Parser!  There
-are more classes, many different methods, and blocks are extensively available.
+Keep in mind that this is not just some Ruby port of Anthony Persaud's Perl
+Nmap::Parser!  There are more classes, many different methods, and blocks are
+extensively available.
 
 
 REQUIREMENTS and RECOMMENDATIONS

data/examples/listopentcp.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/ruby
+#
+# Very simple script to print out the open TCP ports for each host
+#
+# Kris Katterjohn 01/27/2009
+
+require 'nmap/parser'
+
+p = Nmap::Parser.parsescan("nmap", "192.168.11.0/24")
+
+p.hosts("up") do |host|
+	puts "#{host.addr}:"
+
+	host.tcp_ports("open") do |port|
+		puts "Got #{port.num}/tcp"
+	end
+
+	puts
+end
+

data/examples/services.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/ruby
+#
+# A really simplistic script which prints out service information for the
+# open TCP and UDP ports found by scanning a host
+#
+# Kris Katterjohn 01/27/2009
+
+require 'nmap/parser'
+
+def printport(port, proto)
+	srv = port.service
+
+	puts
+	puts "Port ##{port.num}/#{proto} is open (#{port.reason})"
+	puts "\tService: #{srv.name}" if srv.name
+	puts "\tProduct: #{srv.product}" if srv.product
+	puts "\tVersion: #{srv.version}" if srv.version
+	puts
+end
+
+p = Nmap::Parser.parsescan("sudo nmap", "-sSUV 192.168.11.1")
+
+p.hosts("up") do |host|
+	puts "#{host.addr}:"
+	host.tcp_ports("open") { |port| printport(port, "tcp") }
+	host.udp_ports("open") { |port| printport(port, "udp") }
+	puts
+end
+

data/lib/nmap/parser.rb

@@ -4,7 +4,7 @@
 #
 # Author: Kris Katterjohn <katterjohn@gmail.com>
 #
-# Copyright (c) 2007, 2008, 2009 Kris Katterjohn
+# Copyright (c) 2007-2009 Kris Katterjohn
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# $Id: parser.rb 92 2009-01-01 21:14:58Z kjak $
+# $Id: parser.rb 129 2009-02-08 17:14:39Z kjak $
 # https://rubynmap.svn.sourceforge.net/svnroot/rubynmap
 
 require 'rexml/document'
@@ -32,7 +32,7 @@ require 'rexml/document'
 begin
 	require 'open3'
 rescue LoadError
-	# We'll resort to IO.popen()
+	# We'll just use IO.popen()
 end
 
 # Just holds the big Parser class.
@@ -47,12 +47,13 @@ This library provides a Ruby interface to Nmap's scan data.  It can run Nmap
 and parse its XML output directly from the scan, parse a file containing the
 XML data from a separate scan, parse a String of XML data from a scan, or parse
 XML data from an object via its read() method.  This information is presented
-in an easy-to-use and intuitive fashion for storing and manipulating.
+in an easy-to-use and intuitive fashion for storage and manipulation.
 
-This is not just some Ruby port of Anthony Persaud's Perl Nmap::Parser!  There
-are more classes, many different methods, and blocks are extensively available.
+Keep in mind that this is not just some Ruby port of Anthony Persaud's Perl
+Nmap::Parser!  There are more classes, many different methods, and blocks are
+extensively available.
 
-The Nmap Security Scanner is a great program written and maintained by
+The Nmap Security Scanner is an awesome program written and maintained by
 Fyodor <fyodor@insecure.org>.  Its main function is port scanning, but it also
 has service and operating system detection, its own scripting engine and a
 whole lot more.  One of its many available output formats is XML, which allows
@@ -88,7 +89,7 @@ is given.
     |
     + Script          <- NSE Script information (both host and port)
     |
-    + Times           <- Timimg information (srtt, etc)
+    + Times           <- Timimg information (round-trip time, etc)
     |
     + Traceroute      <- General Traceroute information
     | |
@@ -104,7 +105,8 @@ is given.
 
 	require 'nmap/parser'
 
-	parser = Nmap::Parser.new(xml) # String of XML data
+	parser = Nmap::Parser.parsestring(xml) # String of XML
+	parser = Nmap::Parser.new(xml) # Same thing
 
 == Reading and Parsing from a File
 
@@ -115,7 +117,7 @@ is given.
 == Reading and Parsing from an Object
 
 This method can read from any object that responds to a read() method that
-returns a String: $stdin is just one example.
+returns a String.
 
 	require 'nmap/parser'
 
@@ -123,7 +125,7 @@ returns a String: $stdin is just one example.
 
 == Scanning and Parsing
 
-This is the only parser method that requires Nmap to be available.
+This is the only Parser method that requires Nmap to be available.
 
 	require 'nmap/parser'
 
@@ -132,48 +134,30 @@ This is the only parser method that requires Nmap to be available.
 == Actually Doing Something
 
 After printing a little session information, this example will cycle
-through all of the up hosts, printing service information on the
-open TCP ports, along with the name and output of any scripts that
-ran (on the host and individual ports).
+through all of the up hosts, printing state and service information on
+the open TCP ports.  See the examples directory that comes with this
+library for more examples.
 
 	puts "Nmap args: #{parser.session.scan_args}"
 	puts "Runtime: #{parser.session.scan_time} seconds"
 	puts
 
 	parser.hosts("up") do |host|
-		puts "** Host #{host.addr} is up **"
+		puts "#{host.addr} is up:"
 		puts
 
 		host.tcp_ports("open") do |port|
 			srv = port.service
 
-			puts "Port ##{port.num} is open (#{port.reason})"
+			puts "Port ##{port.num}/tcp is open (#{port.reason})"
 			puts "\tService: #{srv.name}" if srv.name
 			puts "\tProduct: #{srv.product}" if srv.product
 			puts "\tVersion: #{srv.version}" if srv.version
 			puts
-
-			port.scripts do |script|
-				puts "\tScript Name: #{script.id}"
-				puts "\tScript Output: #{script.output}"
-				puts
-			end
-		end
-
-		if host.scripts.any?
-			puts "Host Scripts Run:"
-			puts
-
-			host.scripts do |script|
-				puts "\tScript Name: #{script.id}"
-				puts "\tScript Output: #{script.output}"
-				puts
-			end
 		end
 
 		puts
 	end
-
 =end
 class Nmap::Parser
 	# Holds the raw XML output from Nmap
@@ -189,36 +173,38 @@ class Nmap::Parser
 	# one is given
 	def self.parseread(obj) # :yields: parser
 		if not obj.respond_to?("read")
-			raise "Object must respond to read()"
+			raise "Passed object must respond to read()"
 		end
 
 		r = obj.read
 
-		if not r.is_a?String
-			raise "read() returned #{r.class} instead of a String"
+		if not r.is_a?(String)
+			raise "Passed object's read() must return a String (got #{r.class})"
 		end
 
-		p = new(r)
-
-		yield p if block_given?
-
-		p
+		new(r) { |p| yield p if block_given? }
 	end
 
-	# Read and parse contents of the Nmap XML file +filename+
+	# Read and parse the contents of the Nmap XML file +filename+
 	#
 	# Returns a new Nmap::Parser object, and passes it to a block if
 	# one is given
 	def self.parsefile(filename) # :yields: parser
 		begin
-			p = parseread(File.open(filename))
+			File.open(filename) { |f|
+				parseread(f) { |p| yield p if block_given? }
+			}
 		rescue
 			raise "Error parsing \"#{filename}\": #{$!}"
 		end
+	end
 
-		yield p if block_given?
-
-		p
+	# Read and parse the String of XML.  Currently an alias for new().
+	#
+	# Returns a new Nmap::Parser object, and passes it to a block if
+	# one is given
+	def self.parsestring(str) # :yields: parser
+		new(str) { |p| yield p if block_given? }
 	end
 
 	# Runs "+nmap+ -d +args+ +targets+"; returns a new Nmap::Parser object,
@@ -316,14 +302,9 @@ class Nmap::Parser
 	#
 	# If an argument is given, only hosts matching +status+ are given
 	def get_ips(status = "") # :yields: host.addr
-		ips = []
+		ips = hosts(status).map { |h| h.addr }
 
-		@hosts.each do |host|
-			if status.empty? or host.status == status
-				ips << host.addr
-				yield host.addr if block_given?
-			end
-		end
+		ips.each { |ip| yield host.addr } if block_given?
 
 		ips
 	end
@@ -336,8 +317,8 @@ class Nmap::Parser
 	private
 
 	def initialize(xml) # :yields: parser
-		if not xml.is_a?String
-			raise "Invalid input: new() should be passed a String"
+		if not xml.is_a?(String)
+			raise "Must be passed a String (got #{xml.class})"
 		end
 
 		parse(xml)
@@ -377,7 +358,7 @@ class Nmap::Parser::Session
 	attr_reader :start_str, :start_time
 	# Ending time
 	attr_reader :stop_str, :stop_time
-	# How long the scan took (in seconds).  Same as stop_time - start_time
+	# Total scan time in seconds (can differ from stop_time - start_time)
 	attr_reader :scan_time
 	# Amount of verbosity (-v) used while scanning
 	attr_reader :verbose
@@ -456,7 +437,7 @@ class Nmap::Parser::Session
 		@stop_str = root.elements['runstats/finished'].attributes['timestr']
 		@stop_time = root.elements['runstats/finished'].attributes['time'].to_i
 
-		@scan_time = @stop_time - @start_time
+		@scan_time = root.elements['runstats/finished'].attributes['elapsed'].to_f
 
 		@verbose = root.elements['verbose'].attributes['level'].to_i
 		@debug = root.elements['debugging'].attributes['level'].to_i
@@ -536,11 +517,7 @@ class Nmap::Parser::Host
 	# Returns an array containing all of the hostnames for this host,
 	# and passes them each to a block if one is given
 	def all_hostnames
-		if block_given?
-			@hostnames.each do |hostname|
-				yield hostname
-			end
-		end
+		@hostnames.each { |hostname| yield hostname } if block_given?
 
 		@hostnames
 	end
@@ -554,12 +531,8 @@ class Nmap::Parser::Host
 
 	# Returns an array of ExtraPorts objects, and passes them each to a
 	# block if one if given
-	def extraports
-		if block_given?
-			@extraports.each do |extraports|
-				yield extraports
-			end
-		end
+	def extraports # :yields: extraports
+		@extraports.each { |e| yield e } if block_given?
 
 		@extraports
 	end
@@ -567,26 +540,25 @@ class Nmap::Parser::Host
 	# Returns the Port object for the TCP port +portnum+, and passes it to
 	# a block if one is given
 	def tcp_port(portnum) # :yields: port
-		yield @tcpPorts[portnum.to_s] if block_given?
-
-		@tcpPorts[portnum.to_s]
+		port = @tcpPorts[portnum.to_i]
+		yield port if block_given?
+		port
 	end
 
 	# Returns an array of Port objects for each TCP port, and passes them
 	# each to a block if one is given
 	#
-	# If an argument is given, only ports matching +state+ are given.
-	# Note:  "open" will also match "open|filtered", but not vice versa.
+	# If an argument is given, only ports matching +state+ are given.  Note
+	# that combinations like "open|filtered" will get matched by "open" and
+	# "filtered"
 	def tcp_ports(state = "")
-		list = @tcpPorts.invert.keys.find_all { |port|
-			state.empty? or port.state >= state
+		list = @tcpPorts.values.find_all { |port|
+			state.empty? or
+			port.state == state or
+			port.state.split(/\|/).include?(state)
 		}.sort
 
-		if block_given?
-			list.each do |port|
-				yield port
-			end
-		end
+		list.each { |port| yield port } if block_given?
 
 		list
 	end
@@ -595,94 +567,79 @@ class Nmap::Parser::Host
 	# if one given
 	#
 	# If an argument is given, only ports matching +state+ are given.
-	# Note:  "open" will also match "open|filtered", but not vice versa.
 	def tcp_port_list(state = "")
-		list = @tcpPorts.invert.keys.map { |port|
-			port.num if state.empty? or port.state >= state
-		}.compact.sort
-
-		if block_given?
-			list.each do |port|
-				yield port
-			end
-		end
-
+		list = tcp_ports(state).map { |p| p.num }
+		list.each { |port| yield port } if block_given?
 		list
 	end
 
 	# Returns the state reason of TCP port +portnum+
 	def tcp_reason(portnum)
-		return nil if @tcpPorts[portnum.to_s].nil?
-
-		@tcpPorts[portnum.to_s].reason
+		port = tcp_port(portnum)
+		return nil if port.nil?
+		port.reason
 	end
 
 	# Returns the Script object for the script +name+ run against the
 	# TCP port +portnum+
 	def tcp_script(portnum, name)
-		return nil if @tcpPorts[portnum.to_s].nil?
-
-		@tcpPorts[portnum.to_s].script(name)
+		port = tcp_port(portnum)
+		return nil if port.nil?
+		port.script(name)
 	end
 
 	# Returns an array of Script objects for each script run on the
 	# TCP port +portnum+, and passes them each to a block if given
-	def tcp_scripts(portnum)
-		return nil if @tcpPorts[portnum.to_s].nil?
-
-		if block_given?
-			@tcpPorts[portnum.to_s].scripts do |script|
-				yield script
-			end
-		end
-
-		@tcpPorts[portnum.to_s].scripts
+	def tcp_scripts(portnum) # :yields: script
+		port = tcp_port(portnum)
+		return nil if port.nil?
+		port.scripts { |s| yield s } if block_given?
+		port.scripts
 	end
 
 	# Returns the output of the script +name+ on the TCP port +portnum+
 	def tcp_script_output(portnum, name)
-		return nil if @tcpPorts[portnum.to_s].nil?
-
-		@tcpPorts[portnum.to_s].script_output(name)
+		port = tcp_port(portnum)
+		return nil if port.nil?
+		port.script_output(name)
 	end
 
 	# Returns a Port::Service object for TCP port +portnum+
 	def tcp_service(portnum)
-		return nil if @tcpPorts[portnum.to_s].nil?
-
-		@tcpPorts[portnum.to_s].service
+		port = tcp_port(portnum)
+		return nil if port.nil?
+		port.service
 	end
 
 	# Returns the state of TCP port +portnum+
 	def tcp_state(portnum)
-		return nil if @tcpPorts[portnum.to_s].nil?
-
-		@tcpPorts[portnum.to_s].state
+		port = tcp_port(portnum)
+		return nil if port.nil?
+		port.state
 	end
 
 	# Returns the Port object for the UDP port +portnum+, and passes it to
 	# a block if one is given
 	def udp_port(portnum) # :yields: port
-		yield @udpPorts[portnum.to_s] if block_given?
-
-		@udpPorts[portnum.to_s]
+		port = @udpPorts[portnum.to_i]
+		yield port if block_given?
+		port
 	end
 
 	# Returns an array of Port objects for each UDP port, and passes them
 	# each to a block if one is given
 	#
-	# If an argument is given, only ports matching +state+ are given.
-	# Note:  "open" will also match "open|filtered", but not vice versa.
+	# If an argument is given, only ports matching +state+ are given.  Note
+	# that combinations like "open|filtered" will get matched by "open" and
+	# "filtered"
 	def udp_ports(state = "")
-		list = @udpPorts.invert.keys.find_all { |port|
-			state.empty? or port.state >= state
+		list = @udpPorts.values.find_all { |port|
+			state.empty? or
+			port.state == state or
+			port.state.split(/\|/).include?(state)
 		}.sort
 
-		if block_given?
-			list.each do |port|
-				yield port
-			end
-		end
+		list.each { |port| yield port } if block_given?
 
 		list
 	end
@@ -691,94 +648,79 @@ class Nmap::Parser::Host
 	# if one is given
 	#
 	# If an argument is given, only ports matching +state+ are given.
-	# Note:  "open" will also match "open|filtered", but not vice versa.
 	def udp_port_list(state = "")
-		list = @udpPorts.invert.keys.map { |port|
-			port.num if state.empty? or port.state >= state
-		}.compact.sort
-
-		if block_given?
-			list.each do |port|
-				yield port
-			end
-		end
-
+		list = udp_ports(state).map { |p| p.num }
+		list.each { |port| yield port } if block_given?
 		list
 	end
 
 	# Returns the state reason of UDP port +portnum+
 	def udp_reason(portnum)
-		return nil if @udpPorts[portnum.to_s].nil?
-
-		@udpPorts[portnum.to_s].reason
+		port = udp_port(portnum)
+		return nil if port.nil?
+		port.reason
 	end
 
 	# Returns the Script object for the script +name+ run against the
 	# UDP port +portnum+
 	def udp_script(portnum, name)
-		return nil if @udpPorts[portnum.to_s].nil?
-
-		@udpPorts[portnum.to_s].script(name)
+		port = udp_port(portnum)
+		return nil if port.nil?
+		port.script(name)
 	end
 
 	# Returns an array of Script objects for each script run on the
 	# UDP port +portnum+, and passes them each to a block if given
-	def udp_scripts(portnum)
-		return nil if @udpPorts[portnum.to_s].nil?
-
-		if block_given?
-			@udpPorts[portnum.to_s].scripts do |script|
-				yield script
-			end
-		end
-
-		@udpPorts[portnum.to_s].scripts
+	def udp_scripts(portnum) # :yields: script
+		port = udp_port(portnum)
+		return nil if port.nil?
+		port.scripts { |s| yield s } if block_given?
+		port.scripts
 	end
 
 	# Returns the output of the script +name+ on the UDP port +portnum+
 	def udp_script_output(portnum, name)
-		return nil if @udpPorts[portnum.to_s].nil?
-
-		@udpPorts[portnum.to_s].script_output(name)
+		port = udp_port(portnum)
+		return nil if port.nil?
+		port.script_output(name)
 	end
 
 	# Returns a Port::Service object for UDP port +portnum+
 	def udp_service(portnum)
-		return nil if @udpPorts[portnum.to_s].nil?
-
-		@udpPorts[portnum.to_s].service
+		port = udp_port(portnum)
+		return nil if port.nil?
+		port.service
 	end
 
 	# Returns the state of UDP port +portnum+
 	def udp_state(portnum)
-		return nil if @udpPorts[portnum.to_s].nil?
-
-		@udpPorts[portnum.to_s].state
+		port = udp_port(portnum)
+		return nil if port.nil?
+		port.state
 	end
 
 	# Returns the Port object for the IP protocol +protonum+, and passes it
 	# to a block if one is given
 	def ip_proto(protonum) # :yields: proto
-		yield @ipProtos[protonum.to_s] if block_given?
-
-		@ipProtos[protonum.to_s]
+		proto = @ipProtos[protonum.to_i]
+		yield proto if block_given?
+		proto
 	end
 
 	# Returns an array of Port objects for each IP protocol, and passes
 	# them each to a block if one is given
 	#
 	# If an argument is given, only protocols matching +state+ are given.
-	# Note:  "open" will also match "open|filtered", but not vice versa.
+	# Note that combinations like "open|filtered" will get matched by
+	# "open" and "filtered"
 	def ip_protos(state = "")
-		list = @ipProtos.invert.keys.find_all { |proto|
-			state.empty? or proto.state >= state
+		list = @ipProtos.values.find_all { |proto|
+			state.empty? or
+			proto.state == state or
+			proto.state.split(/\|/).include?(state)
 		}.sort
 
-		if block_given?
-			list.each do |proto|
-				yield proto
-			end
-		end
+		list.each { |proto| yield proto } if block_given?
 
 		list
 	end
@@ -787,57 +729,42 @@ class Nmap::Parser::Host
 	# block if one given
 	#
 	# If an argument is given, only protocols matching +state+ are given.
-	# Note:  "open" will also match "open|filtered", but not vice versa.
 	def ip_proto_list(state = "")
-		list = @ipProtos.invert.keys.map { |proto|
-			proto.num if state.empty? or proto.state >= state
-		}.compact.sort
-
-		if block_given?
-			list.each do |proto|
-				yield proto
-			end
-		end
-
+		list = ip_protos(state).map { |p| p.num }
+		list.each { |proto| yield proto } if block_given?
 		list
 	end
 
 	# Returns the state reason of IP protocol +protonum+
 	def ip_reason(protonum)
-		return nil if @ipProtos[protonum.to_s].nil?
-
-		@ipProtos[protonum.to_s].reason
+		proto = ip_proto(protonum)
+		return nil if proto.nil?
+		proto.reason
 	end
 
 	# Returns a Port::Service object for IP protocol +protonum+
 	def ip_service(protonum)
-		return nil if @ipProtos[protonum.to_s].nil?
-
-		@ipProtos[protonum.to_s].service
+		proto = ip_proto(protonum)
+		return nil if proto.nil?
+		proto.service
 	end
 
 	# Returns the state of IP protocol +protonum+
 	def ip_state(protonum)
-		return nil if @ipProtos[protonum.to_s].nil?
-
-		@ipProtos[protonum.to_s].state
+		proto = ip_proto(protonum)
+		return nil if proto.nil?
+		proto.state
 	end
 
 	# Returns the Script object for the specified host script +name+
 	def script(name)
-		@scripts.find do |script|
-			script.id == name
-		end
+		@scripts.find { |script| script.id == name }
 	end
 
 	# Returns an array of Script objects for each host script run, and
 	# passes them each to a block if given
 	def scripts
-		if block_given?
-			@scripts.each do |script|
-				yield script
-			end
-		end
+		@scripts.each { |script| yield script } if block_given?
 
 		@scripts
 	end
@@ -857,28 +784,6 @@ class Nmap::Parser::Host
 		parse(hostinfo)
 	end
 
-	# Convert a string like "22-25,80,110-900" into
-	# an array with all the uncondensed elements, e.g.
-	# [ 22, 23, 24, 25, 80, 110, 111 ... ]
-	def parsePortlist(ports)
-		list = []
-
-		# Build array from port specification
-		ports.split(/,/).each do |item|
-			start, stop = item.split(/-/).map { |p| p.to_i }
-
-			start ||= 0
-			stop ||= item.match(/-/) ? 65535 : start
-
-			start, stop = stop, start if stop < start
-
-			start.upto(stop) { |p| list << p }
-		end
-
-		# Sort, and remove dups and invalid ports
-		list.sort.uniq.delete_if { |p| p < 0 or p > 65535 }
-	end
-
 	def parseAddr(elem)
 		case elem.attributes['addrtype']
 		when "mac"
@@ -909,7 +814,7 @@ class Nmap::Parser::Host
 		return nil if ports.nil?
 
 		ports.each_element('port') do |port|
-			num = port.attributes['portid']
+			num = port.attributes['portid'].to_i
 			proto = port.attributes['protocol']
 
 			if proto == "tcp"
@@ -931,9 +836,7 @@ class Nmap::Parser::Host
 			ExtraPorts.new(e)
 		end
 
-		@extraports.sort! do |x, y|
-			x.count <=> y.count
-		end
+		@extraports.sort!
 	end
 
 	def parseScripts(scriptlist)
@@ -1091,19 +994,13 @@ class Nmap::Parser::Host::Port
 
 	# Returns the Script object with the specified +name+
 	def script(name)
-		@scripts.find do |script|
-			script.id == name
-		end
+		@scripts.find { |script| script.id == name }
 	end
 
 	# Returns an array of Script objects associated with this port, and
 	# passes them each to a block if one is given
 	def scripts
-		if block_given?
-			@scripts.each do |script|
-				yield script
-			end
-		end
+		@scripts.each { |script| yield script } if block_given?
 
 		@scripts
 	end
@@ -1160,15 +1057,16 @@ class Nmap::Parser::Host::ExtraPorts
 	# for each set of reasons, and passes them each to a block if one is
 	# given
 	def reasons
-		if block_given?
-			@reasons.each do |reason|
-				yield reason
-			end
-		end
+		@reasons.each { |reason| yield reason } if block_given?
 
 		@reasons
 	end
 
+	# Compares the port counts
+	def <=>(extraports)
+		@count <=> extraports.count
+	end
+
 	private
 
 	def initialize(extraports)
@@ -1199,19 +1097,13 @@ class Nmap::Parser::Host::Traceroute
 
 	# Returns the Hop object for the given TTL
 	def hop(ttl)
-		@hops.find do |h|
-			h.ttl == ttl.to_i
-		end
+		@hops.find { |hop| hop.ttl == ttl.to_i }
 	end
 
 	# Returns an array of Hop objects, which are each a responsive hop,
 	# and passes them each to a block if one if given.
-	def hops() # :yields: hop
-		if block_given?
-			@hops.each do |h|
-				yield h
-			end
-		end
+	def hops
+		@hops.each { |hop| yield hop } if block_given?
 
 		@hops
 	end
@@ -1246,6 +1138,11 @@ class Nmap::Parser::Host::Traceroute::Hop
 	alias host hostname 
 	alias ipaddr addr
 
+	# Compares the TTLs
+	def <=>(hop)
+		@ttl <=> hop.ttl
+	end
+
 	private
 
 	def initialize(hop)
@@ -1337,11 +1234,7 @@ class Nmap::Parser::Host::OS
 	# Returns an array of OSClass objects, and passes them each to a
 	# block if one is given
 	def osclasses
-		if block_given?
-			@osclasses.each do |osclass|
-				yield osclass
-			end
-		end
+		@osclasses.each { |osclass| yield osclass } if block_given?
 
 		@osclasses
 	end
@@ -1349,11 +1242,7 @@ class Nmap::Parser::Host::OS
 	# Returns an array of OSMatch objects, and passes them each to a
 	# block if one is given
 	def osmatches
-		if block_given?
-			@osmatches.each do |osmatch|
-				yield osmatch
-			end
-		end
+		@osmatches.each { |osmatch| yield osmatch } if block_given?
 
 		@osmatches
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nmap-parser
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Kris Katterjohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-01 00:00:00 -06:00
+date: 2009-02-08 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,8 @@ files:
 - LICENSE
 - README
 - lib/nmap/parser.rb
+- examples/listopentcp.rb
+- examples/services.rb
 has_rdoc: true
 homepage: http://rubynmap.sourceforge.net
 post_install_message: