packetfu 1.1.1 → 1.1.2

data/lib/packetfu/protos/hsrp.rb

@@ -1,206 +0,0 @@
-module PacketFu
-
-	# HSRPHeader is a complete HSRP struct, used in HSRPPacket. HSRP is typically used for
-	# fault-tolerant default gateway in IP routing environment.
-	#
-	# For more on HSRP packets, see http://www.networksorcery.com/enp/protocol/hsrp.htm
-	#
-	# Submitted by fropert@packetfault.org. Thanks, Francois!
-	#
-	# ==== Header Definition
-	#
-	#   Int8    :hsrp_version      Default: 0     # Version
-	#   Int8    :hsrp_opcode                      # Opcode
-	#   Int8    :hsrp_state                       # State
-	#   Int8    :hsrp_hellotime    Default: 3     # Hello Time
-	#   Int8    :hsrp_holdtime     Default: 10    # Hold Time
-	#   Int8    :hsrp_priority                    # Priority
-	#   Int8    :hsrp_group                       # Group
-	#   Int8    :hsrp_reserved     Default: 0     # Reserved
-	#   String  :hsrp_password                    # Authentication Data
-	#   Octets  :hsrp_vip                         # Virtual IP Address
-	#   String  :body
-	class HSRPHeader < Struct.new(:hsrp_version, :hsrp_opcode, :hsrp_state,
-								  :hsrp_hellotime, :hsrp_holdtime,
-								  :hsrp_priority, :hsrp_group,
-								  :hsrp_reserved, :hsrp_password,
-								  :hsrp_vip, :body)
-
-		include StructFu
-
-		def initialize(args={})
-			super(
-				Int8.new(args[:hsrp_version] || 0),
-				Int8.new(args[:hsrp_opcode]),
-				Int8.new(args[:hsrp_state]),
-				Int8.new(args[:hsrp_hellotime] || 3),
-				Int8.new(args[:hsrp_holdtime] || 10),
-				Int8.new(args[:hsrp_priority]),
-				Int8.new(args[:hsrp_group]),
-				Int8.new(args[:hsrp_reserved] || 0),
-				StructFu::String.new.read(args[:hsrp_password] || "cisco\x00\x00\x00"),
-				Octets.new.read(args[:hsrp_vip] || ("\x00" * 4)),
-				StructFu::String.new.read(args[:body])
-			)
-		end
-
-		# Returns the object in string form.
-		def to_s
-			self.to_a.map {|x| x.to_s}.join
-		end
-
-		# Reads a string to populate the object.
-		def read(str)
-			force_binary(str)
-			return self if str.nil?
-			self[:hsrp_version].read(str[0,1])
-			self[:hsrp_opcode].read(str[1,1])
-			self[:hsrp_state].read(str[2,1])
-			self[:hsrp_hellotime].read(str[3,1])
-			self[:hsrp_holdtime].read(str[4,1])
-			self[:hsrp_priority].read(str[5,1])
-			self[:hsrp_group].read(str[6,1])
-			self[:hsrp_reserved].read(str[7,1])
-			self[:hsrp_password].read(str[8,8])
-			self[:hsrp_vip].read(str[16,4])
-			self[:body].read(str[20,str.size]) if str.size > 20
-			self
-		end
-
-		# Setter for the type.
-		def hsrp_version=(i); typecast i; end
-		# Getter for the type.
-		def hsrp_version; self[:hsrp_version].to_i; end
-		# Setter for the type.
-		def hsrp_opcode=(i); typecast i; end
-		# Getter for the type.
-		def hsrp_opcode; self[:hsrp_opcode].to_i; end
-		# Setter for the type.
-		def hsrp_state=(i); typecast i; end
-		# Getter for the type.
-		def hsrp_state; self[:hsrp_state].to_i; end
-		# Setter for the type.
-		def hsrp_hellotime=(i); typecast i; end
-		# Getter for the type.
-		def hsrp_hellotime; self[:hsrp_hellotime].to_i; end
-		# Setter for the type.
-		def hsrp_holdtime=(i); typecast i; end
-		# Getter for the type.
-		def hsrp_holdtime; self[:hsrp_holdtime].to_i; end
-		# Setter for the type.
-		def hsrp_priority=(i); typecast i; end
-		# Getter for the type.
-		def hsrp_priority; self[:hsrp_priority].to_i; end
-		# Setter for the type.
-		def hsrp_group=(i); typecast i; end
-		# Getter for the type.
-		def hsrp_group; self[:hsrp_group].to_i; end
-		# Setter for the type.
-		def hsrp_reserved=(i); typecast i; end
-		# Getter for the type.
-		def hsrp_reserved; self[:hsrp_reserved].to_i; end
-
-		def hsrp_addr=(addr)
-			self[:hsrp_vip].read_quad(addr)
-		end
-
-		# Returns a more readable IP source address.
-		def hsrp_addr
-			self[:hsrp_vip].to_x
-		end
-
-		# Readability aliases
-
-		alias :hsrp_vip_readable :hsrp_addr
-
-		def hsrp_password_readable
-			hsrp_password.to_s.inspect
-		end
-
-	end
-
-	# HSRPPacket is used to construct HSRP Packets. They contain an EthHeader, an IPHeader, and a UDPHeader.
-	#
-	# == Example
-	#
-	#  hsrp_pkt.new
-	#  hsrp_pkt.hsrp_opcode = 0
-	#  hsrp_pkt.hsrp_state = 16
-	#  hsrp_pkt.hsrp_priority = 254
-	#  hsrp_pkt.hsrp_group = 1
-	#  hsrp_pkt.hsrp_vip = 10.100.100.254
-	#  hsrp_pkt.recalc
-	#  hsrp_pkt.to_f('/tmp/hsrp.pcap')
-	#
-	# == Parameters
-	#
-	#  :eth
-	#   A pre-generated EthHeader object.
-	#  :ip
-	#   A pre-generated IPHeader object.
-	#  :udp
-	#   A pre-generated UDPHeader object.
-	#  :flavor
-	#   TODO: HSRP packets don't tend have any flavor.
-	#  :config
-	#   A hash of return address details, often the output of Utils.whoami?
-	class HSRPPacket < Packet
-
-		attr_accessor :eth_header, :ip_header, :udp_header, :hsrp_header
-
-		def self.can_parse?(str)
-			return false unless str.size >= 54
-			return false unless EthPacket.can_parse? str
-			return false unless IPPacket.can_parse? str
-			return false unless UDPPacket.can_parse? str
-			temp_packet = UDPPacket.new
-			temp_packet.read(str)
-			if temp_packet.ip_ttl == 1 and [temp_packet.udp_sport,temp_packet.udp_dport] == [1985,1985] 
-				return true
-			else 
-				return false
-			end
-		end
-
-		def read(str=nil, args={})
-			raise "Cannot parse `#{str}'" unless self.class.can_parse?(str)
-			@eth_header.read(str)
-			@ip_header.read(str[14,str.size])
-			@eth_header.body = @ip_header
-			@udp_header.read(str[14+(@ip_header.ip_hlen),str.size])
-			@ip_header.body = @udp_header
-			@hsrp_header.read(str[14+(@ip_header.ip_hlen)+8,str.size])
-			@udp_header.body = @hsrp_header
-			super(args)
-			self
-		end
-
-		def initialize(args={})
-			@eth_header = EthHeader.new(args).read(args[:eth])
-			@ip_header = IPHeader.new(args).read(args[:ip])
-			@ip_header.ip_proto = 0x11
-			@udp_header = UDPHeader.new(args).read(args[:udp])
-			@hsrp_header = HSRPHeader.new(args).read(args[:hsrp])
-			@udp_header.body = @hsrp_header
-			@ip_header.body = @udp_header
-			@eth_header.body = @ip_header
-			@headers = [@eth_header, @ip_header, @udp_header, @hsrp_header]
-			super
-		end
-
-		# Peek provides summary data on packet contents.
-		def peek_format
-			peek_data = ["UH "]
-			peek_data << "%-5d" % self.to_s.size
-			peek_data << "%-16s" % self.hsrp_addr
-			peek_data << "%-4d" % self.hsrp_group
-			peek_data << "%-35s" % self.hsrp_password_readable
-			peek_data << "%-15s" % self.ip_saddr
-			peek_data.join
-		end
-
-	end
-
-end
-
-# vim: nowrap sw=2 sts=0 ts=2 ff=unix ft=ruby

data/lib/packetfu/protos/icmp.rb

@@ -1,179 +0,0 @@
-module PacketFu
-
-	# ICMPHeader is a complete ICMP struct, used in ICMPPacket. ICMP is 
-	# typically used for network administration and connectivity testing.
-	#
-	# For more on ICMP packets, see 
-	# http://www.networksorcery.com/enp/protocol/icmp.htm
-	# 
-	# ==== Header Definition
-	#
-	#   Int8    :icmp_type                        # Type
-	#   Int8    :icmp_code                        # Code
-	#   Int16   :icmp_sum    Default: calculated  # Checksum
-	#   String  :body
-	class ICMPHeader < Struct.new(:icmp_type, :icmp_code, :icmp_sum, :body)
-
-		include StructFu
-
-		def initialize(args={})
-			super(
-				Int8.new(args[:icmp_type]),
-				Int8.new(args[:icmp_code]),
-				Int16.new(args[:icmp_sum] || icmp_calc_sum),
-				StructFu::String.new.read(args[:body])
-			)
-		end
-
-		# Returns the object in string form.
-		def to_s
-			self.to_a.map {|x| x.to_s}.join
-		end
-
-		# Reads a string to populate the object.
-		def read(str)
-			force_binary(str)
-			return self if str.nil?
-			self[:icmp_type].read(str[0,1])
-			self[:icmp_code].read(str[1,1])
-			self[:icmp_sum].read(str[2,2])
-			self[:body].read(str[4,str.size])
-			self
-		end
-
-		# Setter for the type.
-		def icmp_type=(i); typecast i; end
-		# Getter for the type.
-		def icmp_type; self[:icmp_type].to_i; end
-		# Setter for the code.
-		def icmp_code=(i); typecast i; end
-		# Getter for the code.
-		def icmp_code; self[:icmp_code].to_i; end
-		# Setter for the checksum. Note, this is calculated automatically with 
-		# icmp_calc_sum.
-		def icmp_sum=(i); typecast i; end
-		# Getter for the checksum.
-		def icmp_sum; self[:icmp_sum].to_i; end
-
-		# Calculates and sets the checksum for the object.
-		def icmp_calc_sum
-			checksum = (icmp_type.to_i << 8)	+ icmp_code.to_i
-			chk_body = (body.to_s.size % 2 == 0 ? body.to_s : body.to_s + "\x00")
-			if 1.respond_to? :ord
-				chk_body.scan(/../).map { |x| (x[0].ord << 8) + x[1].ord }.each { |y| checksum += y }
-			else
-				chk_body.scan(/../).map { |x| (x[0] << 8) + x[1] }.each { |y| checksum += y }
-			end
-			checksum = checksum % 0xffff
-			checksum = 0xffff - checksum
-			checksum == 0 ? 0xffff : checksum
-		end
-		
-		# Recalculates the calculatable fields for ICMP.
-		def icmp_recalc(arg=:all)
-			# How silly is this, you can't intern a symbol in ruby 1.8.7pl72?
-			# I'm this close to monkey patching Symbol so you can force it...
-			arg = arg.intern if arg.respond_to? :intern
-			case arg
-			when :icmp_sum
-				self.icmp_sum=icmp_calc_sum
-			when :all
-				self.icmp_sum=icmp_calc_sum
-			else
-				raise ArgumentError, "No such field `#{arg}'"
-			end
-		end
-
-		# Readability aliases
-
-		def icmp_sum_readable
-			"0x%04x" % icmp_sum
-		end
-
-	end
-
-	# ICMPPacket is used to construct ICMP Packets. They contain an EthHeader, an IPHeader, and a ICMPHeader.
-	#
-	# == Example
-	#
-	#  icmp_pkt.new
-	#  icmp_pkt.icmp_type = 8
-	#  icmp_pkt.icmp_code = 0
-	#  icmp_pkt.payload = "ABC, easy as 123. As simple as do-re-mi. ABC, 123, baby, you and me!"
-	#
-	#  icmp_pkt.ip_saddr="1.2.3.4"
-	#  icmp_pkt.ip_daddr="5.6.7.8"
-	#
-	#  icmp_pkt.recalc	
-	#  icmp_pkt.to_f('/tmp/icmp.pcap')
-	#
-	# == Parameters
-	#
-	#  :eth
-	#   A pre-generated EthHeader object.
-	#  :ip
-	#   A pre-generated IPHeader object.
-	#  :flavor
-	#   TODO: Sets the "flavor" of the ICMP packet. Pings, in particular, often betray their true
-	#   OS.
-	#  :config
-	#   A hash of return address details, often the output of Utils.whoami?
-	class ICMPPacket < Packet
-
-		attr_accessor :eth_header, :ip_header, :icmp_header
-
-		def self.can_parse?(str)
-			return false unless str.size >= 54
-			return false unless EthPacket.can_parse? str
-			return false unless IPPacket.can_parse? str
-			return false unless str[23,1] == "\x01"
-			return true
-		end
-
-		def read(str=nil, args={})
-			raise "Cannot parse `#{str}'" unless self.class.can_parse?(str)
-			@eth_header.read(str)
-			@ip_header.read(str[14,str.size])
-			@eth_header.body = @ip_header
-			@icmp_header.read(str[14+(@ip_header.ip_hlen),str.size])
-			@ip_header.body = @icmp_header
-			super(args)
-			self
-		end
-
-		def initialize(args={})
-			@eth_header = EthHeader.new(args).read(args[:eth])
-			@ip_header = IPHeader.new(args).read(args[:ip])
-			@ip_header.ip_proto = 1
-			@icmp_header = ICMPHeader.new(args).read(args[:icmp])
-
-			@ip_header.body = @icmp_header
-			@eth_header.body = @ip_header
-
-			@headers = [@eth_header, @ip_header, @icmp_header]
-			super
-		end
-
-		# Peek provides summary data on packet contents.
-		def peek_format
-			peek_data = ["IC "] # I is taken by IP
-			peek_data << "%-5d" % self.to_s.size
-			type = case self.icmp_type.to_i
-						 when 8
-							 "ping"
-						 when 0
-							 "pong"
-						 else
-							 "%02x-%02x" % [self.icmp_type, self.icmp_code]
-						 end
-			peek_data << "%-21s" % "#{self.ip_saddr}:#{type}"
-			peek_data << "->"
-			peek_data << "%21s" % "#{self.ip_daddr}"
-			peek_data << "%23s" % "I:"
-			peek_data << "%04x" % self.ip_id
-			peek_data.join
-		end
-
-	end
-
-end

data/lib/packetfu/protos/invalid.rb

@@ -1,55 +0,0 @@
-module PacketFu
-
-	# InvalidHeader catches all packets that we don't already have a Struct for,
-	# or for whatever reason, violates some basic packet rules for other packet 
-	# types.
-	class InvalidHeader < Struct.new(:body)
-		include StructFu
-
-		def initialize(args={})
-			args[:body] ||= StructFu::String.new
-			super(args[:body])
-		end
-
-		# Returns the object in string form.
-		def to_s
-			self.to_a.map {|x| x.to_s}.join
-		end
-
-		# Reads a string to populate the object.
-		def read(str)
-			force_binary(str)
-			return self if str.nil?
-			self[:body].read str
-			self
-		end
-
-	end
-
-	# You probably don't want to write invalid packets on purpose.
-	class	InvalidPacket < Packet
-		attr_accessor :invalid_header
-
-		# Any packet is potentially an invalid packet
-		def self.can_parse?(str)
-			true
-		end
-
-		def self.layer
-			0
-		end
-
-		def read(str=nil,args={})
-			@invalid_header.read(str)
-			self
-		end
-
-		def initialize(args={})
-			@invalid_header = 	(args[:invalid] || InvalidHeader.new)
-			@headers = [@invalid_header]
-		end
-	end
-
-end # module PacketFu
-
-# vim: nowrap sw=2 sts=0 ts=2 ff=unix ft=ruby

data/lib/packetfu/protos/ip.rb

@@ -1,378 +0,0 @@
-require 'ipaddr'
-module PacketFu
-
-	# Octets implements the addressing scheme for IP.
-	#
-	# ==== Header Definition
-	#
-	#  Int8 :o1
-	#  Int8 :o2
-	#  Int8 :o3
-	#  Int8 :o4
-	class Octets < Struct.new(:o1, :o2, :o3, :o4)
-		include StructFu
-
-		def initialize(args={})
-			super(
-			Int8.new(args[:o1]),
-			Int8.new(args[:o2]),
-			Int8.new(args[:o3]),
-			Int8.new(args[:o4]))
-		end
-
-		# Returns the object in string form.
-		def to_s
-			self.to_a.map {|x| x.to_s}.join
-		end
-
-		# Reads a string to populate the object.
-		def read(str)
-			force_binary(str)
-			return self if str.nil?
-			self[:o1].read str[0,1]
-			self[:o2].read str[1,1]
-			self[:o3].read str[2,1]
-			self[:o4].read str[3,1]
-			self
-		end
-
-		# Returns an address in dotted-quad format.
-		def to_x
-			ip_str = [o1, o2, o3, o4].map {|x| x.to_i.to_s}.join('.')
-			IPAddr.new(ip_str).to_s
-		end
-
-		# Returns an address in numerical format.
-		def to_i
-			ip_str = [o1, o2, o3, o4].map {|x| x.to_i.to_s}.join('.')
-			IPAddr.new(ip_str).to_i
-		end
-
-		# Set the IP Address by reading a dotted-quad address.
-		def read_quad(str)
-			read([IPAddr.new(str).to_i].pack("N"))
-		end
-
-	end
-
-	# IPHeader is a complete IP struct, used in IPPacket. Most traffic on most networks today is IP-based.
-	#
-	# For more on IP packets, see http://www.networksorcery.com/enp/protocol/ip.htm
-	#
-	# ==== Header Definition
-	#
-	#   Fixnum (4 bits)  :ip_v,     Default: 4
-	#   Fixnum (4 bits)  :ip_hl,    Default: 5
-	#   Int8             :ip_tos,   Default: 0           # TODO: Break out the bits
-	#   Int16            :ip_len,   Default: calculated 
-	#   Int16            :ip_id,    Default: calculated  # IRL, hardly random. 
-	#   Int16            :ip_frag,  Default: 0           # TODO: Break out the bits
-	#   Int8             :ip_ttl,   Default: 0xff        # Changes per flavor
-	#   Int8             :ip_proto, Default: 0x01        # TCP: 0x06, UDP 0x11, ICMP 0x01
-	#   Int16            :ip_sum,   Default: calculated 
-	#   Octets           :ip_src                       
-	#   Octets           :ip_dst                      
-	#   String           :body
-	#
-	# Note that IPPackets will always be somewhat incorrect upon initalization, 
-	# and want an IPHeader#recalc() to become correct before a 
-	# Packet#to_f or Packet#to_w.
-	class IPHeader < Struct.new(:ip_v, :ip_hl, :ip_tos, :ip_len,
-															:ip_id, :ip_frag, :ip_ttl, :ip_proto,
-															:ip_sum, :ip_src, :ip_dst, :body)
-		include StructFu
-
-		def initialize(args={})
-			@random_id = rand(0xffff)
-			super(
-				(args[:ip_v] || 4),
-				(args[:ip_hl] || 5),
-				Int8.new(args[:ip_tos]),
-				Int16.new(args[:ip_len] || 20),
-				Int16.new(args[:ip_id] || ip_calc_id),
-				Int16.new(args[:ip_frag]),
-				Int8.new(args[:ip_ttl] || 32),
-				Int8.new(args[:ip_proto]),
-				Int16.new(args[:ip_sum] || ip_calc_sum),
-				Octets.new.read(args[:ip_src] || "\x00\x00\x00\x00"),
-				Octets.new.read(args[:ip_dst] || "\x00\x00\x00\x00"),
-				StructFu::String.new.read(args[:body])
-			)
-		end
-
-		# Returns the object in string form.
-		def to_s
-			byte_v_hl = [(self.ip_v << 4) + self.ip_hl].pack("C")
-			byte_v_hl + (self.to_a[2,10].map {|x| x.to_s}.join)
-		end
-
-		# Reads a string to populate the object.
-		def read(str)
-			force_binary(str)
-			return self if str.nil?
-			self[:ip_v] = str[0,1].unpack("C").first >> 4
-			self[:ip_hl] = str[0,1].unpack("C").first.to_i & 0x0f
-			self[:ip_tos].read(str[1,1])
-			self[:ip_len].read(str[2,2])
-			self[:ip_id].read(str[4,2])
-			self[:ip_frag].read(str[6,2])
-			self[:ip_ttl].read(str[8,1])
-			self[:ip_proto].read(str[9,1])
-			self[:ip_sum].read(str[10,2])
-			self[:ip_src].read(str[12,4])
-			self[:ip_dst].read(str[16,4])
-			self[:body].read(str[20,str.size]) if str.size > 20
-			self
-		end
-
-		# Setter for the version.
-		def ip_v=(i); self[:ip_v] = i.to_i; end
-		# Getter for the version.
-		def ip_v; self[:ip_v].to_i; end
-		# Setter for the header length (divide by 4)
-		def ip_hl=(i); self[:ip_hl] = i.to_i; end
-		# Getter for the header length (multiply by 4)
-		def ip_hl; self[:ip_hl].to_i; end
-		# Setter for the differentiated services
-		def ip_tos=(i); typecast i; end
-		# Getter for the differentiated services
-		def ip_tos; self[:ip_tos].to_i; end
-		# Setter for total length.
-		def ip_len=(i); typecast i; end
-		# Getter for total length.
-		def ip_len; self[:ip_len].to_i; end
-		# Setter for the identication number.
-		def ip_id=(i); typecast i; end
-		# Getter for the identication number.
-		def ip_id; self[:ip_id].to_i; end
-		# Setter for the fragmentation ID.
-		def ip_frag=(i); typecast i; end
-		# Getter for the fragmentation ID.
-		def ip_frag; self[:ip_frag].to_i; end
-		# Setter for the time to live.
-		def ip_ttl=(i); typecast i; end
-		# Getter for the time to live.
-		def ip_ttl; self[:ip_ttl].to_i; end
-		# Setter for the protocol number.
-		def ip_proto=(i); typecast i; end
-		# Getter for the protocol number.
-		def ip_proto; self[:ip_proto].to_i; end
-		# Setter for the checksum.
-		def ip_sum=(i); typecast i; end
-		# Getter for the checksum.
-		def ip_sum; self[:ip_sum].to_i; end
-		# Setter for the source IP address.
-		def ip_src=(i)
-			case i
-			when Numeric
-				self[:ip_src] = Octets.new.read([i].pack("N"))
-			when Octets
-				self[:ip_src] = i
-			else
-				typecast i
-			end
-		end
-		# Getter for the source IP address.
-		def ip_src; self[:ip_src].to_i; end
-		# Setter for the destination IP address.
-		def ip_dst=(i)
-			case i
-			when Numeric
-				self[:ip_dst] = Octets.new.read([i].pack("N"))
-			when Octets
-				self[:ip_dst] = i
-			else
-				typecast i
-			end
-		end
-		# Getter for the destination IP address.
-		def ip_dst; self[:ip_dst].to_i; end
-
-		# Calulcate the true length of the packet.
-		def ip_calc_len
-			(ip_hl * 4) + body.to_s.length
-		end
-
-		# Return the claimed header length 
-		def ip_hlen
-			(ip_hl * 4)
-		end
-
-		# Calculate the true checksum of the packet.
-		# (Yes, this is the long way to do it, but it's e-z-2-read for mathtards like me.)
-		def ip_calc_sum
-			checksum =  (((self.ip_v  <<  4) + self.ip_hl) << 8) + self.ip_tos
-			checksum += self.ip_len
-			checksum +=	self.ip_id
-			checksum += self.ip_frag
-			checksum +=	(self.ip_ttl << 8) + self.ip_proto
-			checksum += (self.ip_src >> 16)
-			checksum += (self.ip_src & 0xffff)
-			checksum += (self.ip_dst >> 16)
-			checksum += (self.ip_dst & 0xffff)
-			checksum = checksum % 0xffff 
-			checksum = 0xffff - checksum
-			checksum == 0 ? 0xffff : checksum
-		end
-
-		# Retrieve the IP ID
-		def ip_calc_id
-			@random_id
-		end
-
-		# Sets a more readable IP address. If you wants to manipulate individual octets, 
-		# (eg, for host scanning in one network), it would be better use ip_src.o1 through 
-		# ip_src.o4 instead. 
-		def ip_saddr=(addr)
-			self[:ip_src].read_quad(addr)
-		end
-
-		# Returns a more readable IP source address. 
-		def ip_saddr
-			self[:ip_src].to_x
-		end
-
-		# Sets a more readable IP address.
-		def ip_daddr=(addr)
-			self[:ip_dst].read_quad(addr)
-		end
-
-		# Returns a more readable IP destination address.
-		def ip_daddr
-			self[:ip_dst].to_x
-		end
-
-		# Translate various formats of IPv4 Addresses to an array of digits.
-		def self.octet_array(addr)
-			if addr.class == String
-				oa = addr.split('.').collect {|x| x.to_i}
-			elsif addr.class == Fixnum
-				oa = IPAddr.new(addr, Socket::AF_INET).to_s.split('.')
-			elsif addr.class == Bignum
-				oa = IPAddr.new(addr, Socket::AF_INET).to_s.split('.')
-			elsif addr.class == Array
-				oa = addr
-			else
-				raise ArgumentError, "IP Address should be a dotted quad string, an array of ints, or a bignum"
-			end
-		end
-
-		# Recalculate the calculated IP fields. Valid arguments are:
-		#   :all 
-		#   :ip_len 
-		#   :ip_sum 
-		#   :ip_id
-		def ip_recalc(arg=:all)
-			case arg
-			when :ip_len
-				self.ip_len=ip_calc_len
-			when :ip_sum
-				self.ip_sum=ip_calc_sum
-			when :ip_id
-				@random_id = rand(0xffff)
-			when :all
-				self.ip_id=		ip_calc_id
-				self.ip_len=	ip_calc_len
-				self.ip_sum=	ip_calc_sum
-			else
-				raise ArgumentError, "No such field `#{arg}'"
-			end
-		end
-
-		# Readability aliases
-
-		alias :ip_src_readable :ip_saddr
-		alias :ip_dst_readable :ip_daddr
-
-		def ip_id_readable
-			"0x%04x" % ip_id
-		end
-
-		def ip_sum_readable
-			"0x%04x" % ip_sum
-		end
-
-	end
-
-	# IPPacket is used to construct IP packets. They contain an EthHeader, an IPHeader, and usually
-	# a transport-layer protocol such as UDPHeader, TCPHeader, or ICMPHeader.
-	#
-	# == Example
-	#
-	#   require 'packetfu'
-	#   ip_pkt = PacketFu::IPPacket.new
-	#   ip_pkt.ip_saddr="10.20.30.40"
-	#   ip_pkt.ip_daddr="192.168.1.1"
-	#   ip_pkt.ip_proto=1
-	#   ip_pkt.ip_ttl=64
-	#   ip_pkt.ip_payload="\x00\x00\x12\x34\x00\x01\x00\x01"+
-	#     "Lovingly hand-crafted echo responses delivered directly to your door."
-	#   ip_pkt.recalc 
-	#   ip_pkt.to_f('/tmp/ip.pcap')
-	#
-	# == Parameters
-	#
-	#   :eth
-	#     A pre-generated EthHeader object.
-	#   :ip
-	#     A pre-generated IPHeader object.
-	#   :flavor
-	#     TODO: Sets the "flavor" of the IP packet. This might include known sets of IP options, and
-	#     certainly known starting TTLs.
-	#   :config
-	#     A hash of return address details, often the output of Utils.whoami?
-	class IPPacket < Packet
-
-		attr_accessor :eth_header, :ip_header
-
-		def self.can_parse?(str)
-			return false unless str.size >= 34
-			return false unless EthPacket.can_parse? str
-			if str[12,2] == "\x08\x00"
-				if 1.respond_to? :ord
-					ipv = str[14,1][0].ord >> 4
-				else
-					ipv = str[14,1][0] >> 4
-				end
-				return true if ipv == 4 
-			else
-				return false
-			end
-		end
-
-		def read(str=nil, args={})
-			raise "Cannot parse `#{str}'" unless self.class.can_parse?(str)
-			@eth_header.read(str)
-			@ip_header.read(str[14,str.size])
-			@eth_header.body = @ip_header
-			super(args) 
-			self
-		end
-
-		# Creates a new IPPacket object. 
-		def initialize(args={})
-			@eth_header = EthHeader.new(args).read(args[:eth])
-			@ip_header = IPHeader.new(args).read(args[:ip])
-			@eth_header.body=@ip_header
-
-			@headers = [@eth_header, @ip_header]
-			super
-		end
-
-		# Peek provides summary data on packet contents.
-		def peek_format
-			peek_data = ["I  "]
-			peek_data << "%-5d" % to_s.size
-			peek_data << "%-21s" % "#{ip_saddr}"
-			peek_data << "->"
-			peek_data << "%21s" % "#{ip_daddr}"
-			peek_data << "%23s" % "I:"
-			peek_data << "%04x" % ip_id.to_i
-			peek_data.join
-		end
-
-	end
-
-end
-
-# vim: nowrap sw=2 sts=0 ts=2 ff=unix ft=ruby