packetfu 1.1.13 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a7e12aeb5b88543b56e143b2544b36782ce8dc8
-  data.tar.gz: 4b70ff593b0963a2cbf2390fbc4f29d80ee8a9b9
+SHA256:
+  metadata.gz: 77ec54305b3731b49e42fb61ec238ff855af78840c94e0d6f35ea1626a221133
+  data.tar.gz: 6e64404182742b2d021a7e93b1153ec46b0bf5eb87fc0661236415ef76901087
 SHA512:
-  metadata.gz: c65258504b37c650f4005f5753a00b898dc679c091de10e55f6ae99da6511e2084742cd32511121b16065c96af04243fc4451918421396bef39ee5723c7181db
-  data.tar.gz: e608e3db2285966fad163008babb0b89728a6a4face4ce8b25bab614ffbc4a750ddd7ae5423d827cd2515fbf5621a88b9978aa5f3fd46e6b9949aea5c3970d1c
+  metadata.gz: dfd80b4314dbdf87bf0fba9c1bc39d182eaf1c2d41f13e598a496c9d09fe18e9f546018764cd704018560acae5d74ed0da86269ec5a343e0ddfbbd6e134c2412
+  data.tar.gz: afb859db4f09d052906b5ffb17529e8e394b1131c217f1ca5f96659c3155fa6f4bf285a6cad5607b87c6740fc2179ce61d41d9815406be22693041c9d9a4aa12

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+## Steps to reproduce
+
+How'd you do it?
+
+1. ...
+2. ...
+
+If relevant, please attach relevant PoC code or PCAPs to help with speedy reproduction.
+
+## Expected behavior
+
+What should happen?
+
+## Current behavior
+
+What happens instead?
+
+## System stuff
+
+### Versions
+
+- Ruby Version (ruby -v): FILL_ME_IN
+- PacketFu Version (gem list|grep packetfu -or- git log -1): FILL_ME_IN
+- OS Version: FILL_ME_IN
+
+### I installed PacketFu from:
+- [ ] Git Source
+- [ ] Gem
+

data/.github/workflows/verify.yml

@@ -0,0 +1,72 @@
+name: Verify
+
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  issues: none
+  discussions: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  verify:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3.0-preview1'
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 25
+
+    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }}
+
+    env:
+      COVERALLS_SKIP: "true"
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install system dependencies (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get install libpcap-dev
+
+      - name: Setup Ruby
+        env:
+          BUNDLE_WITHOUT: "coverage development"
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: false
+
+      - name: Run tests
+        run: |
+          bundle install
+          bundle exec rspec
+

data/.travis.yml

@@ -1,9 +1,13 @@
 language: ruby
-before_install:
- - sudo apt-get install libpcap-dev -qq
+addons:
+  apt:
+    packages:
+      - libpcap-dev
+os:
+  - linux
+  - osx
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.3
-  - 2.4.0
   - 2.4.1
+  - 2.4.0
+  - 2.3.4
+  - 2.2.7

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014, Tod Beardsley
+Copyright (c) 2008-2017, Tod Beardsley
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -1,7 +1,7 @@
 # PacketFu
 
-[![Build Status](https://secure.travis-ci.org/packetfu/packetfu.png)](http://travis-ci.org/packetfu/packetfu)
-[![Code Climate](https://codeclimate.com/github/packetfu/packetfu.png)](https://codeclimate.com/github/packetfu/packetfu)
+[![Build Status](https://secure.travis-ci.org/packetfu/packetfu.svg)](http://travis-ci.org/packetfu/packetfu)
+[![Code Climate](https://codeclimate.com/github/packetfu/packetfu.svg)](https://codeclimate.com/github/packetfu/packetfu)
 [![Coverage Status](https://coveralls.io/repos/github/packetfu/packetfu/badge.svg?branch=master)](https://coveralls.io/github/packetfu/packetfu?branch=master)
 
 A library for reading and writing packets to an interface or to a
@@ -93,7 +93,7 @@ Here's an example of creating a TCPPacket and sending it out on the wire:
   tcp_urg      0                 StructFu::Int16
   tcp_opts                       PacketFu::TcpOptions
 
-2.3.0 :003 > packet.ip_dst = "8.8.8.8"
+2.3.0 :003 > packet.ip_daddr = "8.8.8.8"
  => "8.8.8.8"
 2.3.0 :004 > packet.tcp_dst = 53
  => 53
@@ -113,13 +113,13 @@ Capture from an interface with show_live or whatever.
 
 This project is integrated with travis-ci and is regularly tested to work with the following rubies:
 
-- 2.1.6
-- 2.2.3
-- 2.3.0
+To checkout the current build status and what rubies we're currently supporting, click [here](https://travis-ci.org/packetfu/packetfu).
 
-To checkout the current build status for these rubies, click [here](https://travis-ci.org/packetfu/packetfu).
+## Supported OSs
 
-## Author
+This project is designed for use on Linux (Ubuntu|RHEL|BSD primarily) and OSX platforms and it is the intention of the PacketFu team to support those OSs to ensure PacketFu runs on them.  That said, PacketFu can and has been known to run on Windows as well as other unix-style platforms, but it's not actively supported in the sense that we may help from the community to help fill that gap.  If that is something you are interested in helping with, we welcome your support.
+
+## Authors
 
 PacketFu is maintained primarily by Tod Beardsley todb@packetfu.com and
 Jonathan Claudius claudijd@yahoo.com, with help from Open Source Land.

data/certs/todb.pem

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBd0b2Ri
+L0RDPXBhY2tldGZ1L0RDPWNvbTAeFw0yMzA2MjcwMDExMjdaFw0yNDA2MjYwMDEx
+MjdaMCIxIDAeBgNVBAMMF3RvZGIvREM9cGFja2V0ZnUvREM9Y29tMIIBojANBgkq
+hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAyz2+nfp+Vv+JVHrJMy5Ck3qWBkiZmE0w
+7bR1I/bNXrCtv75l1GxTdRAoxKcXpXyC8elJQ9PEjEEDtdGBYQ13BKcQbDJ36etD
+wjbhRs5SBXgIilJAiR3i/cVnNoNJKOpiJZPufkOpag7Sg8Ze+cWbsc0gYN9nyCmz
+LYwWDC6Ji0KgJFw5YxFvIxVeOx86Ccfd64Wsa3EhkZd6fOpDE3029GWDqZwZTBIX
+RzJP4M7QZHZjq3gbHgSKFCFv0MqsjnQzUhPyB/U27c/n+wfRzZNx4Y1eRVm7gwPP
+LJDzt6mvtlXqc6pQ1NsR9hv3sieFLZDDPU1AaWiOAckIKcVoXB8sGnuFMczMW97o
+OZLfqfZUAN6LSY939T2sCyOcGhjxZIQbXtn/R/RAJ7UTfJld9UdthKm1W/f0cjwW
+yqoVsFL+nda6xfta9EnRqqFLOJqyX/wwA2cPO9B8EyM8vFEE8AG8wLu1tF3ggoMg
+rKut/WQADc3ymKAtsr9bOWajj7bIQVJnAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgSwMB0GA1UdDgQWBBR2kf7ATPt3O7Lpc0uyyCiow3P88DAcBgNVHREE
+FTATgRF0b2RiQHBhY2tldGZ1LmNvbTAcBgNVHRIEFTATgRF0b2RiQHBhY2tldGZ1
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAZMp8nY7WzGOPO6TrAlZg37D3s3Rcm0/z
+6DBzFcY4F5CF3xq1Z/DZ3JwhjILaHPAZTvVT4uj91K4BYh/QgteS52C+O/9qsZ25
+L3Ocu4Yp+aU40KpjW+IjlzgTS3E21pCBrBTgT7NuTHmTmoNmHfE6Gbbig3a68C9z
+LcXj2RaEQuhOKrq5vw/0AV34wRieClM/oW8kWAKJDQ8/WEocHQpO1K/dhQ9hHNir
+lMpjKXsWuxdAZPyvNj15w9fw5a4gZgW26P4VBNJUD/iCe7QYhwXrhdhxf+cygW2A
+gBCt2UC6yISUDFiajyTw8cTJB1UyfLIADS4hiOEShx7hvVee444bgmOA99C+YuzT
+FFUt9KVtWsXKD0R6GBvbAUW4/LjmXCCM+Z3uWo1Ph6zljlNHz6/tg+SB7DVgsI3i
+XuSkzAmFsPisZ7uZk/7gJVlmyaqIxdrPVt9ZOTeSc/8pgSoRurHEJ7KlUXv4kcYM
+F3a8dA5tl/TC0vkHlCtghhLuD46SlAmH
+-----END CERTIFICATE-----

data/examples/100kpackets.rb

@@ -5,7 +5,7 @@
 # reading and writing packets to and from pcap files.
 
 # Usage:
-# ruby examples/100kpackets.rb 
+# ruby examples/100kpackets.rb
 
 # Path setting slight of hand:
 $: << File.expand_path("../../lib", __FILE__)
@@ -13,7 +13,7 @@ require 'packetfu'
 
 puts "Generating packets... (#{Time.now.utc})"
 
-File.unlink("/tmp/out.pcap") if File.exists? "/tmp/out.pcap"
+File.unlink("/tmp/out.pcap") if File.exist? "/tmp/out.pcap"
 start_time = Time.now.utc
 count = 0
 

data/examples/ackscan.rb

@@ -31,12 +31,13 @@ def gen_packets
   pkt.tcp_dst=81
   pkt_array = []
   256.times do |i|
-   pkt.ip_dst.o4=i
-   pkt.tcp_src = rand(5000 - 1025) + 1025
- 	 pkt.recalc
- 	 pkt_array << pkt.to_s
- 	end
- 	pkt_array
+    oa = PacketFu::IPHeader.octet_array(pkt.ip_dst)[0,3] + ["#{i}"]
+    pkt.ip_dst = IPAddr.new(oa.join '.').to_i
+    pkt.tcp_src = rand(5000 - 1025) + 1025
+    pkt.recalc
+    pkt_array << pkt.to_s
+  end
+  pkt_array
 end
 
 do_scan

data/examples/pcap2pcapng.rb

@@ -9,11 +9,11 @@ require 'packetfu'
 pcap_filename = ARGV[0].chomp
 pcapng_filename = ARGV[1].chomp
 
-unless File.exists?(pcap_filename)
+unless File.exist?(pcap_filename)
   puts "PCAP input file #{pcap_filename} could not be found"
 end
 
-if File.exists?(pcapng_filename)
+if File.exist?(pcapng_filename)
   puts "PCAP-NG output file #{pcap_filename} already exists"
   puts "Do you wish to overwrite the file? (Y/N, Default = N)"
   STDOUT.flush

data/examples/readpcap.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# Usage:
+# rvmsudo ruby examples/readpcap.rb test.pcap test.pcap
+
+# Path setting slight of hand:
+$: << File.expand_path("../../lib", __FILE__)
+
+require 'packetfu'
+include PacketFu
+
+pcap_filename = ARGV[0] || 'test/sample.pcap'
+
+unless File.exist?(pcap_filename)
+  puts "PCAP input file '#{pcap_filename}' could not be found"
+  exit 1
+end
+
+puts "Loaded: PacketFu v#{PacketFu.version}"
+
+puts "Reading PCAP to packet array from #{File.expand_path(pcap_filename)}"
+packet_array = PacketFu::PcapFile.file_to_array(pcap_filename)
+
+packet_array.each do |pkt|
+  packet = PacketFu::Packet.parse(pkt)
+
+  # Do some stuff here (really any thing you want)
+  puts packet.class
+end

data/lib/packetfu/capture.rb

@@ -32,7 +32,7 @@ module PacketFu
     def initialize(args={})
       @array = [] # Where the packet array goes.
       @stream = [] # Where the stream goes.
-      @iface = (args[:iface] || ENV['IFACE'] || Pcap.lookupdev || "lo").to_s
+      @iface = (args[:iface] || ENV['IFACE'] || PacketFu::Utils.default_int || "lo").to_s
       @snaplen = args[:snaplen] || 0xffff
       @promisc = args[:promisc] || false # Sensible for some Intel wifi cards
       @timeout = args[:timeout] || 1

data/lib/packetfu/config.rb

@@ -34,7 +34,7 @@ module PacketFu
 
     def initialize(args={})
       if Process.euid.zero?
-        @iface = args[:iface] || ENV['IFACE'] || Pcap.lookupdev || "lo" 
+        @iface = args[:iface] || ENV['IFACE'] || Pcap.lookupdev || "lo"
       end
       @pcapfile = "/tmp/out.pcap"
       args.each_pair { |k,v| self.instance_variable_set(("@#{k}"),v) }
@@ -43,7 +43,7 @@ module PacketFu
     # Returns all instance variables as a hash (including custom variables set at initialization).
     def config(arg=nil)
       if arg
-        arg.each_pair {|k,v| self.instance_variable_set(("@" + k.to_s).intern, v)}
+        arg.each_pair {|k,v| self.instance_variable_set(("@" + k.to_s).to_sym, v)}
       else
         config_hash = {}
         self.instance_variables.each do |v|

data/lib/packetfu/inject.rb

@@ -11,7 +11,7 @@ module PacketFu
     def initialize(args={})
       @array = [] # Where the packet array goes.
       @stream = [] # Where the stream goes.
-      @iface = args[:iface] || ENV['IFACE'] || Pcap.lookupdev || "lo" 
+      @iface = args[:iface] || ENV['IFACE'] || PacketFu::Utils.default_int || "lo" 
       @snaplen = args[:snaplen] || 0xffff
       @promisc = args[:promisc] || false # Sensible for some Intel wifi cards
       @timeout = args[:timeout] || 1

data/lib/packetfu/packet.rb

@@ -95,7 +95,7 @@ module PacketFu
       filename ||= 'out.pcap'
       mode = mode.to_s[0,1] + "b"
       raise ArgumentError, "Unknown mode: #{mode.to_s}" unless mode =~ /^[wa]/
-      if(mode == 'w' || !(File.exists?(filename)))
+      if(mode == 'w' || !(File.exist?(filename)))
         data = [PcapHeader.new, self.to_pcap].map {|x| x.to_s}.join
       else
         data = self.to_pcap
@@ -163,12 +163,15 @@ module PacketFu
     # to be transmuted into a packet, as well as args. This superclass method is merely
     # concerned with handling args common to many packet formats (namely, fixing packets
     # on the fly)
-    def read(args={})
+    def read(str=nil, args={})
+      raise "Cannot parse `#{str}'" unless self.class.can_parse?(str)
+      @eth_header.read(str)
       if args[:fix] || args[:recalc]
         ip_recalc(:ip_sum) if self.is_ip?
         recalc(:tcp) if self.is_tcp?
         recalc(:udp) if self.is_udp?
       end
+      self
     end
 
     # Packets are bundles of lots of objects, so copying them
@@ -294,7 +297,7 @@ module PacketFu
     def hexify(str)
       str.force_encoding(Encoding::BINARY) if str.respond_to? :force_encoding
       hexascii_lines = str.to_s.unpack("H*")[0].scan(/.{1,32}/)
-      regex = Regexp.new('[\x00-\x1f\x7f-\xff]', nil, 'n')
+      regex = Regexp.new('[\x00-\x1f\x7f-\xff]'.force_encoding('ASCII-8BIT'), Regexp::NOENCODING)
       chars = str.to_s.gsub(regex,'.')
       chars_lines = chars.scan(/.{1,16}/)
       ret = []

data/lib/packetfu/pcap.rb

@@ -6,7 +6,7 @@ module StructFu
   # Set the endianness for the various Int classes. Takes either :little or :big.
   def set_endianness(e=nil)
     unless [:little, :big].include? e
-      raise ArgumentError, "Unknown endianness for #{self.class}" 
+      raise ArgumentError, "Unknown endianness for #{self.class}"
     end
     @int64 = e == :little ? Int64le : Int64be
     @int32 = e == :little ? Int32le : Int32be
@@ -26,11 +26,11 @@ end
 module PacketFu
 
   # PcapHeader represents the header portion of a libpcap file (the packets
-  # themselves are in the PcapPackets array). See 
+  # themselves are in the PcapPackets array). See
   # http://wiki.wireshark.org/Development/LibpcapFileFormat for details.
   #
   # Depending on the endianness (set with :endian), elements are either
-  # :little endian or :big endian. 
+  # :little endian or :big endian.
   #
   # ==== PcapHeader Definition
   #
@@ -52,13 +52,13 @@ module PacketFu
 
     def initialize(args={})
       set_endianness(args[:endian] ||= :little)
-      init_fields(args) 
-      super(args[:endian], args[:magic], args[:ver_major], 
-            args[:ver_minor], args[:thiszone], args[:sigfigs], 
+      init_fields(args)
+      super(args[:endian], args[:magic], args[:ver_major],
+            args[:ver_minor], args[:thiszone], args[:sigfigs],
             args[:snaplen], args[:network])
     end
-    
-    # Called by initialize to set the initial fields. 
+
+    # Called by initialize to set the initial fields.
     def init_fields(args={})
       args[:magic] = @int32.new(args[:magic] || PcapHeader::MAGIC_INT32)
       args[:ver_major] = @int16.new(args[:ver_major] || 2)
@@ -82,7 +82,7 @@ module PacketFu
       force_binary(str)
       return self if str.nil?
       str.force_encoding(Encoding::BINARY) if str.respond_to? :force_encoding
-      if str[0,4] == self[:magic].to_s 
+      if str[0,4] == self[:magic].to_s
         self[:magic].read str[0,4]
         self[:ver_major].read str[4,2]
         self[:ver_minor].read str[6,2]
@@ -114,7 +114,7 @@ module PacketFu
       super(args[:endian], args[:sec], args[:usec])
     end
 
-    # Called by initialize to set the initial fields. 
+    # Called by initialize to set the initial fields.
     def init_fields(args={})
       args[:sec] = @int32.new(args[:sec])
       args[:usec] = @int32.new(args[:usec])
@@ -156,7 +156,7 @@ module PacketFu
            args[:orig_len], args[:data])
     end
 
-    # Called by initialize to set the initial fields. 
+    # Called by initialize to set the initial fields.
     def init_fields(args={})
       args[:timestamp] = Timestamp.new(:endian => args[:endian]).read(args[:timestamp])
       args[:incl_len] = args[:incl_len].nil? ? @int32.new(args[:data].to_s.size) : @int32.new(args[:incl_len])
@@ -197,8 +197,8 @@ module PacketFu
       str.force_encoding Encoding::BINARY if str.respond_to? :force_encoding
     end
 
-    # Reads a string to populate the object. Note, this read takes in the 
-    # whole pcap file, since we need to see the magic to know what 
+    # Reads a string to populate the object. Note, this read takes in the
+    # whole pcap file, since we need to see the magic to know what
     # endianness we're dealing with.
     def read(str)
       force_binary(str)
@@ -226,7 +226,7 @@ module PacketFu
 
   end
 
-  # PcapFile is a complete libpcap file struct, made up of two elements, a 
+  # PcapFile is a complete libpcap file struct, made up of two elements, a
   # PcapHeader and PcapPackets.
   #
   # See http://wiki.wireshark.org/Development/LibpcapFileFormat
@@ -240,7 +240,7 @@ module PacketFu
 
     class << self
 
-      # Takes a given file and returns an array of the packet bytes. Here 
+      # Takes a given file and returns an array of the packet bytes. Here
       # for backwards compatibilty.
       def file_to_array(fname)
         PcapFile.new.file_to_array(:f => fname)
@@ -248,9 +248,9 @@ module PacketFu
 
       # Takes a given file name, and reads out the packets. If given a block,
       # it will yield back a PcapPacket object per packet found.
-      def read(fname,&block) 
+      def read(fname,&block)
         file_header = PcapHeader.new
-        pcap_packets = PcapPackets.new 
+        pcap_packets = PcapPackets.new
         unless File.readable? fname
           raise ArgumentError, "Cannot read file `#{fname}'"
         end
@@ -279,13 +279,13 @@ module PacketFu
         block ? packet_count : pcap_packets
       end
 
-      # Takes a filename, and an optional block. If a block is given, 
+      # Takes a filename, and an optional block. If a block is given,
       # yield back the raw packet data from the given file. Otherwise,
       # return an array of parsed packets.
       def read_packet_bytes(fname,&block)
         count = 0
         packets = [] unless block
-        read(fname) do |packet| 
+        read(fname) do |packet|
           if block
             count += 1
             yield packet.data.to_s
@@ -296,7 +296,7 @@ module PacketFu
         block ? count : packets
       end
 
-      alias :file_to_array :read_packet_bytes 
+      alias :file_to_array :read_packet_bytes
 
       # Takes a filename, and an optional block. If a block is given,
       # yield back parsed packets from the given file. Otherwise, return
@@ -307,7 +307,7 @@ module PacketFu
       def read_packets(fname,&block)
         count = 0
         packets = [] unless block
-        read_packet_bytes(fname) do |packet| 
+        read_packet_bytes(fname) do |packet|
           if block
             count += 1
             yield Packet.parse(packet)
@@ -326,7 +326,7 @@ module PacketFu
       super(args[:endian], args[:head], args[:body])
     end
 
-    # Called by initialize to set the initial fields. 
+    # Called by initialize to set the initial fields.
     def init_fields(args={})
       args[:head] = PcapHeader.new(:endian => args[:endian]).read(args[:head])
       args[:body] = PcapPackets.new(:endian => args[:endian]).read(args[:body])
@@ -354,7 +354,7 @@ module PacketFu
 
     # Clears the contents of the PcapFile prior to reading in a new string.
     def read!(str)
-      clear	
+      clear
       force_binary(str)
       self.read str
     end
@@ -381,7 +381,7 @@ module PacketFu
 
     # file_to_array() translates a libpcap file into an array of packets.
     # Note that this strips out pcap timestamps -- if you'd like to retain
-    # timestamps and other libpcap file information, you will want to 
+    # timestamps and other libpcap file information, you will want to
     # use read() instead.
     def file_to_array(args={})
       filename = args[:filename] || args[:file] || args[:f]
@@ -469,7 +469,7 @@ module PacketFu
       end
       append = args[:append]
       if append
-        if File.exists? filename
+        if File.exist? filename
           File.open(filename,'ab') {|file| file.write(self.body.to_s)}
         else
           File.open(filename,'wb') {|file| file.write(self.to_s)}

data/lib/packetfu/pcapng/file.rb

@@ -144,7 +144,7 @@ module PacketFu
 
         append = args[:append]
         mode = ''
-        if append and ::File.exists? filename
+        if append and ::File.exist? filename
           mode = 'ab'
         else
           mode = 'wb'

data/lib/packetfu/protos/arp.rb

@@ -44,13 +44,6 @@ module PacketFu
       true
     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 initialize(args={})
       @eth_header = EthHeader.new(args).read(args[:eth])
       @arp_header = ARPHeader.new(args).read(args[:arp])
@@ -59,7 +52,7 @@ module PacketFu
 
       # Please send more flavors to todb+packetfu@planb-security.net.
       # Most of these initial fingerprints come from one (1) sample.
-      case (args[:flavor].nil?) ? :nil : args[:flavor].to_s.downcase.intern
+      case (args[:flavor].nil?) ? :nil : args[:flavor].to_s.downcase.to_sym
       when :windows; @arp_header.body = "\x00" * 64				# 64 bytes of padding
       when :linux; @arp_header.body = "\x00" * 4 +				# 32 bytes of padding
         "\x00\x07\x5c\x14" + "\x00" * 4 +

data/lib/packetfu/protos/eth.rb

@@ -29,13 +29,6 @@ module PacketFu
       true
     end
 
-    def read(str=nil,args={})
-      raise "Cannot parse `#{str}'" unless self.class.can_parse?(str)
-      @eth_header.read(str)
-      super(args)
-      return self
-    end
-
     # Does nothing, really, since there's no length or
     # checksum to calculate for a straight Ethernet packet.
     def recalc(args={})

data/lib/packetfu/protos/hsrp.rb

@@ -59,13 +59,6 @@ module PacketFu
       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 initialize(args={})
       @eth_header = EthHeader.new(args).read(args[:eth])
       @ip_header = IPHeader.new(args).read(args[:ip])

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

@@ -1,11 +1,11 @@
 # -*- coding: binary -*-
 module PacketFu
-  # ICMPHeader is a complete ICMP struct, used in ICMPPacket. ICMP is 
+  # 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 
+  # For more on ICMP packets, see
   # http://www.networksorcery.com/enp/protocol/icmp.htm
-  # 
+  #
   # ==== Header Definition
   #
   #   Int8    :icmp_type                        # Type
@@ -49,7 +49,7 @@ module PacketFu
     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 
+    # Setter for the checksum. Note, this is calculated automatically with
     # icmp_calc_sum.
     def icmp_sum=(i); typecast i; end
     # Getter for the checksum.
@@ -68,13 +68,10 @@ module PacketFu
       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
+    def icmp_recalc(arg = :all)
+      case arg.to_sym
       when :icmp_sum
         self.icmp_sum=icmp_calc_sum
       when :all

data/lib/packetfu/protos/icmp.rb

@@ -50,13 +50,6 @@ module PacketFu
       return true
     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 initialize(args={})
       @eth_header = EthHeader.new(args).read(args[:eth])
       @ip_header = IPHeader.new(args).read(args[:ip])