misc changes

1 files changed, 12 insertions, 4 deletions

diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index fc2026f..21026e1 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -1,13 +1,14 @@
 #include <opie2/onetwork.h>
+#include <opie2/ostation.h>
 #include <opie2/omanufacturerdb.h>
 
 int main( int argc, char** argv )
 {
     qDebug( "OPIE Network Demo" );
 
     ONetwork* net = ONetwork::instance();
 
     ONetwork::InterfaceIterator it = net->iterator();
 
     while ( it.current() )
     {
@@ -18,25 +19,25 @@ int main( int argc, char** argv )
         qDebug( "DEMO: Manufacturertest1 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "08:00:87" ) );
         qDebug( "DEMO: Manufacturertest2 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "E2:0C:0F" ) );
         qDebug( "Demo: IPv4 Address is '%s'", (const char*) it.current()->ipV4Address() );
         if ( it.current()->isWireless() )
         {
             OWirelessNetworkInterface* iface = static_cast<OWirelessNetworkInterface*>( it.current() );
             qDebug( "DEMO: '%s' seems to feature the wireless extensions.", (const char*) iface->name() );
             qDebug( "DEMO: Current SSID is '%s'", (const char*) iface->SSID() );
             qDebug( "DEMO: Antenna is tuned to '%f', that is channel %d", iface->frequency(), iface->channel() );
 
             //if ( iface->mode() == OWirelessNetworkInterface::adhoc )
             //{
-                qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP() );
+                qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP().toString() );
             //}
 
             // nickname
             qDebug( "DEMO: Current NickName is '%s'", (const char*) iface->nickName() );
             iface->setNickName( "MyNickName" );
             if ( iface->nickName() != "MyNickName" )
                 qDebug( "DEMO: Warning! Can't change nickname" );
             else
                 qDebug( "DEMO: Nickname change successful." );
 
             // operation mode
             qDebug( "DEMO: Current OperationMode is '%s'", (const char*) iface->mode() );
@@ -49,29 +50,36 @@ int main( int argc, char** argv )
             // RF channel
             qDebug( "DEMO: Current Channel is '%d'", iface->channel() );
             iface->setChannel( 1 );
             if ( iface->channel() != 1 )
                 qDebug( "DEMO: Warning! Can't change RF channel" );
             else
                 qDebug( "DEMO: RF channel change successful." );
 
             iface->setMode( "managed" );
 
             // network scan
 
-            int stations = iface->scanNetwork();
-            if ( stations != -1 )
+            OStationList* stations = iface->scanNetwork();
+            if ( stations )
             {
-                qDebug( "DEMO: # of stations around = %d", stations );
+                qDebug( "DEMO: # of stations around = %d", stations->count() );
+                OStation* station;
+                for ( station = stations->first(); station != 0; station = stations->next() )
+                {
+                    qDebug( "DEMO: station dump following..." );
+                    station->dump();
+                }
             }
+
             else
             {
                 qDebug( "DEMO: Warning! Scan didn't work!" );
             }
 
             /*
 
             // first some wrong calls to check if this is working
             iface->setPrivate( "seppel", 10 );
             iface->setPrivate( "monitor", 0 );
 
             // now the real deal