packetfu 1.1.9 → 1.1.10

data/lib/packetfu/protos/ip.rb

@@ -7,84 +7,84 @@ require 'packetfu/protos/ip/mixin'
 
 module PacketFu
 
-  # 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
+	# 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
     include ::PacketFu::EthHeaderMixin
     include ::PacketFu::IPHeaderMixin
 
-    attr_accessor :eth_header, :ip_header
+		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 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)
-      super(args) 
-      self
-    end
+		def read(str=nil, args={})
+			raise "Cannot parse `#{str}'" unless self.class.can_parse?(str)
+			@eth_header.read(str)
+			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
+		# 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
+			@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
+		# 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
 
 end
 

data/lib/packetfu/protos/ip/header.rb

@@ -2,65 +2,65 @@
 require 'ipaddr'
 
 module PacketFu
-  # Octets implements the addressing scheme for IP.
-  #
-  # ==== Header Definition
-  #
-  #  Int32 :ip_addr
-  class Octets < Struct.new(:ip_addr)
-    include StructFu
-
-    IPV4_RE = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/                                                                                                                                                                                        
-    def initialize(args={})
-      super(
-      Int32.new(args[:ip_addr]))
-    end
-
-    # Returns the object in string form.
-    def to_s
+	# Octets implements the addressing scheme for IP.
+	#
+	# ==== Header Definition
+	#
+	#  Int32 :ip_addr
+	class Octets < Struct.new(:ip_addr)
+		include StructFu
+
+		IPV4_RE = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/                                                                                                                                                                                        
+		def initialize(args={})
+			super(
+			Int32.new(args[:ip_addr]))
+		end
+
+		# Returns the object in string form.
+		def to_s
       [self[:ip_addr].to_i].pack("N")
-    end
-
-    # Reads a string to populate the object.
-    def read(str)
-      force_binary(str)
-      return self if str.nil?
-      self[:ip_addr].read str[0,4]
-      self
-    end
-
-    # Returns an address in dotted-quad format.
-    def to_x
+		end
+
+		# Reads a string to populate the object.
+		def read(str)
+			force_binary(str)
+			return self if str.nil?
+			self[:ip_addr].read str[0,4]
+			self
+		end
+
+		# Returns an address in dotted-quad format.
+		def to_x
       # This could be slightly faster if we reproduced the code in
       # 'octets()' and didn't have to map to strings.
       self.octets.map(&:to_s).join('.')
-    end
+		end
 
-    # Returns an address in numerical format.
-    def to_i
+		# Returns an address in numerical format.
+		def to_i
       self[:ip_addr].to_i
-    end
-
-    # Set the IP Address by reading a dotted-quad address.
-    def read_quad(str)
-      match = IPV4_RE.match(str)
-      if match.nil?
-        raise ArgumentError.new("str is not a valid IPV4 address")
-      end 
-        a = match[1].to_i
-        b = match[2].to_i
-        c = match[3].to_i
-        d = match[4].to_i
-      unless (a >= 0 && a <= 255 &&
-              b >= 0 && b <= 255 &&
-              c >= 0 && c <= 255 &&
-              d >= 0 && d <= 255)
-        raise ArgumentError.new("str is not a valid IPV4 address")
-      end
+		end
+
+		# Set the IP Address by reading a dotted-quad address.
+		def read_quad(str)
+			match = IPV4_RE.match(str)
+			if match.nil?
+				raise ArgumentError.new("str is not a valid IPV4 address")
+			end 
+				a = match[1].to_i
+				b = match[2].to_i
+				c = match[3].to_i
+				d = match[4].to_i
+			unless (a >= 0 && a <= 255 &&
+							b >= 0 && b <= 255 &&
+							c >= 0 && c <= 255 &&
+							d >= 0 && d <= 255)
+				raise ArgumentError.new("str is not a valid IPV4 address")
+			end
       
       self[:ip_addr].value = (a<<24) + (b<<16) + (c<<8) + d
-      self
-    end
+			self
+		end
 
     # Returns the IP address as 4 octets
     def octets
@@ -93,244 +93,244 @@ module PacketFu
       self.to_i & 0xff
     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
+	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
 end