- 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
@@ -98,49 +98,49 @@ void ONetwork::synchronize()
     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;

 }

 

 

@@ -361,66 +361,65 @@ bool ONetworkInterface::setPromiscuousMode( bool b )
 }

 

 

 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 ) );

@@ -540,58 +539,65 @@ void OWirelessNetworkInterface::buildInformation()
 

         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;

 }

 

 

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
@@ -104,49 +104,49 @@ class ONetwork : public QObject
      */
     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.
  *
@@ -430,50 +430,54 @@ class OWirelessNetworkInterface : public ONetworkInterface
      * @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;
 };
 
 
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
@@ -37,51 +37,51 @@ 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;