author | mickeyl <mickeyl> | 2003-02-14 23:28:10 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-02-14 23:28:10 (UTC) |
commit | e8f0c623ff6a8822b84b9cc4ee3c1fb3b3016738 (patch) (side-by-side diff) | |
tree | dd6a6e1e7e33c94b41240c9547ce0e7f7a255414 /noncore/net/wellenreiter/gui/wellenreiter.cpp | |
parent | 643c8058bbd67a8fedfd98cb895419cadde04e78 (diff) | |
download | opie-e8f0c623ff6a8822b84b9cc4ee3c1fb3b3016738.zip opie-e8f0c623ff6a8822b84b9cc4ee3c1fb3b3016738.tar.gz opie-e8f0c623ff6a8822b84b9cc4ee3c1fb3b3016738.tar.bz2 |
- remove manual switch into monitor mode ==> wellenreiterd handles this now
- remove manual start of channelswitcher ==> wellenreiterd handles this now
- add device type configurations for cisco, wlan-ng, hostap and orinoco
- minor bugfix to the start/stop logic
Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 97 |
1 files changed, 35 insertions, 62 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 4ee9a35..4c1c972 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -69,5 +69,5 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) // construct manufacturer database // - + QString manufile; #ifdef QWS @@ -90,5 +90,5 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) logwindow->log( sys ); #endif - + // // setup socket for daemon communication, register socket notifier @@ -115,5 +115,5 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) // button->setEnabled( false ); netview->setColumnWidthMode( 1, QListView::Manual ); - + if ( manufacturerdb ) netview->setManufacturerDB( manufacturerdb ); @@ -152,5 +152,5 @@ void Wellenreiter::handleMessage() int result = wl_recv( &daemon_fd, sockaddr, (char*) &buffer, WL_SOCKBUF ); - + if ( result == -1 ) { @@ -158,7 +158,7 @@ void Wellenreiter::handleMessage() return; } - + int command = buffer[1] - 48; - + /* typedef struct { @@ -209,5 +209,5 @@ void Wellenreiter::dataReceived() { logwindow->log( "(d) Received data from daemon" ); - handleMessage(); + handleMessage(); } @@ -227,86 +227,59 @@ void Wellenreiter::buttonClicked() { daemonRunning = false; - + logwindow->log( "(i) Daemon has been stopped." ); button->setText( "Start Scanning" ); - + // Stop daemon - ugly for now... later better - - system( "killall orinoco_hopper" ); + 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(); - + //const QString& interval = configwindow->hopInterval->cleanText(); + // reset the card trying to get into a usable state again - + QString cmdline; - cmdline.sprintf( "iwpriv %s monitor 1", (const char*) interface ); - system( cmdline ); - cmdline.sprintf( "iwpriv %s monitor 1 6", (const char*) interface ); - system( cmdline ); - cmdline.sprintf( "ifconfig %s -promisc", (const char*) interface ); + cmdline.sprintf( "cardctl eject; cardctl insert" ); 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 - { - - 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>" ) ) + 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; } - - // set interface into monitor mode - /* Global::Execute definitely does not work very well with non-gui stuff! :( */ - + + // start wellenreiterd + 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; - cmdline += " &"; - qDebug( "execute: %s", (const char*) cmdline ); - system( cmdline ); - qDebug( "done" ); - - // start daemon - - cmdline = "wellenreiterd "; - cmdline += interface; - cmdline += " 3"; - cmdline += " &"; + cmdline.sprintf( "wellenreiterd %s %d &", (const char*) interface, cardtype ); - qDebug( "execute: %s", (const char*) cmdline ); + qDebug( "about to execute '%s' ...", (const char*) cmdline ); system( cmdline ); - qDebug( "done" ); + qDebug( "done!" ); + + logwindow->log( "(i) Daemon has been started." ); + daemonRunning = true; + button->setText( "Stop Scanning" ); } |