bettercap 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a20bd3d46b26a06c270e2d034fda7c00ea60a41
-  data.tar.gz: 1bbf692b6a880d19988566d86c88c1c64f27bb7b
+  metadata.gz: a07e86570365f443ee439d850b72ce33ea9f9496
+  data.tar.gz: f29023f45a2b8f77100096529539fee383b2d0ca
 SHA512:
-  metadata.gz: bafc05fd0e7580d479c6a12956cd4b5d74569ae572d39222864b89b71041ef230b17092a9a127c7e5392787512a67873ea8ccf812800ad368fed8088bf19d0cc
-  data.tar.gz: 0d0397e693c90ad2ab4bafc23afc908b390b3c2e9975a6dc90ecd62c21ca756b0cebfff0cf6820ff5f516adc8782a8c27d5b4040ccd4f67dad817f8c304e630d
+  metadata.gz: 28f7271d87b8cb7727ef4f2ddff8ff0ceef18d692271dd6dafc0a6aced5d84aeb595161692bbc05b9a0dd96df681b6ee352cba24edac29ba31a32ee0ca53adb3
+  data.tar.gz: 1db150ee30cd6baf75f3b19bc51ca4d860888c95e9686ed0a2e496b4db976e1177553de38f756a8d376269b22e8dd182eb6dc5f13f92dc849917e394ecd751ac

data/README.md

@@ -66,6 +66,15 @@ Before submitting issues, please read the relevant [section](http://www.betterca
 Installation
 ============
 
+**Dependencies**
+
+All dependencies will be automatically installed through the GEM system but in some case you might need to install some system
+dependency in order to make everything work:
+
+    sudo apt-get install build-essential ruby-dev libpcap-dev
+
+This should solve issues such as [this one](https://github.com/evilsocket/bettercap/issues/22) or [this one](https://github.com/evilsocket/bettercap/issues/100).
+
 **Stable Release ( GEM )**
 
     gem install bettercap
@@ -77,16 +86,6 @@ Installation
     gem build bettercap.gemspec
     sudo gem install bettercap*.gem
 
-Dependencies
-============
-
-All dependencies will be automatically installed through the GEM system, in some case you might need to install some system
-dependency in order to make everything work:
-
-    sudo apt-get install build-essential ruby-dev libpcap-dev
-
-This should solve issues such as [this one](https://github.com/evilsocket/bettercap/issues/22) or [this one](https://github.com/evilsocket/bettercap/issues/100).
-
 Documentation and Examples
 ============
 

data/lib/bettercap.rb

@@ -20,6 +20,7 @@ Encoding.default_internal = Encoding::UTF_8
 require 'optparse'
 require 'colorize'
 require 'packetfu'
+require 'pcaprub'
 require 'ipaddr'
 require 'uri'
 
@@ -39,16 +40,40 @@ require 'bettercap/discovery/agents/icmp'
 require 'bettercap/discovery/agents/udp'
 require 'bettercap/context'
 require 'bettercap/monkey/packetfu/utils'
-require 'bettercap/factories/firewall'
-require 'bettercap/factories/spoofer'
-require 'bettercap/factories/parser'
+require 'bettercap/spoofers/base'
+require 'bettercap/spoofers/arp'
+require 'bettercap/spoofers/icmp'
+require 'bettercap/spoofers/none'
 require 'bettercap/logger'
 require 'bettercap/shell'
 require 'bettercap/network/network'
 require 'bettercap/version'
 require 'bettercap/network/target'
+require 'bettercap/network/protos/base'
+require 'bettercap/network/protos/dhcp'
 require 'bettercap/sniffer/sniffer'
+require "bettercap/sniffer/parsers/base"
+require "bettercap/sniffer/parsers/custom"
+require "bettercap/sniffer/parsers/dict"
+require "bettercap/sniffer/parsers/cookie"
+require "bettercap/sniffer/parsers/ftp"
+require "bettercap/sniffer/parsers/httpauth"
+require "bettercap/sniffer/parsers/https"
+require "bettercap/sniffer/parsers/irc"
+require "bettercap/sniffer/parsers/mail"
+require "bettercap/sniffer/parsers/mpd"
+require "bettercap/sniffer/parsers/nntp"
+require "bettercap/sniffer/parsers/ntlmss"
+require "bettercap/sniffer/parsers/post"
+require "bettercap/sniffer/parsers/dhcp"
+require "bettercap/sniffer/parsers/redis"
+require "bettercap/sniffer/parsers/rlogin"
+require "bettercap/sniffer/parsers/snpp"
+require "bettercap/sniffer/parsers/url"
+require "bettercap/sniffer/parsers/whatsapp"
 require 'bettercap/firewalls/redirection'
+require 'bettercap/firewalls/osx'
+require 'bettercap/firewalls/linux'
 require 'bettercap/proxy/stream_logger'
 require 'bettercap/proxy/request'
 require 'bettercap/proxy/response'

data/lib/bettercap/context.rb

@@ -57,7 +57,7 @@ class Context
   # Initialize the global context object.
   def initialize
     begin
-      iface = Pcap.lookupdev
+      iface = PCAPRUB::Pcap.lookupdev
     rescue Exception => e
       iface = nil
       Logger.debug e.message
@@ -78,7 +78,7 @@ class Context
     @proxies         = []
     @redirections    = []
     @discovery       = Discovery::Thread.new self
-    @firewall        = Factories::Firewall.get
+    @firewall        = Firewalls::Base.get
     @packets         = nil
   end
 

data/lib/bettercap/discovery/agents/icmp.rb

@@ -20,7 +20,7 @@ class Icmp
   # Create a thread which will perform a ping-sweep on the network in order
   # to populate the ARP cache with active targets.
   def initialize( ctx )
-    Factories::Firewall.get.enable_icmp_bcast(true)
+    Firewalls::Base.get.enable_icmp_bcast(true)
 
     # TODO: Use the real broadcast address for this network.
     3.times do

data/lib/bettercap/firewalls/base.rb

@@ -14,6 +14,31 @@ module BetterCap
 module Firewalls
 # Base class for BetterCap::Firewalls objects.
 class Base
+  # Instance of the loaded firewall.
+  @@instance = nil
+
+  class << self
+    # Save and return an instance of the appropriate BetterCap::Firewalls object.
+    def get
+      return @@instance unless @@instance.nil?
+
+      if RUBY_PLATFORM =~ /darwin/
+        @@instance = Firewalls::OSX.new
+      elsif RUBY_PLATFORM =~ /linux/
+        @@instance = Firewalls::Linux.new
+      else
+        raise BetterCap::Error, 'Unsupported operating system'
+      end
+
+      @@instance
+    end
+
+    # Clear the instance of the BetterCap::Firewalls object.
+    def clear
+      @@instance = nil
+    end
+  end
+
   # Initialize the firewall object.
   # Raise NotImplementedError
   def initialize

data/lib/bettercap/monkey/packetfu/utils.rb

@@ -19,6 +19,17 @@ This project is released under the GPL 3 license.
 require 'bettercap/logger'
 
 module PacketFu
+  class Packet
+    def eth2s(which = :src)
+      case which
+      when :src
+        self.eth_src.bytes.map(&(Proc.new {|x| sprintf('%02X',x) })).join(':')
+      when :dst
+        self.eth_dst.bytes.map(&(Proc.new {|x| sprintf('%02X',x) })).join(':')
+      end
+    end
+  end
+  
   class Utils
     def self.ifconfig(iface='eth0')
       ret = {}
@@ -26,18 +37,27 @@ module PacketFu
 
       BetterCap::Logger.debug "ifconfig #{iface}"
 
-      ifconfig_data = BetterCap::Shell.ifconfig(iface)
-      if ifconfig_data =~ /#{iface}/i
-        ifconfig_data = ifconfig_data.split(/[\s]*\n[\s]*/)
+      if BetterCap::Shell.available?('ip')
+        BetterCap::Logger.debug "Using iproute2"
+
+        data = BetterCap::Shell.ip(iface)
+        ret = linux_ip iface, data
       else
-        raise ArgumentError, "Cannot ifconfig #{iface}"
-      end
+        BetterCap::Logger.debug "Using ifconfig"
+
+        data = BetterCap::Shell.ifconfig(iface)
+        if data =~ /#{iface}/i
+          data = data.split(/[\s]*\n[\s]*/)
+        else
+          raise ArgumentError, "Cannot ifconfig #{iface}"
+        end
 
-      case RUBY_PLATFORM
-      when /linux/i
-        ret = linux_ifconfig iface, ifconfig_data
-      when /darwin/i
-        ret = darwin_ifconfig iface, ifconfig_data
+        case RUBY_PLATFORM
+        when /linux/i
+          ret = linux_ifconfig iface, data
+        when /darwin/i
+          ret = darwin_ifconfig iface, data
+        end
       end
 
       ret
@@ -45,6 +65,46 @@ module PacketFu
 
     private
 
+    def self.linux_ip(iface='eth0',data)
+      BetterCap::Logger.debug "Linux ip #{iface}:\n#{data}"
+
+      ret = {
+        :iface => iface,
+        :eth_saddr => nil,
+        :eth_src => nil,
+        :ip_saddr => nil,
+        :ip_src => nil,
+        :ip4_obj => nil
+      }
+
+      lines = data.split("\n").map(&:strip)
+
+      # search for interface
+      lines.each_with_index do |line,i|
+        if line =~ /\d+:\s+#{iface}:.+/i
+          # start parsing this block
+          lines[i..lines.size].each do |line|
+            case line
+            when /^.+([0-9a-f:]{17})\s+.+[0-9a-f:]{17}$/i
+              ret[:eth_saddr] = $1.downcase
+              ret[:eth_src] = EthHeader.mac2str(ret[:eth_saddr])
+            when /^inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/(\d+)\s.+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s.+$/i
+              addr = $1
+              bits = $2
+
+              ret[:ip_saddr] = addr
+              ret[:ip_src] = [IPAddr.new(addr).to_i].pack('N')
+              ret[:ip4_obj] = IPAddr.new(addr)
+              ret[:ip4_obj] = ret[:ip4_obj].mask(bits) if bits
+            end
+          end
+          break
+        end
+      end
+
+      ret
+    end
+
     def self.linux_ifconfig(iface='eth0',ifconfig_data)
       BetterCap::Logger.debug "Linux ifconfig #{iface}:\n#{ifconfig_data}"
 

data/lib/bettercap/network/network.rb

@@ -53,9 +53,17 @@ class << self
   def get_local_ips
     ips = []
 
-    Shell.ifconfig.split("\n").each do |line|
-      if line =~ /inet [adr:]*([\d\.]+)/
-        ips << $1
+    if Shell.available?('ip')
+      Shell.ip.split("\n").each do |line|
+        if line.strip =~ /^inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/(\d+).+$/i
+          ips << $1
+        end
+      end
+    else
+      Shell.ifconfig.split("\n").each do |line|
+        if line =~ /inet [adr:]*([\d\.]+)/
+          ips << $1
+        end
       end
     end
 

data/lib/bettercap/network/packet_queue.rb

@@ -25,7 +25,7 @@ class PacketQueue
     @nworkers = nworkers
     @throttle = packet_throttle;
     @running  = true
-    @stream   = Pcap.open_live( iface, 0xffff, false , 1 )
+    @stream   = PCAPRUB::Pcap.open_live( iface, 0xffff, false , 1 )
     @mutex    = Mutex.new
     @udp      = UDPSocket.new
     @queue    = Queue.new

data/lib/bettercap/network/protos/base.rb

@@ -0,0 +1,97 @@
+# encoding: UTF-8
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+
+module BetterCap
+module Network
+module Protos
+
+class Base
+  TYPES = [
+      :uint8,
+      :uint16,
+      :uint32,
+      :uint32rev,
+      :ip,
+      :mac,
+      :bytes
+  ].freeze
+
+  @@fields = {}
+
+  def self.method_missing(method_name, *arguments, &block)
+    type = method_name.to_sym
+    name = arguments[0]
+    if TYPES.include?(type)
+      @@fields[name] = { :type => type, :opts => arguments.length > 1 ? arguments[1] : {} }
+      class_eval "attr_accessor :#{name}"
+    else
+      raise NoMethodError, method_name
+    end
+  end
+
+  def self.parse( data )
+    pkt = self.new
+
+    begin
+      offset = 0
+      limit  = data.length
+      value  = nil
+
+      @@fields.each do |name, info|
+        value = nil
+
+        case info[:type]
+        when :uint8
+          value = data[offset].ord
+          offset += 1
+        when :uint16
+          value = data[offset..offset + 1].unpack('S')[0]
+          offset += 2
+        when :uint32
+          value = data[offset..offset + 3].unpack('L')[0]
+          offset += 4
+        when :uint32rev
+          value = data[offset..offset + 3].reverse.unpack('L')[0]
+          offset += 4
+        when :ip
+          tmp   = data[offset..offset + 3].reverse.unpack('L')[0]
+          value = IPAddr.new(tmp, Socket::AF_INET)
+          offset += 4
+        when :mac
+          tmp   = data[offset..offset + 7]
+          value = tmp.bytes.map(&(Proc.new {|x| sprintf('%02X',x) })).join(':')
+          offset += size( info, 16 )
+        when :bytes
+          size = size( info, data.length )
+          value = data[offset..offset + size - 1].bytes
+          offset += size
+        end
+
+        pkt.send("#{name}=", value)
+      end
+
+    rescue Exception => e
+      pkt = nil
+    end
+
+    pkt
+  end
+
+  def self.size( info, default )
+    info[:opts].has_key?(:size) ? info[:opts][:size] : default
+  end
+end
+
+end
+end
+end

data/lib/bettercap/network/protos/dhcp.rb

@@ -0,0 +1,350 @@
+# encoding: UTF-8
+=begin
+
+BETTERCAP
+
+Author : Simone 'evilsocket' Margaritelli
+Email  : evilsocket@gmail.com
+Blog   : http://www.evilsocket.net/
+
+This project is released under the GPL 3 license.
+
+=end
+
+module BetterCap
+module Network
+module Protos
+module DHCP
+
+OP_MESSAGETYPES = {
+  # DHCP Message type responses (all len = 1)
+  1 => 'DISCOVER',
+  2 => 'OFFER',
+  3 => 'REQUEST',
+  4 => 'DECLINE',
+  5 => 'ACK',
+  6 => 'NAK',
+  7 => 'RELEASE'
+}
+
+OP_CONSTANTS = {
+  # DHCP Options
+  :DHCPPad                          => 0,
+  :DHCPSubnetMask                   => 1,
+  :DHCPTimeOffset                   => 2,
+  :DHCPRouter                       => 3,
+  :DHCPTimeServer                   => 4,
+  :DHCPNameServer                   => 5,
+  :DHCPDNS                          => 6,
+  :DHCPLogServer                    => 7,
+  :DHCPQuoteServer                  => 8,
+  :DHCPLPRServer                    => 9,
+  :DHCPImpressServer                => 10,
+  :DHCPRLServer                     => 11,
+  :DHCPHostName                     => 12,
+  :DHCPBootFileSize                 => 13,
+  :DHCPMeritDumpFile                => 14,
+  :DHCPDomainName                   => 15,
+  :DHCPSwapServer                   => 16,
+  :DHCPRootPath                     => 17,
+  :DHCPExtensionsPath               => 18,
+  :DHCPIPForwarding                 => 19,
+  :DHCPNonLocalRouting              => 20,
+  :DHCPPolicyFilter                 => 21,
+  :DHCPMaximumDRSize                => 22, # Datagram reassembly size
+  :DHCPDefaultIPTTL                 => 23,
+  :DHCPPathMTUAgingTimeout          => 24,
+  :DHCPPathMTUPlateauTable          => 25,
+  :DHCPInterfaceMTU                 => 26,
+  :DHCPAllSubnetsLocal              => 27,
+  :DHCPBroadcastAddress             => 28,
+  :DHCPPerformMask                  => 29, # Perform mask discovery
+  :DHCPMaskSupplier                 => 30, # Zelda flashbacks
+  :DHCPPerformRouter                => 31, # Perform router discovery
+  :DHCPRouterSolicitation           => 32, # Router Solicitation Address
+  :DHCPStaticRoutingEnable          => 33,
+  :DHCPTrailerEncap                 => 34, # Trailer Encapsulation
+  :DHCPArpCacheTimeout              => 35,
+  :DHCPEthernetEncap                => 36, # ethernet encapsulation
+  :DHCPDefaultTCPTTL                => 37,
+  :DHCPTCPKeepAliveInt              => 38, # TCP Keepalive interval
+  :DHCPTCPKeepAliveGB               => 39, # TCP Keepalive garbage
+  :DHCPNISDomain                    => 40,
+  :DHCPNISServer                    => 41,
+  :DHCPNTPServers                   => 42,
+  :DHCPVendorSpecificInfo           => 43,
+  :DHCPNetBIOSNameServer            => 44,
+  :DHCPNetBIOSDDS                   => 45,
+  :DHCPNetBIOSNodeType              => 46,
+  :DHCPNetBIOSScope                 => 47,
+  :DHCPXWindowSystemFont            => 48, # XWindow Font server
+  :DHCPXWindowSystemDM              => 49, # Xwindow System Display Server
+  :DHCPRequestedIPAddress           => 50,
+  :DHCPIPAddressLeaseTime           => 51,
+  :DHCPOptionOverload               => 52,
+  :DHCPMessageType                  => 53,
+  :DHCPServerIdentifier             => 54,
+  :DHCPParameters                   => 55,
+  :DHCPMessage                      => 56,
+  :DHCPMaxDHCPMessageSize           => 57,
+  :DHCPRenewTimeValue               => 58,
+  :DHCPRebindingTimeValue           => 59,
+  :DHCPClassIdentifier              => 60,
+  :DHCPClientIdentifier             => 61,
+  :DHCPNetWareIPDomainName          => 62,
+  :DHCPNetWareIPInformation         => 63,
+  :DHCPNISClientDomain              => 64,
+  :DHCPNISServers                   => 65,
+  :DHCPTFTPServerName               => 66,
+  :DHCPBootFileName                 => 67,
+  :DHCPMobileIPHomeAgent            => 68,
+  :DHCPSMTPServer                   => 69,
+  :DHCPPOPServer                    => 70,
+  :DHCPNNTPServer                   => 71,
+  :DHCPDefaultWWWServer             => 72,
+  :DHCPDefaultFingerServer          => 73,
+  :DHCPDefaultIRCServer             => 74,
+  :DHCPStreetTalkServer             => 75,
+  :DHCPStreetTalkDAS                => 76,
+  :DHCPUserClassInformation         => 77,
+  :DHCPSLPDirectoryAgent            => 78,
+  :DHCPSLPServiceScope              => 79,
+  :DHCPRapidCommit                  => 80,
+  :DHCPFQDN                         => 81,
+  :DHCPRelayAgentInformation        => 82,
+  :DHCPInternetStorageNameService   => 83,
+  # ??
+  :DHCPNDSServers                   => 85,
+  :DHCPNDSTreeName                  => 86,
+  :DHCPNDSContext                   => 87,
+  :DHCPBCMCSContDomainNameList      => 88,
+  :DHCPBCMCSContIPV4AddressList     => 89,
+  :DHCPAuthentication               => 90,
+  :DHCPClientLastTransactTime       => 91,
+  :DHCPAssociatedIP                 => 92,
+  :DHCPClientSystemArchType         => 93,
+  :DHCPClientNetworkInterfaceIdent  => 94,
+  :DHCPLDAP                         => 95,
+  # ??
+  :DHCPClientMachineIdent           => 97,
+  :DHCPOGUA                         => 98,
+  # ??
+  :DHCPAutonomousSystemNumber       => 109,
+  # ??
+  :DHCPNetInfoParentServerAddress   => 112,
+  :DHCPNetInfoParentServerTag       => 113,
+  :DHCPURL                          => 114,
+  :DHCPAutoConfigure                => 116,
+  :DHCPNameServiceSearch            => 117,
+  :DHCPSubnetSelection              => 118,
+  :DHCPDNSDomainSearchList          => 119,
+  :DHCPSIPServers                   => 120,
+  :DHCPClasslessStaticRoute         => 121,
+  :DHCPCableLabsClientConfig        => 122,
+  :DHCPGeoConf                      => 123,
+  # ??
+  :DHCPProxyAutoDiscovery           => 252
+}
+
+OP_CONSTANTS_REV = {
+  0 => :Pad,
+  1 => :SubnetMask,
+  2 => :TimeOffset,
+  3 => :Router,
+  4 => :TimeServer,
+  5 => :NameServer,
+  6 => :DNS,
+  7 => :LogServer,
+  8 => :QuoteServer,
+  9 => :LPRServer,
+  10 => :ImpressServer,
+  11 => :RLServer,
+  12 => :HostName,
+  13 => :BootFileSize,
+  14 => :MeritDumpFile,
+  15 => :DomainName,
+  16 => :SwapServer,
+  17 => :RootPath,
+  18 => :ExtensionsPath,
+  19 => :IPForwarding,
+  20 => :NonLocalRouting,
+  21 => :PolicyFilter,
+  22 => :MaximumDRSize,
+  23 => :DefaultIPTTL,
+  24 => :PathMTUAgingTimeout,
+  25 => :PathMTUPlateauTable,
+  26 => :InterfaceMTU,
+  27 => :AllSubnetsLocal,
+  28 => :BroadcastAddress,
+  29 => :PerformMask,
+  30 => :MaskSupplier,
+  31 => :PerformRouter,
+  32 => :RouterSolicitation,
+  33 => :StaticRoutingEnable,
+  34 => :TrailerEncap,
+  35 => :ArpCacheTimeout,
+  36 => :EthernetEncap,
+  37 => :DefaultTCPTTL,
+  38 => :TCPKeepAliveInt,
+  39 => :TCPKeepAliveGB,
+  40 => :NISDomain,
+  41 => :NISServer,
+  42 => :NTPServers,
+  43 => :VendorSpecificInfo,
+  44 => :NetBIOSNameServer,
+  45 => :NetBIOSDDS,
+  46 => :NetBIOSNodeType,
+  47 => :NetBIOSScope,
+  48 => :XWindowSystemFont,
+  49 => :XWindowSystemDM,
+  50 => :RequestedIPAddress,
+  51 => :IPAddressLeaseTime,
+  52 => :OptionOverload,
+  53 => :MessageType,
+  54 => :ServerIdentifier,
+  55 => :Parameters,
+  56 => :Message,
+  57 => :MaxDHCPMessageSize,
+  58 => :RenewTimeValue,
+  59 => :RebindingTimeValue,
+  60 => :ClassIdentifier,
+  61 => :ClientIdentifier,
+  62 => :NetWareIPDomainName,
+  63 => :NetWareIPInformation,
+  64 => :NISClientDomain,
+  65 => :NISServers,
+  66 => :TFTPServerName,
+  67 => :BootFileName,
+  68 => :MobileIPHomeAgent,
+  69 => :SMTPServer,
+  70 => :POPServer,
+  71 => :NNTPServer,
+  72 => :DefaultWWWServer,
+  73 => :DefaultFingerServer,
+  74 => :DefaultIRCServer,
+  75 => :StreetTalkServer,
+  76 => :StreetTalkDAS,
+  77 => :UserClassInformation,
+  78 => :SLPDirectoryAgent,
+  79 => :SLPServiceScope,
+  80 => :RapidCommit,
+  81 => :FQDN,
+  82 => :RelayAgentInformation,
+  83 => :InternetStorageNameService,
+  # ??
+  85 => :NDSServers,
+  86 => :NDSTreeName,
+  87 => :NDSContext,
+  88 => :BCMCSContDomainNameList,
+  89 => :BCMCSContIPV4AddressList,
+  90 => :Authentication,
+  91 => :ClientLastTransactTime,
+  92 => :AssociatedIP,
+  93 => :ClientSystemArchType,
+  94 => :ClientNetworkInterfaceIdent,
+  95 => :LDAP,
+  # ??
+  97 => :ClientMachineIdent,
+  98 => :OGUA,
+  # ??
+  109 => :AutonomousSystemNumber,
+  # ??
+  112 => :NetInfoParentServerAddress,
+  113 => :NetInfoParentServerTag,
+  114 => :URL,
+  116 => :AutoConfigure,
+  117 => :NameServiceSearch,
+  118 => :SubnetSelection,
+  119 => :DNSDomainSearchList,
+  120 => :SIPServers,
+  121 => :ClasslessStaticRoute,
+  122 => :CableLabsClientConfig,
+  123 => :GeoConf,
+  252 => :ProxyAutoDiscovery
+}
+
+AUTH_PROTOCOLS = {
+  0 => "configuration token",
+  1 => "delayed authentication"
+}
+
+class Packet < Network::Protos::Base
+  uint8     :op
+  uint8     :htype
+  uint8     :hlen
+  uint8     :hops
+  uint32rev :xid
+  uint16    :secs
+  uint16    :flags
+  ip        :ciaddr
+  ip        :yiaddr
+  ip        :siaddr
+  ip        :giaddr
+  mac       :chaddr, :size => 16
+  bytes     :sname, :size => 64
+  bytes     :file, :size => 128
+  uint32    :isdhcp
+  bytes     :dhcpoptions
+
+  def type
+    self.each_option( :MessageType ) do |opt,data|
+      return OP_MESSAGETYPES[ data[0] ]
+    end
+    OP_MESSAGETYPES[ @op ]
+  end
+
+  def client_identifier
+    self.each_option( :ClientIdentifier ) do |opt,data|
+      return data.pack('c*')
+    end
+  end
+
+  def authentication
+    # Thank you Wireshark BOOTP dissector!
+    self.each_option( :Authentication ) do |opt,data|
+      auth = {}
+
+      auth['Protocol'] = AUTH_PROTOCOLS[ data[0] ]
+
+      if data[0] == 1
+        auth['Delay Algorithm'] = 'HMAC_MD5'
+      end
+
+      auth['Replay Detection Method']    = 'Monotonically-increasing counter'
+      auth['RDM Replay Detection Value'] = "0x" + data[3..10].map { |b| sprintf( "%02x", b ) }.join
+      auth['Secret ID']                  = "0x" + data[11..14].map { |b| sprintf( "%02x", b ) }.join
+      auth['HMAC MD5 Hash']              = data[15..data.size].map { |b| sprintf( "%02X", b ) }.join
+
+      return auth
+    end
+  end
+
+  def each_option sym = nil
+    offset = 0
+    limit = self.dhcpoptions.size
+
+    while offset < limit
+      opt     = self.dhcpoptions[offset]
+      break if opt == 0xFF
+      offset += 1
+      len     = self.dhcpoptions[offset]
+      break if len.nil?
+      offset += 1
+      data    = self.dhcpoptions[offset..offset+len-1]
+      offset += len
+
+      if sym.nil? or OP_CONSTANTS_REV[opt] == sym
+        yield( OP_CONSTANTS_REV[opt], data )
+      end
+    end
+  end
+
+  def transaction_id
+    sprintf( "0x%X", @xid )
+  end
+end
+
+end
+end
+end
+end