1 files changed, 20 insertions, 5 deletions

diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
index c49daa0..eb2e8e8 100644
--- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
+++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
@@ -22,52 +22,52 @@ class Station
     bool wep;
     int beacons;
 };
 
 QDict<Station> stations;
 
 //======================== Application class ===============================
 
 class Wellenreiter : public QApplication
 {
 Q_OBJECT
 public:
-  Wellenreiter( int argc, char** argv ) : QApplication( argc, argv )
+  Wellenreiter( int argc, char** argv ) : QApplication( argc, argv ), channel( 1 )
   {
 
     ONetwork* net = ONetwork::instance();
 
     if ( argc < 3 )
     {
         printf( "Usage: ./%s <interface> <driver> <interval>\n", argv[0] );
         printf( "\n" );
         printf( "Valid wireless interfaces (detected) are:\n" );
 
         ONetwork::InterfaceIterator it = net->iterator();
         while ( it.current() )
         {
             if ( it.current()->isWireless() )
             {
                 printf( " - '%s' (MAC=%s) (IPv4=%s)\n", (const char*) it.current()->name(),
                                                     (const char*) it.current()->macAddress().toString(),
                                                     (const char*) it.current()->ipV4Address() );
             }
             ++it;
         }
     exit( -1 );
     }
 
-    printf( "****************************************************\n" );
-    printf( "* Wellenreiter mini edition 1.0 (C) 2003 M-M-M *\n" );
-    printf( "****************************************************\n" );
+    printf( "*******************************************************************\n" );
+    printf( "* Wellenreiter mini edition 1.0.0 (C) 2003 Michael 'Mickey' Lauer *\n" );
+    printf( "*******************************************************************\n" );
     printf( "\n\n" );
 
     QString interface( argv[1] );
     QString driver( argv[2] );
 
     printf( "Trying to use '%s' as %s-controlled device...\n", (const char*) interface, (const char*) driver );
 
     // sanity checks before downcasting
     ONetworkInterface* iface = net->interface( interface );
     if ( !iface )
     {
         printf( "Interface '%s' doesn't exist. Exiting.\n", (const char*) interface );
@@ -96,56 +96,70 @@ public:
         else
         {
             printf( "ok.\n" );
         }
     }
     else
         printf( "Interface status is already promisc - good.\n" );
 
     // connect a monitoring strategy to the interface
     if ( driver == "orinoco" )
         new OOrinocoMonitoringInterface( wiface, false );
     else
+    if ( driver == "hostap" )
+        new OHostAPMonitoringInterface( wiface, false );
+    else
+    if ( driver == "wlan-ng" )
+        new OWlanNGMonitoringInterface( wiface, false );
+    else
     {
         printf( "Unknown driver. Exiting\n" );
         exit( -1 );
     }
 
     // enable monitoring mode
     printf( "Enabling monitor mode...\n" );
-    //wiface->setMonitorMode( true );
+    wiface->setMode( "monitor" );
 
     // open a packet capturer
     cap = new OPacketCapturer();
     cap->open( interface );
     if ( !cap->isOpen() )
     {
         printf( "Unable to open libpcap (%s). Exiting.\n", strerror( errno ) );
         exit( -1 );
     }
 
     // set capturer to non-blocking mode
     cap->setBlocking( false );
 
     // start channel hopper
     //wiface->setChannelHopping( 1000 );
 
     // connect
     connect( cap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
+    // timer
+    startTimer( 1000 );
 
   }
 
   ~Wellenreiter() {};
 
 public slots:
+  virtual void timerEvent(QTimerEvent* e)
+  {
+    wiface->setChannel( channel++ );
+    if ( channel == 14 ) channel = 1;
+  }
+
   void receivePacket(OPacket* p)
   {
     if (!p)
     {
         printf( "(empty packet received)\n" );
         return;
     }
 
     OWaveLanManagementPacket* beacon = (OWaveLanManagementPacket*) p->child( "802.11 Management" );
     if ( beacon )
     {
         OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
@@ -194,24 +208,25 @@ public slots:
         {
             printf( "IBSS(AdHoc): '%s' -> '%s' (Cell: '%s')'\n",
                 (const char*) wlan->macAddress2().toString(true),
                 (const char*) wlan->macAddress1().toString(true),
                 (const char*) wlan->macAddress3().toString(true) );
         }
         return;
     }
   }
 private:
   OPacketCapturer* cap;
   OWirelessNetworkInterface* wiface;
+  int channel;
 };
 
 
 int main( int argc, char** argv )
 {
     Wellenreiter w( argc, argv );
     w.exec();
     return 0;
 }
 
 #include "miniwellenreiter.moc"