- fix off-by-one bug in OChannelHopper

- fix bug in OPacket which broke everything using it
- expose both wireless extension versions (runtime + compile time) through API

3 files changed, 18 insertions, 8 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index b6c9876..e141097 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -58,129 +58,129 @@
 #ifndef NODEBUG

 #include <opie2/odebugmapper.h>

 

 

 using namespace Opie::Core;

 using namespace Opie::Net::Internal;

 DebugMapper* debugmapper = new DebugMapper();

 #endif

 

 /*======================================================================================

  * ONetwork

  *======================================================================================*/

 

 namespace Opie {

 namespace Net  {

 ONetwork* ONetwork::_instance = 0;

 

 ONetwork::ONetwork()

 {

     odebug << "ONetwork::ONetwork()" << oendl;

     odebug << "ONetwork: This code has been compiled against Wireless Extensions V" << WIRELESS_EXT << oendl;

     synchronize();

 }

 

 void ONetwork::synchronize()

 {

     // gather available interfaces by inspecting /proc/net/dev

     //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices

     //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices

     //FIXME: Best is use SIOCGIFCONF and if this doesn't work (result=-1), then fallback to parsing /proc/net/dev

 

     _interfaces.clear();

     QString str;

     QFile f( "/proc/net/dev" );

     bool hasFile = f.open( IO_ReadOnly );

     if ( !hasFile )

     {

         odebug << "ONetwork: /proc/net/dev not existing. No network devices available" << oendl;

         return;

     }

     QTextStream s( &f );

     s.readLine();

     s.readLine();

     while ( !s.atEnd() )

     {

         s >> str;

         str.truncate( str.find( ':' ) );

         odebug << "ONetwork: found interface '" << str << "'" << oendl;

         ONetworkInterface* iface = 0;

         if ( isWirelessInterface( str ) )

         {

             iface = new OWirelessNetworkInterface( this, (const char*) str );

             odebug << "ONetwork: interface '" << str << "' has Wireless Extensions" << oendl;

         }

         else

         {

             iface = new ONetworkInterface( this, (const char*) str );

         }

         _interfaces.insert( str, iface );

         s.readLine();

     }

 }

 

 

-short ONetwork::wirelessExtensionVersion()

+short ONetwork::wirelessExtensionCompileVersion()

 {

     return WIRELESS_EXT;

 }

 

 

 int ONetwork::count() const

 {

     return _interfaces.count();

 }

 

 

 ONetworkInterface* ONetwork::interface( const QString& iface ) const

 {

     return _interfaces[iface];

 }

 

 

 ONetwork* ONetwork::instance()

 {

     if ( !_instance ) _instance = new ONetwork();

     return _instance;

 }

 

 

 ONetwork::InterfaceIterator ONetwork::iterator() const

 {

     return ONetwork::InterfaceIterator( _interfaces );

 }

 

 

 bool ONetwork::isPresent( const char* name ) const

 {

     int sfd = socket( AF_INET, SOCK_STREAM, 0 );

     struct ifreq ifr;

     memset( &ifr, 0, sizeof( struct ifreq ) );

     strcpy( (char*) &ifr.ifr_name, name );

     int result = ::ioctl( sfd, SIOCGIFFLAGS, &ifr );

     return result != -1;

 }

 

 

 bool ONetwork::isWirelessInterface( const char* name ) const

 {

     int sfd = socket( AF_INET, SOCK_STREAM, 0 );

     struct iwreq iwr;

     memset( &iwr, 0, sizeof( struct iwreq ) );

     strcpy( (char*) &iwr.ifr_name, name );

     int result = ::ioctl( sfd, SIOCGIWNAME, &iwr );

     return result != -1;

 }

 

 /*======================================================================================

  * ONetworkInterface

  *======================================================================================*/

 

 ONetworkInterface::ONetworkInterface( QObject* parent, const char* name )

                  :QObject( parent, name ),

                  _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 )

 {

     odebug << "ONetworkInterface::ONetworkInterface()" << oendl;

     init();

 }

 

 

@@ -321,146 +321,145 @@ QString ONetworkInterface::ipV4Netmask() const
 

 int ONetworkInterface::dataLinkType() const

 {

     if ( ioctl( SIOCGIFHWADDR ) )

     {

         return _ifr.ifr_hwaddr.sa_family;

     }

     else

     {

         return -1;

     }

 }

 

 

 void ONetworkInterface::setMonitoring( OMonitoringInterface* m )

 {

     _mon = m;

     odebug << "ONetwork::setMonitoring(): Installed monitoring driver '" << m->name() << "' on interface '" << name() << "'" << oendl;

 }

 

 

 OMonitoringInterface* ONetworkInterface::monitoring() const

 {

     return _mon;

 }

 

 

 ONetworkInterface::~ONetworkInterface()

 {

     odebug << "ONetworkInterface::~ONetworkInterface()" << oendl;

     if ( _sfd != -1 ) ::close( _sfd );

 }

 

 

 bool ONetworkInterface::setPromiscuousMode( bool b )

 {

     ioctl( SIOCGIFFLAGS );

     if ( b ) _ifr.ifr_flags |= IFF_PROMISC;

     else   _ifr.ifr_flags &= (~IFF_PROMISC);

     return ioctl( SIOCSIFFLAGS );

 }

 

 

 bool ONetworkInterface::promiscuousMode() const

 {

     ioctl( SIOCGIFFLAGS );

     return _ifr.ifr_flags & IFF_PROMISC;

 }

 

 

 bool ONetworkInterface::isWireless() const

 {

     return ioctl( SIOCGIWNAME );

 }

 

 

 /*======================================================================================

  * OChannelHopper

  *======================================================================================*/

 

 OChannelHopper::OChannelHopper( OWirelessNetworkInterface* iface )

                :QObject( 0, "Mickey's funky hopper" ),

                _iface( iface ), _interval( 0 ), _tid( 0 )

 {

-    int _maxChannel = iface->channels()+1;

+    int _maxChannel = iface->channels();

     // generate fancy hopping sequence honoring the device capabilities

     if ( _maxChannel >=  1 ) _channels.append(  1 );

     if ( _maxChannel >=  7 ) _channels.append(  7 );

     if ( _maxChannel >= 13 ) _channels.append( 13 );

     if ( _maxChannel >=  2 ) _channels.append(  2 );

     if ( _maxChannel >=  8 ) _channels.append(  8 );

     if ( _maxChannel >=  3 ) _channels.append(  3 );

     if ( _maxChannel >= 14 ) _channels.append( 14 );

     if ( _maxChannel >=  9 ) _channels.append(  9 );

     if ( _maxChannel >=  4 ) _channels.append(  4 );

     if ( _maxChannel >= 10 ) _channels.append( 10 );

     if ( _maxChannel >=  5 ) _channels.append(  5 );

     if ( _maxChannel >= 11 ) _channels.append( 11 );

     if ( _maxChannel >=  6 ) _channels.append(  6 );

     if ( _maxChannel >= 12 ) _channels.append( 12 );

     _channel = _channels.begin();

-

 }

 

 

 OChannelHopper::~OChannelHopper()

 {

 }

 

 

 bool OChannelHopper::isActive() const

 {

     return _tid;

 }

 

 

 int OChannelHopper::channel() const

 {

     return *_channel;

 }

 

 

 void OChannelHopper::timerEvent( QTimerEvent* )

 {

     _iface->setChannel( *_channel );

     emit( hopped( *_channel ) );

     odebug << "OChannelHopper::timerEvent(): set channel " << *_channel << " on interface '" << _iface->name() << "'" << oendl;

     if ( ++_channel == _channels.end() ) _channel = _channels.begin();

 }

 

 

 void OChannelHopper::setInterval( int interval )

 {

     if ( interval == _interval )

         return;

 

     if ( _interval )

         killTimer( _tid );

 

     _tid = 0;

     _interval = interval;

 

     if ( _interval )

     {

         _tid = startTimer( interval );

     }

 }

 

 

 int OChannelHopper::interval() const

 {

     return _interval;

 }

 

 

 /*======================================================================================

  * OWirelessNetworkInterface

  *======================================================================================*/

 

 OWirelessNetworkInterface::OWirelessNetworkInterface( QObject* parent, const char* name )

                          :ONetworkInterface( parent, name ), _hopper( 0 )

 {

     odebug << "OWirelessNetworkInterface::OWirelessNetworkInterface()" << oendl;

     init();

 }

 

@@ -500,138 +499,145 @@ OMacAddress OWirelessNetworkInterface::associatedAP() const
     else

         return OMacAddress::unknown;

 }

 

 

 void OWirelessNetworkInterface::buildInformation()

 {

     //ML: If you listen carefully enough, you can hear lots of WLAN drivers suck

     //ML: The HostAP drivers need more than sizeof struct_iw range to complete

     //ML: SIOCGIWRANGE otherwise they fail with "Invalid Argument Length".

     //ML: The Wlan-NG drivers on the otherside fail (segfault!) if you allocate

     //ML: _too much_ space. This is damn shitty crap *sigh*

     //ML: We allocate a large memory region in RAM and check whether the

     //ML: driver pollutes this extra space. The complaint will be made on stdout,

     //ML: so please forward this...

 

     struct iwreq wrq;

     int len = sizeof( struct iw_range )*2;

     char *buffer = (char*) malloc( len );

     //FIXME: Validate if we actually got the memory block

     memset( buffer, 0, len );

     memcpy( wrq.ifr_name, name(), IFNAMSIZ);

     wrq.u.data.pointer = (caddr_t) buffer;

     wrq.u.data.length = sizeof( struct iw_range );

     wrq.u.data.flags = 0;

 

     if ( ::ioctl( _sfd, SIOCGIWRANGE, &wrq ) == -1 )

     {

         owarn << "OWirelessNetworkInterface::buildInformation(): Can't get channel information - using default values." << oendl;

         _channels.insert( 2412,  1 ); // 2.412 GHz

         _channels.insert( 2417,  2 ); // 2.417 GHz

         _channels.insert( 2422,  3 ); // 2.422 GHz

         _channels.insert( 2427,  4 ); // 2.427 GHz

         _channels.insert( 2432,  5 ); // 2.432 GHz

         _channels.insert( 2437,  6 ); // 2.437 GHz

         _channels.insert( 2442,  7 ); // 2.442 GHz

         _channels.insert( 2447,  8 ); // 2.447 GHz

         _channels.insert( 2452,  9 ); // 2.452 GHz

         _channels.insert( 2457, 10 ); // 2.457 GHz

         _channels.insert( 2462, 11 ); // 2.462 GHz

 

         memset( &_range, 0, sizeof( struct iw_range ) );

     }

     else

     {

         // <check if the driver overwrites stuff>

         int max = 0;

         for ( int r = sizeof( struct iw_range ); r < len; r++ )

             if (buffer[r] != 0)

                 max = r;

         if (max > 0)

         {

             owarn << "OWirelessNetworkInterface::buildInformation(): Driver for wireless interface '" << name()

                   << "' sucks! It overwrote the buffer end with at least " << max - sizeof( struct iw_range ) << " bytes!" << oendl;

         }

         // </check if the driver overwrites stuff>

 

         struct iw_range range;

         memcpy( &range, buffer, sizeof range );

 

         odebug << "OWirelessNetworkInterface::buildInformation(): Interface reported to have " << (int) range.num_frequency << " channels." << oendl;

         for ( int i = 0; i < range.num_frequency; ++i )

         {

             int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 );

+            odebug << "OWirelessNetworkInterface::buildInformation: Adding frequency " << freq << " as channel " << i+1 << oendl;

             _channels.insert( freq, i+1 );

         }

     }

 

     memcpy( &_range, buffer, sizeof( struct iw_range ) );

     odebug << "OWirelessNetworkInterface::buildInformation(): Information block constructed." << oendl;

     free(buffer);

 }

 

 

+short OWirelessNetworkInterface::wirelessExtensionDriverVersion() const

+{

+    return _range.we_version_compiled;

+}

+

+

 void OWirelessNetworkInterface::buildPrivateList()

 {

     odebug << "OWirelessNetworkInterface::buildPrivateList()" << oendl;

 

     struct iw_priv_args priv[IW_MAX_PRIV_DEF];

 

     _iwr.u.data.pointer = (char*) &priv;

     _iwr.u.data.length = IW_MAX_PRIV_DEF; // length in terms of number of (sizeof iw_priv_args), not (sizeof iw_priv_args) itself

     _iwr.u.data.flags = 0;

 

     if ( !wioctl( SIOCGIWPRIV ) )

     {

         owarn << "OWirelessNetworkInterface::buildPrivateList(): Can't get private ioctl information." << oendl;

         return;

     }

 

     for ( int i = 0; i < _iwr.u.data.length; ++i )

     {

         new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args );

     }

     odebug << "OWirelessNetworkInterface::buildPrivateList(): Private ioctl list constructed." << oendl;

 }

 

 

 void OWirelessNetworkInterface::dumpInformation() const

 {

     odebug << "OWirelessNetworkInterface::() -------------- dumping information block ----------------" << oendl;

 

     qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s",

             _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 );

     qDebug( " - driver for '%s' (V%d) has been compiled against WE V%d",

              name(), _range.we_version_source, _range.we_version_compiled );

 

     if ( _range.we_version_compiled != WIRELESS_EXT )

     {

         owarn << "Version mismatch! WE_DRIVER = " << _range.we_version_compiled << " and WE_OPIENET = " << WIRELESS_EXT << oendl;

     }

 

     odebug << "OWirelessNetworkInterface::() ---------------------------------------------------------" << oendl;

 }

 

 

 int OWirelessNetworkInterface::channel() const

 {

     //FIXME: When monitoring enabled, then use it

     //FIXME: to gather the current RF channel

     //FIXME: Until then, get active channel from hopper.

     if ( _hopper && _hopper->isActive() )

         return _hopper->channel();

 

     if ( !wioctl( SIOCGIWFREQ ) )

     {

         return -1;

     }

     else

     {

         return _channels[ static_cast<int>(double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000) ];

     }

 }

 

 

 void OWirelessNetworkInterface::setChannel( int c ) const

 {

     if ( !c )

diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index f5fbe1d..a49c8fb 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -64,129 +64,129 @@
 #include <qhostaddress.h>
 
 namespace Opie {
 namespace Net  {
 
 class ONetworkInterface;
 class OWirelessNetworkInterface;
 class OChannelHopper;
 class OMonitoringInterface;
 
 /*======================================================================================
  * ONetwork
  *======================================================================================*/
 
 /**
  * @brief A container class for all network interfaces
  *
  * This class provides access to all available network interfaces of your computer.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class ONetwork : public QObject
 {
   Q_OBJECT
 
   public:
     typedef QDict<ONetworkInterface> InterfaceMap;
     typedef QDictIterator<ONetworkInterface> InterfaceIterator;
 
   public:
     /**
      * @returns the number of available interfaces
      */
     int count() const;
     /**
      * @returns a pointer to the (one and only) @ref ONetwork instance.
      */
     static ONetwork* instance();
     /**
      * @returns an iterator usable for iterating through all network interfaces.
      */
     InterfaceIterator iterator() const;
     /**
      * @returns true, if the @a interface is present.
      */
     bool isPresent( const char* interface ) const;
     /**
      * @returns true, if the @a interface supports the wireless extension protocol.
      */
     bool isWirelessInterface( const char* interface ) const;
     /**
      * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found.
      * @see ONetworkInterface
      */
     ONetworkInterface* interface( const QString& interface ) const;
     /**
      * @internal Rebuild the internal interface database
      * @note Sometimes it might be useful to call this from client code,
      * e.g. after issuing a cardctl insert
      */
     void synchronize();
     /**
      * @returns the wireless extension version used at compile time.
      **/
-    static short wirelessExtensionVersion();
+    static short wirelessExtensionCompileVersion();
 
   protected:
     ONetwork();
 
   private:
     static ONetwork* _instance;
     InterfaceMap _interfaces;
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * ONetworkInterface
  *======================================================================================*/
 
 /**
  * @brief A network interface wrapper.
  *
  * This class provides a wrapper for a network interface. All the cumbersume details of
  * Linux ioctls are hidden under a convenient high-level interface.
  * @warning Most of the setting methods contained in this class require the appropriate
  * process permissions to work.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class ONetworkInterface : public QObject
 {
     friend class OMonitoringInterface;
     friend class OCiscoMonitoringInterface;
     friend class OWlanNGMonitoringInterface;
     friend class OHostAPMonitoringInterface;
     friend class OOrinocoMonitoringInterface;
 
   public:
     /**
      * Constructor. Normally you don't create @ref ONetworkInterface objects yourself,
      * but access them via @ref ONetwork::interface().
      */
     ONetworkInterface( QObject* parent, const char* name );
     /**
      * Destructor.
      */
     virtual ~ONetworkInterface();
     /**
      * Associates a @a monitoring interface with this network interface.
      * @note This is currently only useful with @ref OWirelessNetworkInterface objects.
      */
     void setMonitoring( OMonitoringInterface* monitoring );
     /**
      * @returns the currently associated monitoring interface or 0, if no monitoring is associated.
      */
     OMonitoringInterface* monitoring() const;
     /**
      * Setting an interface to promiscuous mode enables the device to receive
      * all packets on the shared medium - as opposed to packets which are addressed to this interface.
      */
     bool setPromiscuousMode( bool );
     /**
      * @returns true if the interface is set to promiscuous mode.
      */
     bool promiscuousMode() const;
     /**
      * Setting an interface to up enables it to receive packets.
@@ -390,130 +390,134 @@ class OWirelessNetworkInterface : public ONetworkInterface
      * @see OMonitoringInterface
      */
     virtual QString mode() const;
     /**
      * Set the channel hopping @a interval. An @a interval of 0 disables channel hopping.
      * @see OChannelHopper
      */
     virtual void setChannelHopping( int interval = 0 );
     /**
      * @returns the channel hopping interval or 0, if channel hopping is disabled.
      */
     virtual int channelHopping() const;
     /**
      * @returns the @ref OChannelHopper of this interface or 0, if channel hopping has not been activated before
      */
     virtual OChannelHopper* channelHopper() const;
     /**
      * Set the station @a nickname.
      */
     virtual void setNickName( const QString& nickname );
     /**
      * @returns the current station nickname.
      */
     virtual QString nickName() const;
     /**
      * Invoke the private IOCTL @a command with a @number of parameters on the network interface.
      * @see OPrivateIOCTL
      */
     virtual void setPrivate( const QString& command, int number, ... );
     /**
      * @returns true if the interface is featuring the private IOCTL @command.
      */
     virtual bool hasPrivate( const QString& command );
     virtual void getPrivate( const QString& command ); //FIXME: Implement and document this
     /**
      * @returns true if the interface is associated to an access point
      * @note: This information is only valid if the interface is in managed mode.
      */
     virtual bool isAssociated() const;
     /**
      * @returns the MAC address of the Access Point if the device is in infrastructure mode.
      * @returns a (more or less random) cell ID address if the device is in adhoc mode.
      */
     virtual OMacAddress associatedAP() const;
     /**
      * Set the @a ssid (Service Set ID) string. This is used to decide
      * which network to associate with (use "any" to let the driver decide).
      */
     virtual void setSSID( const QString& ssid );
     /**
      * @returns the current SSID (Service Set ID).
      */
     virtual QString SSID() const;
     /**
      * Perform scanning the wireless network neighbourhood.
      * @note: UNSTABLE API - UNDER CONSTRUCTION - DON'T USE!
      */
     virtual OStationList* scanNetwork();
     /**
      * @return signal strength to associated neighbour (in percent).
      * In infrastructure mode, this is the signal strength of the Access Point.
      * In other modes the result is driver dependent.
      */
     virtual int signalStrength() const;
-    /** @internal commit pending changes to the driver
-     *
+    /**
+     * @returns the wireless extension version used by the interface driver.
+     **/
+    short wirelessExtensionDriverVersion() const;
+    /**
+     * @internal commit pending changes to the driver
      */
     void commit() const;
 
   protected:
     void buildInformation();
     void buildPrivateList();
     void dumpInformation() const;
     virtual void init();
     struct iwreq& iwr() const;
     bool wioctl( int call ) const;
     bool wioctl( int call, struct iwreq& ) const;
 
   protected:
     mutable struct iwreq _iwr;
     QMap<int,int> _channels;
     struct iw_range _range;
 
   private:
     OChannelHopper* _hopper;
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * OMonitoringInterface
  *======================================================================================*/
 
 
 class OMonitoringInterface
 {
   public:
     OMonitoringInterface();
     OMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual void setChannel( int );
 
     virtual QString name() const = 0;
 
   protected:
     OWirelessNetworkInterface* _if;
     bool _prismHeader;
   private:
     class Private;
     Private *d;
 
 };
 
 
 /*======================================================================================
  * OCiscoMonitoring
  *======================================================================================*/
 
 
 class OCiscoMonitoringInterface : public OMonitoringInterface
 {
   public:
     OCiscoMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OCiscoMonitoringInterface();
 
     virtual void setEnabled( bool );
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index f8ebe6b..a9dc577 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -1,127 +1,127 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003-2004 by Michael 'Mickey' Lauer <mickey@Vanille.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.
 
 */
 
 #include "udp_ports.h"
 #include "opcap.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qapplication.h> // don't use oapplication here (will decrease reusability in other projects)
 #include <qsocketnotifier.h>
 #include <qobjectlist.h>
 
 /* STD */
 #include <sys/time.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <unistd.h>
 #include <string.h>
 
 namespace Opie {
 namespace Net  {
 
 /*======================================================================================
  * OPacket
  *======================================================================================*/
 
 OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char* data, QObject* parent )
         :QObject( parent, "Generic" ), _hdr( header ), _data( 0 )
 {
 
-    _data = new unsigned char[sizeof data];
+    _data = new unsigned char[ header.len ];
     assert( _data );
-    memcpy( const_cast<unsigned char*>(_data), data, sizeof data );
+    memcpy( const_cast<unsigned char*>(_data), data, header.len );
     // We have to copy the data structure here, because the 'data' pointer handed by libpcap
     // points to an internal region which is reused by lipcap.
     odebug << "OPacket: Length = " << header.len << ", Caplen = " << header.caplen << oendl;
     _end = (unsigned char*) _data + header.len;
 
     switch ( datalink )
     {
         case DLT_EN10MB:
             odebug << "OPacket::OPacket(): Received Packet. Datalink = ETHERNET" << oendl;
             new OEthernetPacket( _end, (const struct ether_header*) _data, this );
             break;
 
         case DLT_IEEE802_11:
             odebug << "OPacket::OPacket(): Received Packet. Datalink = IEEE802.11" << oendl;
             new OWaveLanPacket( _end, (const struct ieee_802_11_header*) _data, this );
             break;
 
         case DLT_PRISM_HEADER:
             odebug << "OPacket::OPacket(): Received Packet. Datalink = PRISM_HEADER" << oendl;
             new OPrismHeaderPacket( _end, (const struct prism_hdr*) (unsigned char*) _data, this );
             break;
 
         default:
             owarn << "OPacket::OPacket(): Received Packet over unsupported datalink, type " << datalink << "!" << oendl;
     }
 }
 
 
 OPacket::~OPacket()
 {
     odebug << "~OPacket( " << name() << " )" << oendl;
     delete _data;
 }
 
 
 timevalstruct OPacket::timeval() const
 {
     return _hdr.ts;
 }
 
 
 int OPacket::caplen() const
 {
     return _hdr.caplen;
 }
 
 
 void OPacket::updateStats( QMap<QString,int>& stats, QObjectList* l )
 {
     if (!l) return;
     QObject* o = l->first();
     while ( o )
     {
         stats[o->name()]++;
         updateStats( stats, const_cast<QObjectList*>( o->children() ) );
         o = l->next();
     }
 }
 
 
 QString OPacket::dumpStructure() const
 {
     return "[ |" + _dumpStructure(  const_cast<QObjectList*>( this->children() ) ) + " ]";
 }