summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp36
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
@@ -232,94 +232,104 @@ void Wellenreiter::addNewItem( QString type, QString essid, QString macaddr, boo
qDebug( "inserting new station %s", (const char*) macaddr );
new MScanListItem( network, type, "", macaddr, wep, channel, signal );
if ( type == "managed" )
{
s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel );
}
else
{
s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel );
}
logwindow->log( s );
}
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 );
system( cmdline );
// 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 );
addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 );
QString command ("98");
//sendcomm( DAEMONADDR, DAEMONPORT, (const char*) command );
*/
}
}