summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui30
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp24
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.h5
-rw-r--r--noncore/net/wellenreiter/gui/manufacturers.h1
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp51
5 files changed, 68 insertions, 43 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index 8dcf513..7992e6b 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -11,7 +11,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>228</width>
+ <width>224</width>
<height>267</height>
</rect>
</property>
@@ -153,6 +153,10 @@
<name>enabled</name>
<bool>true</bool>
</property>
+ <property>
+ <name>whatsThis</name>
+ <string>Choose the interface used for sniffing.</string>
+ </property>
</widget>
<widget row="4" column="0" rowspan="1" colspan="2" >
<class>QCheckBox</class>
@@ -180,13 +184,25 @@
<item>
<property>
<name>text</name>
- <string>orinoco</string>
+ <string>cisco</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>wlan-ng</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>hostap</string>
</property>
</item>
<item>
<property>
<name>text</name>
- <string>prism</string>
+ <string>orinoco</string>
</property>
</item>
<item>
@@ -203,6 +219,10 @@
<name>enabled</name>
<bool>true</bool>
</property>
+ <property>
+ <name>whatsThis</name>
+ <string>Choose the type of driver used for sniffing.</string>
+ </property>
</widget>
<widget row="3" column="0" rowspan="1" colspan="2" >
<class>QCheckBox</class>
@@ -245,6 +265,10 @@
<name>lineStep</name>
<number>100</number>
</property>
+ <property>
+ <name>whatsThis</name>
+ <string>Choose the channel hop interval.</string>
+ </property>
</widget>
<widget row="2" column="1" >
<class>QLabel</class>
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 04e3457..515d9b2 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -14,10 +14,34 @@
**********************************************************************/
#include "configwindow.h"
+#include <qmap.h>
+#include <qcombobox.h>
+#include <qspinbox.h>
WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
:WellenreiterConfigBase( parent, name, f )
{
+ _devicetype[ "cisco" ] = 1;
+ _devicetype[ "wlan-ng" ] = 2;
+ _devicetype[ "hostap" ] = 3;
+ _devicetype[ "orinoco" ] = 4;
+ _devicetype[ "<manual>" ] = 5;
+};
+int WellenreiterConfigWindow::daemonDeviceType()
+{
+ QString name = deviceType->currentText();
+ if ( _devicetype.contains( name ) )
+ {
+ return _devicetype[name];
+ }
+ else
+ {
+ return 0;
+ }
};
+int WellenreiterConfigWindow::daemonHopInterval()
+{
+ return hopInterval->cleanText().toInt();
+}
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
index c2db283..c627901 100644
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/noncore/net/wellenreiter/gui/configwindow.h
@@ -17,13 +17,18 @@
#define WELLENREITERCONFIGWINDOW_H
#include "configbase.h"
+#include <qmap.h>
class WellenreiterConfigWindow : public WellenreiterConfigBase
{
public:
WellenreiterConfigWindow( QWidget * parent = 0, const char * name = "WellenreiterConfigWindow", WFlags f = 0 );
+ int daemonDeviceType();
+ int daemonHopInterval();
+ protected:
+ QMap<QString, int> _devicetype;
};
diff --git a/noncore/net/wellenreiter/gui/manufacturers.h b/noncore/net/wellenreiter/gui/manufacturers.h
index 67afe21..75728b1 100644
--- a/noncore/net/wellenreiter/gui/manufacturers.h
+++ b/noncore/net/wellenreiter/gui/manufacturers.h
@@ -17,7 +17,6 @@
#define MANUFACTURERS_H
#include <qmap.h>
-#include <string.h>
class ManufacturerDB
{
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
@@ -232,23 +232,18 @@ void Wellenreiter::buttonClicked()
// 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 );
@@ -262,52 +257,30 @@ void Wellenreiter::buttonClicked()
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();
+ const int cardtype = configwindow->daemonDeviceType();
+ const int interval = configwindow->daemonHopInterval();
- if ( ( interface == "<select>" ) || ( cardtype == "<select>" ) )
+ 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.sprintf( "wellenreiterd %s %d &", (const char*) interface, cardtype );
- cmdline = "orinoco_hopper ";
- cmdline += interface;
- cmdline += " -i ";
- cmdline += interval;
- cmdline += " &";
- qDebug( "execute: %s", (const char*) cmdline );
+ qDebug( "about to execute '%s' ...", (const char*) cmdline );
system( cmdline );
- qDebug( "done" );
-
- // start daemon
-
- cmdline = "wellenreiterd ";
- cmdline += interface;
- cmdline += " 3";
- cmdline += " &";
+ qDebug( "done!" );
- qDebug( "execute: %s", (const char*) cmdline );
- system( cmdline );
- qDebug( "done" );
+ logwindow->log( "(i) Daemon has been started." );
+ daemonRunning = true;
+ button->setText( "Stop Scanning" );
}
}