1 files changed, 6 insertions, 9 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 4c1c972..c1aae86 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -103,184 +103,181 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
     else
     {
         int flags;
         flags = fcntl( daemon_fd, F_GETFL, 0 );
         fcntl( daemon_fd, F_SETFL, flags | O_NONBLOCK );
         QSocketNotifier *sn  = new QSocketNotifier( daemon_fd, QSocketNotifier::Read, parent );
         connect( sn, SIGNAL( activated( int ) ), this, SLOT( dataReceived() ) );
     }
 
     // setup GUI
         
     connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
     // button->setEnabled( false );
     netview->setColumnWidthMode( 1, QListView::Manual );
 
     if ( manufacturerdb )
         netview->setManufacturerDB( manufacturerdb );
         
 }
 
 Wellenreiter::~Wellenreiter()
 {
     // no need to delete child widgets, Qt does it all for us
     
     delete manufacturerdb;
 }
 
 void Wellenreiter::handleMessage()
 {
     // FIXME: receive message and handle it
 
     qDebug( "received message from daemon." );
 
     /*char buffer[10000];
     memset( &buffer, 0, sizeof( buffer ) );*/
     
     char buffer[WL_SOCKBUF];
 
     // int result = #wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) );
     
     /*
     
     struct sockaddr from;
     socklen_t len;
     
     int result = recvfrom( daemon_fd, &buffer, 8192, MSG_WAITALL, &from, &len );
     qDebug( "received %d from recv [%d bytes]", result, len );
     
     */
     
     int result = wl_recv( &daemon_fd, sockaddr, (char*) &buffer, WL_SOCKBUF );
 
     if ( result == -1 )
     {
         qDebug( "Warning: %s", strerror( errno ) );
         return;
     }
 
     int command = buffer[1] - 48;
 
 /*
 typedef struct {
   int net_type;     1 = Accesspoint ; 2 = Ad-Hoc
   int ssid_len;     Length of SSID
   int channel;      Channel
   int wep;          1 = WEP enabled ; 0 = disabled
   char mac[64];     MAC address of Accesspoint
   char bssid[128];  BSSID of Accesspoint
 } wl_network_t;
 */
 
     qDebug( "Recv result: %d", ( result ) );
     qDebug( "Sniffer sent: '%s'", (const char*) buffer );
     hexwindow->log( (const char*) &buffer );
 
     if ( command == NETFOUND )  /* new network found */
     {
         qDebug( "Sniffer said: new network found." );
         wl_network_t n;
         get_network_found( &n, (char*) &buffer );
         
         qDebug( "Sniffer said: net_type is %d.", n.net_type );
         qDebug( "Sniffer said: MAC is %s", (const char*) &n.mac );
 
         //n.bssid[n.ssid_len] = "\0";
 
         QString type;
         
         if ( n.net_type == 1 )
             type = "managed";
         else
             type = "adhoc";
 
         netview->addNewItem( type, n.bssid, QString( (const char*) &n.mac ), n.wep, n.channel, 0 );
 
     }
 
     else
 
     {
         qDebug( "unknown sniffer command." );
     }
 
 }
 
 void Wellenreiter::dataReceived()
 {
     logwindow->log( "(d) Received data from daemon" );
     handleMessage();
 }
 
 void Wellenreiter::buttonClicked()
 {
         /*
         // add some test stations, so that we can see if the GUI part works
         addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 );
         addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 );
         addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 );
         addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 );
         addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 );
         */
 
 
     if ( daemonRunning )
     {
         daemonRunning = false;
 
         logwindow->log( "(i) Daemon has been stopped." );
-        button->setText( "Start Scanning" );
+        button->setText( tr( "Start Scanning" ) );
+        setCaption( tr( "Scanning in progress..." ) );
 
         // Stop daemon - ugly for now... later better
 
         system( "killall wellenreiterd" );
 
         // get configuration from config window
 
         const QString& interface = configwindow->interfaceName->currentText();
-        const QString& cardtype = configwindow->deviceType->currentText();
-        //const QString& interval = configwindow->hopInterval->cleanText();
 
-        // reset the card trying to get into a usable state again
+        // reset the interface trying to get it into a usable state again
 
         QString cmdline;
-        cmdline.sprintf( "cardctl eject; cardctl insert" );
+        cmdline.sprintf( "ifdown %s; ifup %s", (const char*) interface, (const char*) interface );
         system( cmdline );
-        cmdline.sprintf( "killall -14 dhcpcd" );
-        system( cmdline );
-        cmdline.sprintf( "killall -10 udhcpc" );
 
         // message the user
 
         QMessageBox::information( this, "Wellenreiter/Opie", "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 == "<select>" ) || ( cardtype == 0 ) )
         {
             QMessageBox::information( this, "Wellenreiter/Opie", "You must configure your\ndevice before scanning." );
             return;
         }
 
         // start wellenreiterd
 
         QString cmdline;
         cmdline.sprintf( "wellenreiterd %s %d &", (const char*) interface, cardtype );
 
         qDebug( "about to execute '%s' ...", (const char*) cmdline );
         system( cmdline );
         qDebug( "done!" );
 
         logwindow->log( "(i) Daemon has been started." );
         daemonRunning = true;
-        button->setText( "Stop Scanning" );
+        button->setText( tr( "Stop Scanning" ) );
+        setCaption( tr( "Wellenreiter/Opie" ) );
 
     }
 }