only cardctl reset after sniffing. maybe later make calling dhcp client a configurable option.

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index d1dd73a..e294eb8 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -115,97 +115,97 @@ void Wellenreiter::receivePacket(OPacket* p)
     OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) );
     if ( !beacon ) return;
     QString type;
 
     //FIXME: Can stations in ESS mode can be distinguished from APs?
     //FIXME: Apparently yes, but not by listening to beacons, because
     //FIXME: they simply don't send beacons in infrastructure mode.
     //FIXME: so we also have to listen to data packets
 
     if ( beacon->canIBSS() )
         type = "adhoc";
     else
         type = "managed";
 
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID() : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
     int channel = ds ? ds->channel() : -1;
 
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
     netView()->addNewItem( type, essid, header->macAddress2().toString(), header->usesWep(), channel, 0 );
 }
 
 void Wellenreiter::startStopClicked()
 {
     if ( sniffing )
     {
         disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
 
         iface->setChannelHopping(); // stop hopping channels
         pcap->close();
         sniffing = false;
         #ifdef QWS
         oApp->setTitle();
         #else
         qApp->mainWidget()->setCaption( "Wellenreiter II" );
         #endif
 
         // get interface name from config window
         const QString& interface = configwindow->interfaceName->currentText();
         ONetwork* net = ONetwork::instance();
         iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface ));
 
         // switch off monitor mode
         iface->setMonitorMode( false );
         // switch off promisc flag
         iface->setPromiscuousMode( false );
 
-        system( "cardctl reset; sleep 1; dhclient; udhcpc" ); //FIXME: Use OProcess
+        system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess
 
         // message the user
         QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." );
     }
 
     else
     {
         // 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 1: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break;
             case 2: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break;
             case 3: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break;
             case 4: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break;
             default: assert( 0 ); // shouldn't happen
         }
 
         iface->setMonitorMode( true );
 
         // open pcap and start sniffing
         pcap->open( 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 );