1 files changed, 7 insertions, 0 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index b4b6aa3..0105e09 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -194,196 +194,203 @@ void Wellenreiter::receivePacket(OPacket* p)
                                       wlan->macAddress3().toString(),
                                       wlan->macAddress1().toString() );
         }
         else
         if ( wlan->fromDS() && wlan->toDS() )
         {
             qDebug( "WSD(bridge) traffic: '%s' -> '%s' via '%s' and '%s'",
                 (const char*) wlan->macAddress4().toString(true),
                 (const char*) wlan->macAddress3().toString(true),
                 (const char*) wlan->macAddress1().toString(true),
                 (const char*) wlan->macAddress2().toString(true) );
             netView()->traffic( "WSD", wlan->macAddress4().toString(),
                                      wlan->macAddress3().toString(),
                                      wlan->macAddress1().toString(),
                                      wlan->macAddress2().toString() );
         }
         else
         {
             qDebug( "IBSS(AdHoc) traffic: '%s' -> '%s' (Cell: '%s')'",
                 (const char*) wlan->macAddress2().toString(true),
                 (const char*) wlan->macAddress1().toString(true),
                 (const char*) wlan->macAddress3().toString(true) );
             netView()->traffic( "IBSS", wlan->macAddress2().toString(),
                                         wlan->macAddress1().toString(),
                                         wlan->macAddress3().toString() );
         }
         return;
     }
 }
 
 
 void Wellenreiter::stopClicked()
 {
     if ( iface )
     {
         disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
         disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
         iface->setChannelHopping(); // stop hopping channels
     }
     else
         killTimers();
 
     pcap->close();
     sniffing = false;
 
     if ( iface )
     {
         // switch off monitor mode
         iface->setMonitorMode( false );
         // switch off promisc flag
         iface->setPromiscuousMode( false );
 
         system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess
     }
 
     logwindow->log( "(i) Stopped Scanning." );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" );
 
     // message the user
     QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." );
 
     sniffing = false;
     emit( stoppedSniffing() );
 
     // print out statistics
     statwindow->log( "-----------------------------------------" );
     statwindow->log( "- Wellenreiter II Capturing Statistic -" );
     statwindow->log( "-----------------------------------------" );
     statwindow->log( "Packet Type         |   Receive Count" );
 
     for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it )
     {
         QString left;
         left.sprintf( "%s", (const char*) it.key() );
         left = left.leftJustify( 20 );
         left.append( '|' );
         QString right;
         right.sprintf( "%d", it.data() );
         right = right.rightJustify( 7 );
         statwindow->log( left + right );
     }
 
 }
 
 
 void Wellenreiter::startClicked()
 {
     // get configuration from config window
 
     const QString& interface = configwindow->interfaceName->currentText();
     const int cardtype = configwindow->daemonDeviceType();
     const int interval = configwindow->daemonHopInterval();
 
     if ( ( interface == "" ) || ( cardtype == 0 ) )
     {
         QMessageBox::information( this, "Wellenreiter II", "Your device is not\nproperly configured. Please reconfigure!" );
         return;
     }
 
     // configure device
 
     ONetwork* net = ONetwork::instance();
     iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface ));
 
     // set monitor mode
 
     switch ( cardtype )
     {
         case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break;
         case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break;
         case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break;
         case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break;
         case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", "Bring your device into\nmonitor mode now." ); break;
         case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break;
         default: assert( 0 ); // shouldn't reach this
     }
 
     // switch device into monitor mode
     if ( cardtype < DEVTYPE_FILE )
     {
         if ( cardtype != DEVTYPE_MANUAL )
             iface->setMonitorMode( true );
         if ( !iface->monitorMode() )
         {
             QMessageBox::warning( this, "Wellenreiter II", "Can't set device into monitor mode." );
             return;
         }
     }
 
     // open pcap and start sniffing
     if ( cardtype != DEVTYPE_FILE )
     {
         if ( configwindow->writeCaptureFile->isEnabled() )
         {
             QString dumpname( configwindow->captureFileName->text() );
             dumpname.append( '-' );
             dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
             dumpname.append( ".wellenreiter" );
             pcap->open( interface, dumpname );
         }
         else
         {
             pcap->open( interface );
         }
     }
     else
     {
         pcap->open( QFile( interface ) );
     }
 
     if ( !pcap->isOpen() )
     {
         QMessageBox::warning( this, "Wellenreiter II", "Can't open packet capturer:\n" + QString(strerror( errno ) ));
         return;
     }
 
     // set capturer to non-blocking mode
     pcap->setBlocking( false );
 
     // start channel hopper
     if ( cardtype != DEVTYPE_FILE )
         iface->setChannelHopping( 1000 ); //use interval from config window
 
     if ( cardtype != DEVTYPE_FILE )
     {
         // connect socket notifier and start channel hopper
         connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
         connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
     }
     else
     {
         // start timer for reading packets
         startTimer( 100 );
     }
 
     logwindow->log( "(i) Started Scanning." );
     sniffing = true;
     emit( startedSniffing() );
     if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
     else
     {
         assert( parent() );
         ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II - replaying capture file..." );
     }
 }
 
 
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
     qDebug( "Wellenreiter::timerEvent()" );
     OPacket* p = pcap->next();
+    if ( !p ) // no more packets available
+    {
+        stopClicked();
+    }
+    else
+    {
     receivePacket( p );
     delete p;
 }
+}