prepare dhcp decoding

4 files changed, 309 insertions, 2 deletions

diff --git a/libopie2/opienet/dhcp.h b/libopie2/opienet/dhcp.h
new file mode 100644
index 0000000..3f2f775
--- a/dev/null
+++ b/libopie2/opienet/dhcp.h
@@ -0,0 +1,200 @@
+/* dhcp.h
+
+   Protocol structures... */
+
+/*
+ * Copyright (c) 1995-2001 The Internet Software Consortium.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of The Internet Software Consortium nor the names
+ *    of its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND
+ * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This software has been written for the Internet Software Consortium
+ * by Ted Lemon in cooperation with Vixie Enterprises.  To learn more
+ * about the Internet Software Consortium, see ``http://www.isc.org''.
+ * To learn more about Vixie Enterprises, see ``http://www.vix.com''.
+ */
+
+#ifndef DHCP_H
+#define DHCP_H
+
+        #define DHCP_UDP_OVERHEAD       (14 + /* Ethernet header */     \
+                                         20 + /* IP header */           \
+                                 8)   /* UDP header */
+        #define DHCP_SNAME_LEN  64
+        #define DHCP_FILE_LEN   128
+        #define DHCP_FIXED_NON_UDP236
+        #define DHCP_FIXED_LEN  (DHCP_FIXED_NON_UDP + DHCP_UDP_OVERHEAD)
+                                                /* Everything but options. */
+        #define DHCP_MTU_MAX    1500
+        #define DHCP_OPTION_LEN         (DHCP_MTU_MAX - DHCP_FIXED_LEN)
+
+        #define BOOTP_MIN_LEN   300
+#define DHCP_MIN_LEN            548
+
+struct dhcp_packet {
+                u_int8_t  op;   /* 0: Message opcode/type */
+                u_int8_t  htype;/* 1: Hardware addr type (net/if_types.h) */
+                u_int8_t  hlen;         /* 2: Hardware addr length */
+                u_int8_t  hops;         /* 3: Number of relay agent hops from client */
+                u_int32_t xid;  /* 4: Transaction ID */
+                u_int16_t secs;         /* 8: Seconds since client started looking */
+                u_int16_t flags;/* 10: Flag bits */
+                struct in_addr ciaddr;/* 12: Client IP address (if already in use) */
+                struct in_addr yiaddr;/* 16: Client IP address */
+                struct in_addr siaddr;/* 18: IP address of next server to talk to */
+                struct in_addr giaddr;/* 20: DHCP relay agent IP address */
+                unsigned char chaddr [16];/* 24: Client hardware address */
+                char sname [DHCP_SNAME_LEN];/* 40: Server name */
+                char file [DHCP_FILE_LEN];/* 104: Boot filename */
+        unsigned char options [DHCP_OPTION_LEN];
+                                /* 212: Optional parameters
+                                   (actual length dependent on MTU). */
+};
+
+/* BOOTP (rfc951) message types */
+        #define         BOOTREQUEST1
+        #define BOOTREPLY2
+
+/* Possible values for flags field... */
+#define BOOTP_BROADCAST 32768L
+
+/* Possible values for hardware type (htype) field... */
+        #define HTYPE_ETHER1               /* Ethernet 10Mbps              */
+        #define HTYPE_IEEE802   6               /* IEEE 802.2 Token Ring...*/
+        #define HTYPE_FDDI      8               /* FDDI...              */
+
+/* Magic cookie validating dhcp options field (and bootp vendor
+   extensions field). */
+        #define DHCP_OPTIONS_COOKIE"\143\202\123\143"
+
+/* DHCP Option codes: */
+
+        #define DHO_PAD                         0
+        #define DHO_SUBNET_MASK                 1
+        #define DHO_TIME_OFFSET                 2
+        #define DHO_ROUTERS             3
+        #define DHO_TIME_SERVERS        4
+        #define DHO_NAME_SERVERS        5
+        #define DHO_DOMAIN_NAME_SERVERS         6
+        #define DHO_LOG_SERVERS                 7
+        #define DHO_COOKIE_SERVERS      8
+        #define DHO_LPR_SERVERS                 9
+        #define DHO_IMPRESS_SERVERS     10
+        #define DHO_RESOURCE_LOCATION_SERVERS11
+        #define DHO_HOST_NAME           12
+        #define DHO_BOOT_SIZE           13
+        #define DHO_MERIT_DUMP          14
+        #define DHO_DOMAIN_NAME                 15
+        #define DHO_SWAP_SERVER                 16
+        #define DHO_ROOT_PATH           17
+        #define DHO_EXTENSIONS_PATH     18
+        #define DHO_IP_FORWARDING       19
+        #define DHO_NON_LOCAL_SOURCE_ROUTING20
+        #define DHO_POLICY_FILTER       21
+        #define DHO_MAX_DGRAM_REASSEMBLY22
+        #define DHO_DEFAULT_IP_TTL      23
+        #define DHO_PATH_MTU_AGING_TIMEOUT24
+        #define DHO_PATH_MTU_PLATEAU_TABLE25
+        #define DHO_INTERFACE_MTU       26
+        #define DHO_ALL_SUBNETS_LOCAL   27
+        #define DHO_BROADCAST_ADDRESS   28
+        #define DHO_PERFORM_MASK_DISCOVERY29
+        #define DHO_MASK_SUPPLIER       30
+        #define DHO_ROUTER_DISCOVERY    31
+        #define DHO_ROUTER_SOLICITATION_ADDRESS32
+        #define DHO_STATIC_ROUTES       33
+        #define DHO_TRAILER_ENCAPSULATION34
+        #define DHO_ARP_CACHE_TIMEOUT   35
+        #define DHO_IEEE802_3_ENCAPSULATION36
+        #define DHO_DEFAULT_TCP_TTL     37
+        #define DHO_TCP_KEEPALIVE_INTERVAL38
+        #define DHO_TCP_KEEPALIVE_GARBAGE39
+        #define DHO_NIS_DOMAIN          40
+        #define DHO_NIS_SERVERS                 41
+        #define DHO_NTP_SERVERS                 42
+        #define DHO_VENDOR_ENCAPSULATED_OPTIONS43
+        #define DHO_NETBIOS_NAME_SERVERS44
+        #define DHO_NETBIOS_DD_SERVER   45
+        #define DHO_NETBIOS_NODE_TYPE   46
+        #define DHO_NETBIOS_SCOPE       47
+        #define DHO_FONT_SERVERS        48
+        #define DHO_X_DISPLAY_MANAGER   49
+        #define DHO_DHCP_REQUESTED_ADDRESS50
+        #define DHO_DHCP_LEASE_TIME     51
+        #define DHO_DHCP_OPTION_OVERLOAD52
+        #define DHO_DHCP_MESSAGE_TYPE   53
+        #define DHO_DHCP_SERVER_IDENTIFIER54
+        #define DHO_DHCP_PARAMETER_REQUEST_LIST55
+        #define DHO_DHCP_MESSAGE        56
+        #define DHO_DHCP_MAX_MESSAGE_SIZE57
+        #define DHO_DHCP_RENEWAL_TIME   58
+        #define DHO_DHCP_REBINDING_TIME         59
+        #define DHO_VENDOR_CLASS_IDENTIFIER60
+        #define DHO_DHCP_CLIENT_IDENTIFIER61
+        #define DHO_NWIP_DOMAIN_NAME    62
+        #define DHO_NWIP_SUBOPTIONS     63
+        #define DHO_USER_CLASS          77
+        #define DHO_FQDN                81
+        #define DHO_DHCP_AGENT_OPTIONS  82
+        #define DHO_SUBNET_SELECTION    118 /* RFC3011! */
+/* The DHO_AUTHENTICATE option is not a standard yet, so I've
+   allocated an option out of the "local" option space for it on a
+   temporary basis.  Once an option code number is assigned, I will
+   immediately and shamelessly break this, so don't count on it
+   continuing to work. */
+        #define DHO_AUTHENTICATE        210
+
+        #define DHO_END                         255
+
+/* DHCP message types. */
+        #define DHCPDISCOVER1
+        #define DHCPOFFER2
+        #define DHCPREQUEST3
+        #define DHCPDECLINE4
+        #define DHCPACK         5
+        #define DHCPNAK         6
+        #define DHCPRELEASE7
+        #define DHCPINFORM8
+
+/* Relay Agent Information option subtypes: */
+        #define RAI_CIRCUIT_ID1
+        #define RAI_REMOTE_ID2
+        #define RAI_AGENT_ID3
+
+/* FQDN suboptions: */
+        #define FQDN_NO_CLIENT_UPDATE   1
+        #define FQDN_SERVER_UPDATE      2
+        #define FQDN_ENCODED            3
+        #define FQDN_RCODE1             4
+        #define FQDN_RCODE2             5
+        #define FQDN_HOSTNAME           6
+        #define FQDN_DOMAINNAME                 7
+        #define FQDN_FQDN               8
+        #define FQDN_SUBOPTION_COUNT    8
+
+#endif
\ No newline at end of file
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 1de7124..cc8ce7f 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -263,214 +263,293 @@ int OIPPacket::id() const
 
 int OIPPacket::offset() const
 {
     return EXTRACT_16BITS( &_iphdr->frag_off );
 }
 
 
 int OIPPacket::ttl() const
 {
     return _iphdr->ttl;
 }
 
 
 int OIPPacket::protocol() const
 {
     return _iphdr->protocol;
 }
 
 
 int OIPPacket::checksum() const
 {
     return EXTRACT_16BITS( &_iphdr->check );
 }
 
 /*======================================================================================
  * OARPPacket
  *======================================================================================*/
 
 
 OARPPacket::OARPPacket( const unsigned char* end, const struct myarphdr* data, QObject* parent )
            :QObject( parent, "ARP" ), _arphdr( data )
 {
     qDebug( "OARPPacket::OARPPacket(): decoding ARP header..." );
     qDebug( "ARP type seems to be %02d - '%s'", EXTRACT_16BITS( &_arphdr->ar_op ), (const char*) type() );
     qDebug( "Sender: MAC %s = IP %s", (const char*) senderMacAddress().toString(), (const char*) senderIPV4Address().toString() );
     qDebug( "Target: MAC %s = IP %s", (const char*) targetMacAddress().toString(), (const char*) targetIPV4Address().toString() );
 }
 
 
 OARPPacket::~OARPPacket()
 {
 }
 
 
 QString OARPPacket::type() const
 {
     switch ( EXTRACT_16BITS( &_arphdr->ar_op ) )
     {
         case 1: return "REQUEST";
         case 2: return "REPLY";
         case 3: return "RREQUEST";
         case 4: return "RREPLY";
         case 8: return "InREQUEST";
         case 9: return "InREPLY";
         case 10: return "NAK";
         default: qWarning( "OARPPacket::type(): invalid ARP type!" ); return "<unknown>";
     }
 }
 
 
 QHostAddress OARPPacket::senderIPV4Address() const
 {
     return EXTRACT_32BITS( &_arphdr->ar_sip );
 }
 
 
 QHostAddress OARPPacket::targetIPV4Address() const
 {
     return EXTRACT_32BITS( &_arphdr->ar_tip );
 }
 
 
 OMacAddress OARPPacket::senderMacAddress() const
 {
     return OMacAddress( _arphdr->ar_sha );
 }
 
 
 OMacAddress OARPPacket::targetMacAddress() const
 {
     return OMacAddress( _arphdr->ar_tha );
 }
 
 
 /*======================================================================================
  * OUDPPacket
  *======================================================================================*/
 
 
 OUDPPacket::OUDPPacket( const unsigned char* end, const struct udphdr* data, QObject* parent )
            :QObject( parent, "UDP" ), _udphdr( data )
 
 {
     qDebug( "OUDPPacket::OUDPPacket(): decoding UDP header..." );
 }
 
+
 OUDPPacket::~OUDPPacket()
 {
 }
 
 
+int OUDPPacket::fromPort() const
+{
+    return _udphdr->source;
+}
+
+
+int OUDPPacket::toPort() const
+{
+    return _udphdr->dest;
+}
+
+
+int OUDPPacket::length() const
+{
+    return _udphdr->len;
+}
+
+
+int OUDPPacket::checksum() const
+{
+    return _udphdr->check;
+}
+
+
+/*======================================================================================
+ * ODHCPPacket
+ *======================================================================================*/
+
+
+ODHCPPacket::ODHCPPacket( const unsigned char* end, const struct dhcp_packet* data, QObject* parent )
+           :QObject( parent, "DHCP" ), _dhcphdr( data )
+
+{
+    qDebug( "ODHCPPacket::ODHCPPacket(): decoding DHCP information..." );
+}
+
+
+ODHCPPacket::~ODHCPPacket()
+{
+}
+
+
 /*======================================================================================
  * OTCPPacket
  *======================================================================================*/
 
 
 OTCPPacket::OTCPPacket( const unsigned char* end, const struct tcphdr* data, QObject* parent )
            :QObject( parent, "TCP" ), _tcphdr( data )
 
 {
     qDebug( "OTCPPacket::OTCPPacket(): decoding TCP header..." );
 }
 
+
 OTCPPacket::~OTCPPacket()
 {
 }
 
 
+int OTCPPacket::fromPort() const
+{
+    return _tcphdr->source;
+}
+
+
+int OTCPPacket::toPort() const
+{
+    return _tcphdr->dest;
+}
+
+
+int OTCPPacket::seq() const
+{
+    return _tcphdr->seq;
+}
+
+
+int OTCPPacket::ack() const
+{
+    return _tcphdr->ack_seq;
+}
+
+
+int OTCPPacket::window() const
+{
+    return _tcphdr->window;
+}
+
+
+int OTCPPacket::checksum() const
+{
+    return _tcphdr->check;
+}
+
 /*======================================================================================
  * OPrismHeaderPacket
  *======================================================================================*/
 
 
 OPrismHeaderPacket::OPrismHeaderPacket( const unsigned char* end, const struct prism_hdr* data, QObject* parent )
                 :QObject( parent, "Prism" ), _header( data )
 
 {
     qDebug( "OPrismHeaderPacket::OPrismHeaderPacket(): decoding PRISM header..." );
 
     qDebug( "Signal Strength = %d", data->signal.data );
 
     new OWaveLanPacket( end, (const struct ieee_802_11_header*) (data+1), this );
 }
 
 OPrismHeaderPacket::~OPrismHeaderPacket()
 {
 }
 
 
 unsigned int OPrismHeaderPacket::signalStrength() const
 {
     return _header->signal.data;
 }
 
 /*======================================================================================
  * OWaveLanPacket
  *======================================================================================*/
 
 
 OWaveLanPacket::OWaveLanPacket( const unsigned char* end, const struct ieee_802_11_header* data, QObject* parent )
                 :QObject( parent, "802.11" ), _wlanhdr( data )
 
 {
     qDebug( "OWaveLanPacket::OWaveLanPacket(): decoding IEEE 802.11 header..." );
     qDebug( "type: %0X", type() );
     qDebug( "subType: %0X", subType() );
     qDebug( "duration: %d", duration() );
     qDebug( "powermanagement: %d", usesPowerManagement() );
     qDebug( "payload is encrypted: %s", usesWep() ? "yes" : "no" );
     qDebug( "MAC1: %s", (const char*) macAddress1().toString() );
     qDebug( "MAC2: %s", (const char*) macAddress2().toString() );
     qDebug( "MAC3: %s", (const char*) macAddress3().toString() );
     qDebug( "MAC4: %s", (const char*) macAddress4().toString() );
 
     switch ( type() )
     {
         case T_MGMT: new OWaveLanManagementPacket( end, (const struct ieee_802_11_mgmt_header*) data, this ); break;
         case T_DATA: new OWaveLanDataPacket( end, (const struct ieee_802_11_data_header*) data, this ); break;
         case T_CTRL: new OWaveLanControlPacket( end, (const struct ieee_802_11_control_header*) data, this ); break;
         default: qDebug( "OWaveLanPacket::OWaveLanPacket(): Warning: Unknown major type '%d'!", type() );
     }
 }
 
 OWaveLanPacket::~OWaveLanPacket()
 {
 }
 
 
 int OWaveLanPacket::duration() const
 {
     return _wlanhdr->duration;
 }
 
 
 OMacAddress OWaveLanPacket::macAddress1() const
 {
     return OMacAddress( _wlanhdr->mac1 );
 }
 
 
 OMacAddress OWaveLanPacket::macAddress2() const
 {
     return OMacAddress( _wlanhdr->mac2 );
 }
 
 
 OMacAddress OWaveLanPacket::macAddress3() const
 {
     return OMacAddress( _wlanhdr->mac3 );
 }
 
 
 OMacAddress OWaveLanPacket::macAddress4() const
 {
     return OMacAddress( _wlanhdr->mac4 );
 }
 
 
 int OWaveLanPacket::subType() const
 {
     return FC_SUBTYPE( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) );
 }
 
 
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index 9119972..0c9e7da 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -1,154 +1,157 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 by the Wellenreiter team:
                              Martin J. Muench <mjm@remote-exploit.org>
                              Max Moser <mmo@remote-exploit.org
                              Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef OPCAP_H
 #define OPCAP_H
 
 /* LINUX */
 extern "C"  // work around a bpf/pcap conflict in recent headers
 {
     #include <pcap.h>
 }
 #include <netinet/ether.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <netinet/tcp.h>
 #include <time.h>
 
 /* QT */
 #include <qevent.h>
 #include <qfile.h>
 #include <qhostaddress.h>
 #include <qobject.h>
 #include <qstring.h>
 #include <qmap.h>
 
 /* OPIE */
 #include <opie2/onetutils.h>
+
+/* Custom Network Includes */
 #include "802_11_user.h"
+#include "dhcp.h"
 
 /* TYPEDEFS */
 typedef struct timeval timevalstruct;
 typedef struct pcap_pkthdr packetheaderstruct;
 
 /* FORWARDS */
 class OPacketCapturer;
 class QSocketNotifier;
 
 /*======================================================================================
  * OPacket - A frame on the wire
  *======================================================================================*/
 
 /** @brief A class representing a data frame on the wire.
  *
  * The whole family of the packet classes are used when capturing frames from a network.
  * Most standard network protocols in use share a common architecture, which mostly is
  * a packet header and then the packet payload. In layered architectures, each lower layer
  * encapsulates data from its upper layer - that is it
  * treats the data from its upper layer as payload and prepends an own header to the packet,
  * which - again - is treated as the payload for the layer below. The figure below is an
  * example for how such a data frame is composed out of packets, e.g. when sending a mail.
  *
  * <pre>
  *                                                       | User Data |     == Mail Data
  *                                         | SMTP Header | User Data |     == SMTP
  *                           | TCP Header  | SMTP Header | User Data |     == TCP
  *               | IP Header | TCP Header  | SMTP Header | User Data |     == IP
  *  | MAC Header | IP Header | TCP Header  | SMTP Header | User Data |     == MAC
  *
  * </pre>
  *
  * The example is trimmed for simplicity, because the MAC (Medium Access Control) layer
  * also contains a few more levels of encapsulation.
  * Since the type of the payload is more or less independent from the encapsulating protocol,
  * the header must be inspected before attempting to decode the payload. Hence, the
  * encapsulation level varies and can't be deduced without actually looking into the packets.
  *
  * For actually working with captured frames, it's useful to identify the packets via names and
  * insert them into a parent/child - relationship based on the encapsulation. This is why
  * all packet classes derive from QObject. The amount of overhead caused by the QObject is
  * not a problem in this case, because we're talking about a theoratical maximum of about
  * 10 packets per captured frame. We need to stuff them into a searchable list anyway and the
  * QObject also cares about destroying the sub-, (child-) packets.
  *
  * This enables us to perform a simple look for packets of a certain type:
  * @code
  * OPacketCapturer* pcap = new OPacketCapturer();
  * pcap->open( "eth0" );
  * OPacket* p = pcap->next();
  * OIPPacket* ip = (OIPPacket*) p->child( "IP" ); // returns 0, if no such child exists
  * odebug << "got ip packet from " << ip->fromIPAddress().toString() << " to " << ip->toIPAddress().toString() << oendl;
  *
  */
 
 class OPacket : public QObject
 {
   Q_OBJECT
 
   friend class OPacketCapturer;
 
   public:
     OPacket( int datalink, packetheaderstruct, const unsigned char*, QObject* parent );
     virtual ~OPacket();
 
     timevalstruct timeval() const;
 
     int caplen() const;
     int len() const;
     QString dump( int = 32 ) const;
 
     void updateStats( QMap<QString,int>&, QObjectList* );
 
   private:
     const packetheaderstruct _hdr;  // pcap packet header
     const unsigned char* _data;     // pcap packet data
     const unsigned char* _end;      // end of pcap packet data
 };
 
 /*======================================================================================
  * OEthernetPacket - DLT_EN10MB frame
  *======================================================================================*/
 
 class OEthernetPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OEthernetPacket( const unsigned char*, const struct ether_header*, QObject* parent = 0 );
     virtual ~OEthernetPacket();
 
     OMacAddress sourceAddress() const;
     OMacAddress destinationAddress() const;
     int type() const;
 
   private:
@@ -384,226 +387,249 @@ class OWaveLanDataPacket : public QObject
  * OWaveLanControlPacket - type: control (T_CTRL)
  *======================================================================================*/
 
 class OWaveLanControlPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanControlPacket( const unsigned char*, const struct ieee_802_11_control_header*, OWaveLanPacket* parent = 0 );
     virtual ~OWaveLanControlPacket();
 
   private:
     const struct ieee_802_11_control_header* _header;
 };
 
 /*======================================================================================
  * OLLCPacket - IEEE 802.2 Link Level Control
  *======================================================================================*/
 
 class OLLCPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OLLCPacket( const unsigned char*, const struct ieee_802_11_802_2_header* data, QObject* parent = 0 );
     virtual ~OLLCPacket();
 
   private:
     const struct ieee_802_11_802_2_header* _header;
 };
 
 /*======================================================================================
  * OIPPacket
  *======================================================================================*/
 
 class OIPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OIPPacket( const unsigned char*, const struct iphdr*, QObject* parent = 0 );
     virtual ~OIPPacket();
 
     QHostAddress fromIPAddress() const;
     QHostAddress toIPAddress() const;
 
     int tos() const;
     int len() const;
     int id() const;
     int offset() const;
     int ttl() const;
     int protocol() const;
     int checksum() const;
 
   private:
     const struct iphdr* _iphdr;
 };
 
 /*======================================================================================
  * OARPPacket
  *======================================================================================*/
 
 class OARPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OARPPacket( const unsigned char*, const struct myarphdr*, QObject* parent = 0 );
     virtual ~OARPPacket();
 
     QHostAddress senderIPV4Address() const;
     OMacAddress senderMacAddress() const;
     QHostAddress targetIPV4Address() const;
     OMacAddress targetMacAddress() const;
 
     //int type() const;
     QString type() const;
 
   private:
     const struct myarphdr* _arphdr;
 };
 
 /*======================================================================================
  * OUDPPacket
  *======================================================================================*/
 
 class OUDPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OUDPPacket( const unsigned char*, const struct udphdr*, QObject* parent = 0 );
     virtual ~OUDPPacket();
 
     int fromPort() const;
     int toPort() const;
+    int length() const;
+    int checksum() const;
 
   private:
     const struct udphdr* _udphdr;
 };
 
 /*======================================================================================
+ * ODHCPPacket
+ *======================================================================================*/
+
+class ODHCPPacket : public QObject
+{
+  Q_OBJECT
+
+  public:
+    ODHCPPacket( const unsigned char*, const struct dhcp_packet*, QObject* parent = 0 );
+    virtual ~ODHCPPacket();
+
+  private:
+    const struct dhcp_packet* _dhcphdr;
+};
+
+/*======================================================================================
  * OTCPPacket
  *======================================================================================*/
 
 class OTCPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OTCPPacket( const unsigned char*, const struct tcphdr*, QObject* parent = 0 );
     virtual ~OTCPPacket();
 
     int fromPort() const;
     int toPort() const;
+    int seq() const;
+    int ack() const;
+    int window() const;
+    int checksum() const;
 
   private:
     const struct tcphdr* _tcphdr;
 };
 
 
 /*======================================================================================
  * OPacketCapturer
  *======================================================================================*/
 
 /**
  * @brief A class based wrapper for network packet capturing.
  *
  * This class is the base of a high-level interface to the well known packet capturing
- * library libpcap. ...
+ * library libpcap.
+ * @see http://tcpdump.org
  */
 class OPacketCapturer : public QObject
 {
   Q_OBJECT
 
   public:
     /**
      * Constructor.
      */
     OPacketCapturer( QObject* parent = 0, const char* name = 0 );
     /**
      * Destructor.
      */
     ~OPacketCapturer();
     /**
      * Set the packet capturer to use blocking or non-blocking IO. This can be useful when
      * not using the socket notifier, e.g. without an application object.
      */
     void setBlocking( bool );
     /**
      * @returns true if the packet capturer uses blocking IO calls.
      */
     bool blocking() const;
     /**
      * Close the packet capturer. This is automatically done in the destructor.
      */
     void close();
     /**
      * Close the output capture file.
      */
     void closeDumpFile();
     /**
      * @returns the data link type.
      * @see <pcap.h> for possible values.
      */
     int dataLink() const;
     /**
      * Dump a packet to the output capture file.
      */
     void dump( OPacket* );
     /**
      * @returns the file descriptor of the packet capturer. This is only useful, if
      * not using the socket notifier, e.g. without an application object.
      */
     int fileno() const;
     /**
      * @returns the next @ref OPacket from the packet capturer.
      * @note If blocking mode is true then this call might block.
      */
     OPacket* next();
     /**
      * Open the packet capturer to capture packets in live-mode from @a interface.
      */
     bool open( const QString& interface );
     /**
      * Open the packet capturer to capture packets in offline-mode from @a file.
      */
     bool open( const QFile& file );
     /**
      * Open a prerecorded tcpdump compatible capture file for use with @ref dump()
      */
     bool openDumpFile( const QString& filename );
     /**
      * @returns true if the packet capturer is open
      */
     bool isOpen() const;
     /**
      * @returns the snapshot length of this packet capturer
      */
     int snapShot() const;
     /**
      * @returns true if the input capture file has a different byte-order
      * than the byte-order of the running system.
      */
     bool swapped() const;
     /**
      * @returns the libpcap version string used to write the input capture file.
      */
     QString version() const;
     /**
      * @returns the packet statistic database.
      * @see QMap
      */
     const QMap<QString,int>& statistics() const;
 
   signals:
     /**
      * This signal is emitted, when a packet has been received.
      */
     void receivedPacket( OPacket* );
 
   protected slots:
     void readyToReceive();
 
   protected:
     QString _name;                                  // devicename
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index 93389db..7a7adde 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -1,28 +1,30 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
-HEADERS     = omanufacturerdb.cpp \
+HEADERS     = 802_11_user.h       \
+              dhcp.h              \
+              omanufacturerdb.cpp \
               onetutils.cpp       \
               onetwork.h          \
               opcap.h
 SOURCES     = omanufacturerdb.cpp \
               onetutils.cpp       \
               onetwork.cpp        \
               opcap.cpp
 INTERFACES  =
 TARGET      = opienet2
 VERSION     = 1.8.1
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lpcap
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
 
 !contains( platform, x11 ) {
   include ( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
   LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }