- 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

1 files changed, 9 insertions, 3 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
@@ -120,5 +120,5 @@ void ONetwork::synchronize()
 

 

-short ONetwork::wirelessExtensionVersion()

+short ONetwork::wirelessExtensionCompileVersion()

 {

     return WIRELESS_EXT;

@@ -383,5 +383,5 @@ OChannelHopper::OChannelHopper( OWirelessNetworkInterface* iface )
                _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 );

@@ -400,5 +400,4 @@ OChannelHopper::OChannelHopper( OWirelessNetworkInterface* iface )
     if ( _maxChannel >= 12 ) _channels.append( 12 );

     _channel = _channels.begin();

-

 }

 

@@ -562,4 +561,5 @@ void OWirelessNetworkInterface::buildInformation()
         {

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

         }

@@ -572,4 +572,10 @@ void OWirelessNetworkInterface::buildInformation()
 

 

+short OWirelessNetworkInterface::wirelessExtensionDriverVersion() const

+{

+    return _range.we_version_compiled;

+}

+

+

 void OWirelessNetworkInterface::buildPrivateList()

 {