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
@@ -2,25 +2,25 @@
 <class>WellenreiterConfigBase</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>WellenreiterConfigBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>228</width>
+            <width>224</width>
             <height>267</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form1</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
@@ -144,24 +144,28 @@
                             <name>text</name>
                             <string>wifi1</string>
                         </property>
                     </item>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>interfaceName</cstring>
                     </property>
                     <property stdset="1">
                         <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>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>activeScanning</cstring>
                     </property>
                     <property stdset="1">
                         <name>enabled</name>
                         <bool>false</bool>
                     </property>
                     <property stdset="1">
@@ -171,47 +175,63 @@
                 </widget>
                 <widget row="1"  column="0" >
                     <class>QComboBox</class>
                     <item>
                         <property>
                             <name>text</name>
                             <string>&lt;select&gt;</string>
                         </property>
                     </item>
                     <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>
                         <property>
                             <name>text</name>
                             <string>&lt;manual&gt;</string>
                         </property>
                     </item>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>deviceType</cstring>
                     </property>
                     <property stdset="1">
                         <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>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>additionalInfo</cstring>
                     </property>
                     <property stdset="1">
                         <name>enabled</name>
                         <bool>false</bool>
                     </property>
                     <property stdset="1">
@@ -236,24 +256,28 @@
                     <property stdset="1">
                         <name>maxValue</name>
                         <number>2000</number>
                     </property>
                     <property stdset="1">
                         <name>minValue</name>
                         <number>100</number>
                     </property>
                     <property stdset="1">
                         <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>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>TextLabel3_3</cstring>
                     </property>
                     <property stdset="1">
                         <name>enabled</name>
                         <bool>true</bool>
                     </property>
                     <property stdset="1">
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
@@ -5,19 +5,43 @@
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #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
@@ -8,24 +8,29 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef WELLENREITERCONFIGWINDOW_H
 #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;
     
 };
 
 #endif
 
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
@@ -8,25 +8,24 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef MANUFACTURERS_H
 #define MANUFACTURERS_H
 
 #include <qmap.h>
-#include <string.h>
 
 class ManufacturerDB
 {
   public:
   
     ManufacturerDB( const QString& filename );
     virtual ~ManufacturerDB();
     const QString& lookup( const QString& macaddr ) const;
     
   private:
   
     QMap<QString, QString> manufacturers;
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
@@ -223,91 +223,64 @@ void Wellenreiter::buttonClicked()
         */
 
 
     if ( daemonRunning )
     {
         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();
+        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" );
 
     }
 }