author | mickeyl <mickeyl> | 2002-12-18 00:00:51 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2002-12-18 00:00:51 (UTC) |
commit | 930884a92b064766ed436111778fc55f157c6e1c (patch) (side-by-side diff) | |
tree | d3c4b56b4b50f7cf7ef52cc486b377f39aaab044 /noncore | |
parent | 96a9654c2fccce382a4a9ad5d2d0b991b4191468 (diff) | |
download | opie-930884a92b064766ed436111778fc55f157c6e1c.zip opie-930884a92b064766ed436111778fc55f157c6e1c.tar.gz opie-930884a92b064766ed436111778fc55f157c6e1c.tar.bz2 |
use system() to start daemon and hopper instead of Global::execute,
which makes nothing but trouble for non-gui processes.
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 764ef34..0e95b28 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -250,39 +250,45 @@ void Wellenreiter::buttonClicked() { if ( daemonRunning ) { logwindow->log( "(i) Daemon has been stopped." ); button->setText( "Start Scanning" ); - // Stop daemon + // Stop daemon - ugly for now... later better - // find out pids of wellenreiterd and orinoco_hopper + system( "killall orinoco_hopper" ); + system( "killall wellenreiterd" ); + // FIXME: reset the card trying to get into a usable state again + + // for now, just message the user + + QMessageBox::information( this, "Wellenreiter/Opie", "You should reset your\ndevice before using it again." ); } else { + logwindow->log( "(i) Daemon has been started." ); + daemonRunning = true; + button->setText( "Stop Scanning" ); + // get configuration from config window const QString& interface = configwindow->interfaceName->currentText(); const QString& cardtype = configwindow->deviceType->currentText(); const QString& interval = configwindow->hopInterval->cleanText(); if ( ( interface == "<select>" ) || ( cardtype == "<select>" ) ) { QMessageBox::information( this, "Wellenreiter/Opie", "You must configure your\ndevice before scanning." ); return; } - logwindow->log( "(i) Daemon has been started." ); - button->setText( "Stop Scanning" ); - -#ifdef QWS - // set interface into monitor mode + /* Global::Execute definitely does not work very well with non-gui stuff! :( */ QString cmdline; cmdline.sprintf( "iwpriv %s monitor 2", (const char*) interface ); system( cmdline ); cmdline.sprintf( "iwpriv %s monitor 2 1", (const char*) interface ); @@ -291,26 +297,30 @@ void Wellenreiter::buttonClicked() // start channel hopper cmdline = "orinoco_hopper "; cmdline += interface; cmdline += " -i "; cmdline += interval; - //qDebug( "execute: %s", (const char*) cmdline ); - Global::execute( cmdline ); + cmdline += " &"; + qDebug( "execute: %s", (const char*) cmdline ); + system( cmdline ); + qDebug( "done" ); // start daemon cmdline = "wellenreiterd "; cmdline += interface; cmdline += " 3"; - //qDebug( "execute: %s", (const char*) cmdline ); - Global::execute( cmdline ); -#endif + cmdline += " &"; - /* + qDebug( "execute: %s", (const char*) cmdline ); + system( cmdline ); + qDebug( "done" ); + /* + // 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 ); |