assorted fixes and more work on GPS

7 files changed, 153 insertions, 32 deletions

diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index c1da98d..d9a0aea 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -219,192 +219,196 @@
                                     <cstring>channel10</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>10</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="2" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>channel7</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>7</string>
                                 </property>
                             </widget>
                             <widget row="0"  column="3" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>channel3</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>3</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="0" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>channel5</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>5</string>
                                 </property>
                             </widget>
                             <widget row="0"  column="4" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>channel4</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>4</string>
                                 </property>
                             </widget>
                             <widget row="2"  column="2" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>channel12</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>12</string>
                                 </property>
                             </widget>
                             <widget row="2"  column="3" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>channel13</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>13</string>
                                 </property>
                             </widget>
                             <widget row="2"  column="4" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>channel14</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>14</string>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                     <widget row="0"  column="1"  rowspan="1"  colspan="3" >
                         <class>QComboBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>interfaceName</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>true</bool>
                         </property>
+                        <property stdset="1">
+                            <name>editable</name>
+                            <bool>false</bool>
+                        </property>
                         <property>
                             <name>whatsThis</name>
                             <string>Choose the interface used for sniffing.</string>
                         </property>
                     </widget>
                     <widget row="1"  column="1"  rowspan="1"  colspan="3" >
                         <class>QComboBox</class>
                         <item>
                             <property>
                                 <name>text</name>
                                 <string>&lt;select&gt;</string>
                             </property>
                         </item>
                         <item>
                             <property>
                                 <name>text</name>
                                 <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>orinoco</string>
                             </property>
                         </item>
                         <item>
                             <property>
                                 <name>text</name>
                                 <string>&lt;manual&gt;</string>
                             </property>
                         </item>
                         <item>
                             <property>
                                 <name>text</name>
                                 <string>&lt;file&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>
                     <spacer row="3"  column="0" >
                         <property>
                             <name>name</name>
                             <cstring>Spacer4</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
                             <name>sizeType</name>
                             <enum>Expanding</enum>
                         </property>
                         <property>
                             <name>sizeHint</name>
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
                     <widget row="4"  column="2" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel1</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>every</string>
                         </property>
                     </widget>
                     <widget row="4"  column="0"  rowspan="1"  colspan="2" >
                         <class>QCheckBox</class>
@@ -927,300 +931,300 @@
                                     <string>Fake IP:</string>
                                 </property>
                             </widget>
                             <widget row="0"  column="1" >
                                 <class>QComboBox</class>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>192.168.125.1</string>
                                     </property>
                                 </item>
                                 <item>
                                     <property>
                                         <name>text</name>
                                         <string>&lt;automatic&gt;</string>
                                     </property>
                                 </item>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>fakeIP</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>7</hsizetype>
                                         <vsizetype>0</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>editable</name>
                                     <bool>true</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>currentItem</name>
                                     <number>0</number>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>GPS</string>
                 </attribute>
                 <widget>
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>Layout1</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
                             <x>10</x>
                             <y>40</y>
                             <width>216</width>
                             <height>27</height>
                         </rect>
                     </property>
                     <hbox>
                         <property stdset="1">
                             <name>margin</name>
                             <number>0</number>
                         </property>
                         <property stdset="1">
                             <name>spacing</name>
                             <number>6</number>
                         </property>
                         <widget>
                             <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
                                 <cstring>TextLabel1_4</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
                                 <string>Host</string>
                             </property>
                         </widget>
                         <widget>
                             <class>QComboBox</class>
                             <item>
                                 <property>
                                     <name>text</name>
                                     <string>localhost</string>
                                 </property>
                             </item>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>ComboBox8</cstring>
+                                <cstring>gpsdHost</cstring>
                             </property>
                             <property stdset="1">
                                 <name>enabled</name>
                                 <bool>false</bool>
                             </property>
                             <property stdset="1">
                                 <name>editable</name>
                                 <bool>true</bool>
                             </property>
                             <property stdset="1">
                                 <name>currentItem</name>
                                 <number>0</number>
                             </property>
                         </widget>
                         <widget>
                             <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
                                 <cstring>TextLabel2_2</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
                                 <string>:</string>
                             </property>
                         </widget>
                         <widget>
                             <class>QSpinBox</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>SpinBox2</cstring>
+                                <cstring>gpsdPort</cstring>
                             </property>
                             <property stdset="1">
                                 <name>enabled</name>
                                 <bool>false</bool>
                             </property>
                             <property stdset="1">
                                 <name>maxValue</name>
                                 <number>65535</number>
                             </property>
                             <property stdset="1">
                                 <name>minValue</name>
                                 <number>1024</number>
                             </property>
                             <property stdset="1">
                                 <name>value</name>
                                 <number>2947</number>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
                 <widget>
-                    <class>QCheckBox</class>
+                    <class>QLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>enableGPS</cstring>
+                        <cstring>commandGPS</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>false</bool>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
                             <x>10</x>
-                            <y>10</y>
-                            <width>199</width>
-                            <height>21</height>
+                            <y>110</y>
+                            <width>210</width>
+                            <height>22</height>
                         </rect>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Enable GPS logging w/ gpsd</string>
+                        <string>gpsd -p /dev/ttyS3 -s 57600</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>startGPS</cstring>
+                        <cstring>enableGPS</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
                             <x>10</x>
-                            <y>80</y>
-                            <width>171</width>
+                            <y>10</y>
+                            <width>199</width>
                             <height>21</height>
                         </rect>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Start gpsd on localhost</string>
+                        <string>Enable GPS logging w/ gpsd</string>
                     </property>
                 </widget>
                 <widget>
-                    <class>QLineEdit</class>
+                    <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>commandGPS</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>false</bool>
+                        <cstring>startGPS</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
                             <x>10</x>
-                            <y>110</y>
-                            <width>210</width>
-                            <height>22</height>
+                            <y>80</y>
+                            <width>171</width>
+                            <height>21</height>
                         </rect>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>gpsd -p /dev/ttyS3 -s 57600</string>
+                        <string>Start gpsd on localhost</string>
                     </property>
                 </widget>
             </widget>
         </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
         <class>ProtocolListView</class>
         <header location="local">protolistview.h</header>
         <sizehint>
             <width>100</width>
             <height>100</height>
         </sizehint>
         <container>0</container>
         <sizepolicy>
             <hordata>3</hordata>
             <verdata>3</verdata>
         </sizepolicy>
         <pixmap>image0</pixmap>
     </customwidget>
 </customwidgets>
 <images>
     <image>
         <name>image0</name>
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
 <connections>
     <connection>
         <sender>hopChannels</sender>
         <signal>toggled(bool)</signal>
         <receiver>hopInterval</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>hopChannels</sender>
         <signal>toggled(bool)</signal>
         <receiver>TextLabel1</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>enableActiveScanning</sender>
         <signal>toggled(bool)</signal>
         <receiver>GroupBox3</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>enableActiveScanning</sender>
         <signal>toggled(bool)</signal>
         <receiver>GroupBox4</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>writeCaptureFile</sender>
         <signal>toggled(bool)</signal>
         <receiver>getCaptureFileName</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>writeCaptureFile</sender>
         <signal>toggled(bool)</signal>
         <receiver>captureFileName</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>writeCaptureFile</sender>
         <signal>toggled(bool)</signal>
         <receiver>capturePackets</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>enableGPS</sender>
         <signal>toggled(bool)</signal>
-        <receiver>ComboBox8</receiver>
+        <receiver>gpsdHost</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>enableGPS</sender>
         <signal>toggled(bool)</signal>
-        <receiver>SpinBox2</receiver>
+        <receiver>gpsdPort</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>startGPS</sender>
         <signal>toggled(bool)</signal>
         <receiver>commandGPS</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
 </UI>
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 11394d7..a331925 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -94,99 +94,117 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
     connect( channelAll, SIGNAL( stateChanged(int) ), this, SLOT( channelAllClicked(int) ) );
 };
 
 
 int WellenreiterConfigWindow::driverType() const
 {
     QString name = deviceType->currentText();
     if ( _devicetype.contains( name ) )
     {
         return _devicetype[name];
     }
     else
     {
         return 0;
     }
 };
 
 
 int WellenreiterConfigWindow::hoppingInterval() const
 {
     return hopInterval->cleanText().toInt();
 }
 
 
 bool WellenreiterConfigWindow::usePrismHeader() const
 {
     return prismHeader->isOn();
 }
 
 
 bool WellenreiterConfigWindow::isChannelChecked( int channel ) const
 {
     switch ( channel )
     {
         case 1: return channel1->isOn();
         case 2: return channel2->isOn();
         case 3: return channel3->isOn();
         case 4: return channel4->isOn();
         case 5: return channel5->isOn();
         case 6: return channel6->isOn();
         case 7: return channel7->isOn();
         case 8: return channel8->isOn();
         case 9: return channel9->isOn();
         case 10: return channel10->isOn();
         case 11: return channel11->isOn();
         case 12: return channel12->isOn();
         case 13: return channel13->isOn();
         case 14: return channel14->isOn();
     }
 }
 
 
 void WellenreiterConfigWindow::changedDeviceType(int t)
 {
     if ( t != DEVTYPE_FILE ) return;
     QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(false);
     if ( !name.isEmpty() && QFile::exists( name ) )
     {
         interfaceName->insertItem( name );
         interfaceName->setCurrentItem( interfaceName->count()-1 );
     }
     else
     {
         deviceType->setCurrentItem( _guess );
     }
 
 }
 
 
 void WellenreiterConfigWindow::getCaptureFileNameClicked()
 {
     QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true);
     qDebug( "name = %s", (const char*) name );
     if ( !name.isEmpty() )
     {
         captureFileName->setText( name );
     }
 }
 
 
 void WellenreiterConfigWindow::channelAllClicked(int state)
 {
     bool b = state;
     channel1->setChecked( b );
     channel2->setChecked( b );
     channel3->setChecked( b );
     channel4->setChecked( b );
     channel5->setChecked( b );
     channel6->setChecked( b );
     channel7->setChecked( b );
     channel8->setChecked( b );
     channel9->setChecked( b );
     channel10->setChecked( b );
     channel11->setChecked( b );
     channel12->setChecked( b );
     channel13->setChecked( b );
-    channel14->setChecked( b );    
+    channel14->setChecked( b );
 }
 
+
+bool WellenreiterConfigWindow::useGPS() const
+{
+    return enableGPS->isChecked();
+}
+
+
+const QString WellenreiterConfigWindow::gpsHost() const
+{
+    return useGPS() ? gpsdHost->currentText() : QString::null;
+}
+
+
+int WellenreiterConfigWindow::gpsPort() const
+{
+    bool ok;
+    return useGPS() ? gpsdPort->value() : -1;
+}
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
index 32dc840..8f160b1 100644
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/noncore/net/wellenreiter/gui/configwindow.h
@@ -1,62 +1,66 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** 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.
 **
 **********************************************************************/
 
 #ifndef WELLENREITERCONFIGWINDOW_H
 #define WELLENREITERCONFIGWINDOW_H
 
 #include "configbase.h"
 #include <qmap.h>
 #include <qcombobox.h>
 #include <qstring.h>
 
 const int DEVTYPE_SELECT = 0;
 const int DEVTYPE_CISCO = 1;
 const int DEVTYPE_WLAN_NG = 2;
 const int DEVTYPE_HOSTAP = 3;
 const int DEVTYPE_ORINOCO = 4;
 const int DEVTYPE_MANUAL = 5;
 const int DEVTYPE_FILE = 6;
 
 class WellenreiterConfigWindow;
 
 class WellenreiterConfigWindow : public WellenreiterConfigBase
 {
   Q_OBJECT
 
   public:
     WellenreiterConfigWindow( QWidget * parent = 0, const char * name = "WellenreiterConfigWindow", WFlags f = 0 );
     int driverType() const;
     const QString soundOnNetwork() const { return "";/*netSound->currentText();*/ };
     const QString soundOnBeacon() const { return "";/*beaconSound->currentText();*/ };
     static WellenreiterConfigWindow* instance() { return _instance; };
 
     int hoppingInterval() const;
     bool usePrismHeader() const;
     bool isChannelChecked( int ) const;
 
+    bool useGPS() const;
+    const QString gpsHost() const;
+    int gpsPort() const;
+
   public slots:
     void changedDeviceType(int);
     void getCaptureFileNameClicked();
 
     void channelAllClicked(int);
 
   protected:
     QMap<QString, int> _devicetype;
     static WellenreiterConfigWindow* _instance;
     int _guess;
 
 };
 
 #endif
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index c3bff53..4a24647 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -1,17 +1,65 @@
 /**********************************************************************
 ** Copyright (C) 2003 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** 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 "gps.h"
 
+GPS::GPS( QObject* parent, const char * name )
+    :QObject( parent, name )
+{
+    qDebug( "GPS::GPS()" );
+    _socket = new QSocket( this, "gpsd commsock" );
+}
+
+
+GPS::~GPS()
+{
+    qDebug( "GPS::~GPS()" );
+}
+
+
+bool GPS::open( const QString& host, int port )
+{
+    _socket->connectToHost( host, port );
+}
+
+
+float GPS::latitude() const
+{
+    char buf[256];
+
+    int result = _socket->writeBlock( "p\r\n", 3 );
+    if ( result )
+    {
+        qDebug( "GPS write succeeded" );
+        _socket->waitForMore( 20 );
+        if ( _socket->canReadLine() )
+        {
+
+            int num = _socket->readLine( &buf[0], sizeof buf );
+            if ( num )
+            {
+                qDebug( "GPS got line: %s", &buf );
+                return 0.0;
+            }
+        }
+    }
+    return -1.0;
+}
+
+
+float GPS::longitute() const
+{
+}
+
diff --git a/noncore/net/wellenreiter/gui/gps.h b/noncore/net/wellenreiter/gui/gps.h
index e7c3dce..ad0b6de 100644
--- a/noncore/net/wellenreiter/gui/gps.h
+++ b/noncore/net/wellenreiter/gui/gps.h
@@ -1,19 +1,38 @@
 /**********************************************************************
 ** Copyright (C) 2003 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** 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.
 **
 **********************************************************************/
 
 #ifndef GPS_H
 #define GPS_H
 
+#include <qobject.h>
+#include <qsocket.h>
+
+class GPS : public QObject
+{
+  Q_OBJECT
+
+  public:
+    GPS( QObject* parent = 0, const char * name = "GPS" );
+    ~GPS();
+
+    bool open( const QString& host = "localhost", int port = 2947 );
+    float latitude() const;
+    float longitute() const;
+
+  private:
+    QSocket* _socket;
+};
+
 #endif // GPS_H
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 96733ff..c03debb 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -1,529 +1,555 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** 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.
 **
 ***********************************************************************/
 
 // Local
 
+#include "gps.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "configwindow.h"
 #include "statwindow.h"
 #include "graphwindow.h"
 #include "protolistview.h"
 
 // Opie
 
 #ifdef QWS
 #include <opie/odevice.h>
 #include <qpe/qcopenvelope_qws.h>
 using namespace Opie;
 #endif
 
 #ifdef QWS
 #include <opie2/oapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <opie2/onetwork.h>
 #include <opie2/opcap.h>
 
 // Qt
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qobjectlist.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qtoolbutton.h>
 #include <qmainwindow.h>
 
 // Standard
 
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
       sniffing( false ), iface( 0 ), configwindow( 0 )
 {
 
     logwindow->log( "(i) Wellenreiter has been started." );
 
     //
     // detect operating system
     //
 
     #ifdef QWS
     QString sys;
     sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() );
     _system = ODevice::inst()->system();
     logwindow->log( sys );
     #endif
 
     netview->setColumnWidthMode( 1, QListView::Manual );
     connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ),
              this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) );
     pcap = new OPacketCapturer();
+
+    gps = new GPS( this );
 }
 
 
 Wellenreiter::~Wellenreiter()
 {
     delete pcap;
 }
 
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 
 void Wellenreiter::channelHopped(int c)
 {
     QString title = "Wellenreiter II -scan- [";
     QString left;
     if ( c > 1 ) left.fill( '.', c-1 );
     title.append( left );
     title.append( '|' );
     if ( c < iface->channels() )
     {
         QString right;
         right.fill( '.', iface->channels()-c );
         title.append( right );
     }
     title.append( "]" );
     //title.append( QString().sprintf( " %02d", c ) );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( title );
 }
 
 
 void Wellenreiter::handleNotification( OPacket* p )
 {
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->parsePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->parsePackets->protocolAction( name );
             qDebug( "parsePacket-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
             doAction( action, name, p );
         }
         else
         {
             qDebug( "protocol '%s' not checked in parsePackets.", (const char*) name );
         }
     ++it;
     }
 }
 
 
 void Wellenreiter::handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon )
 {
     QString type;
     if ( beacon->canIBSS() )
     {
         type = "adhoc";
     }
     else if ( beacon->canESS() )
     {
         type = "managed";
     }
     else
     {
         qWarning( "Wellenreiter::invalid frame [possibly noise] detected!" );
         return;
     }
 
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID() : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
     int channel = ds ? ds->channel() : -1;
 
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
+
+    if ( configwindow->enableGPS->isChecked() )
+    {
+        qDebug( "Wellenreiter::gathering GPS data..." );
+        float lat = gps->latitude();
+        qDebug( "Wellenreiter::GPS data received is ( %f , %f )", lat, 0.0 );
+    }
+
     netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0 );
 
     // update graph window
     if ( ds )
     {
         OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
         if ( prism )
             graphwindow->traffic( ds->channel(), prism->signalStrength() );
         else
             graphwindow->traffic( ds->channel(), 95 );
     }
 }
 
 
 void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data )
 {
     OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
     if ( wlan->fromDS() && !wlan->toDS() )
     {
         netView()->fromDStraffic( wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
     }
     else if ( !wlan->fromDS() && wlan->toDS() )
     {
         netView()->toDStraffic( wlan->macAddress2(), wlan->macAddress3(), wlan->macAddress1() );
     }
     else if ( wlan->fromDS() && wlan->toDS() )
     {
         netView()->WDStraffic( wlan->macAddress4(), wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
     }
     else
     {
         netView()->IBSStraffic( wlan->macAddress2(), wlan->macAddress1(), wlan->macAddress3() );
     }
 
     OARPPacket* arp = (OARPPacket*) p->child( "ARP" );
     if ( arp )
     {
         qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() );
         if ( arp->type() == "REQUEST" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
         }
         else if ( arp->type() == "REPLY" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
             netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() );
         }
     }
 
     OIPPacket* ip = (OIPPacket*) p->child( "IP" );
     if ( ip )
     {
         qDebug( "Received IP packet." );
     }
 }
 
 
 QObject* Wellenreiter::childIfToParse( OPacket* p, const QString& protocol )
 {
     if ( configwindow->parsePackets->isProtocolChecked( protocol ) )
         if ( configwindow->parsePackets->protocolAction( protocol ) == "Discard!" )
             return 0;
 
     return p->child( protocol );
 }
 
 
 bool Wellenreiter::checkDumpPacket( OPacket* p )
 {
     // go through all child packets and see if one is inside the child hierarchy for p
     // if so, do what the user requested (protocolAction), e.g. pass or discard
-    if ( !configwindow->writeCaptureFile->isOn() )
+    if ( !configwindow->writeCaptureFile->isChecked() )
         return false;
 
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->capturePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->capturePackets->protocolAction( name );
             qDebug( "capturePackets-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
             if ( action == "Discard" )
             {
                 logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) );
                 return false;
             }
         }
         else
         {
             qDebug( "protocol '%s' not checked in capturePackets.", (const char*) name );
         }
     ++it;
     }
     return true;
 }
 
 
 void Wellenreiter::receivePacket( OPacket* p )
 {
     hexWindow()->log( p->dump( 8 ) );
 
     if ( checkDumpPacket( p ) )
     {
         pcap->dump( p );
     }
 
     // check if we received a beacon frame
     OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( childIfToParse( p, "802.11 Management" ) );
     if ( beacon && beacon->managementType() == "Beacon" )
     {
         handleBeacon( p, beacon );
         return;
     }
 
     //TODO: WEP check here
 
     // check for a data frame
     OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( childIfToParse( p, "802.11 Data" ) );
     if ( data )
     {
         handleData( p, data );
     }
 
     handleNotification( p );
 
 }
 
 
 void Wellenreiter::stopClicked()
 {
     if ( iface )
     {
         disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
         disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
         iface->setChannelHopping(); // stop hopping channels
     }
     else
         killTimers();
 
     pcap->close();
     sniffing = false;
 
     if ( iface )
     {
         // switch off monitor mode
         iface->setMonitorMode( false );
         // switch off promisc flag
         iface->setPromiscuousMode( false );
 
         system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess
     }
 
     logwindow->log( "(i) Stopped Scanning." );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" );
 
     // message the user
     QMessageBox::information( this, "Wellenreiter II",
                               tr( "Your wireless card\nshould now be usable again." ) );
 
     sniffing = false;
     emit( stoppedSniffing() );
 
     // print out statistics
     for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it )
        statwindow->updateCounter( it.key(), it.data() );
 }
 
 
 void Wellenreiter::startClicked()
 {
     // get configuration from config window
 
     const QString& interface = configwindow->interfaceName->currentText();
     const int cardtype = configwindow->driverType();
     const int interval = configwindow->hoppingInterval();
 
     if ( ( interface == "" ) || ( cardtype == 0 ) )
     {
         QMessageBox::information( this, "Wellenreiter II",
                                   tr( "Your device is not\nproperly configured. Please reconfigure!" ) );
         return;
     }
 
     // configure device
     ONetwork* net = ONetwork::instance();
-    iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface ));
+
+    // TODO: check if interface is wireless and support sniffing for non-wireless interfaces
+
+    iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless!
 
     // bring device UP
     iface->setUp( true );
     if ( !iface->isUp() )
     {
         QMessageBox::warning( this, "Wellenreiter II",
                             tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) );
         return;
     }
 
     // set monitor mode
     bool usePrism = configwindow->usePrismHeader();
 
     switch ( cardtype )
     {
         case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
         case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break;
         default: assert( 0 ); // shouldn't reach this
     }
 
     // switch device into monitor mode
     if ( cardtype < DEVTYPE_FILE )
     {
         if ( cardtype != DEVTYPE_MANUAL )
             iface->setMonitorMode( true );
         if ( !iface->monitorMode() )
         {
-            QMessageBox::warning( this, "Wellenreiter II",
-                                  tr( "Can't set interface '%1'\ninto monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) );
-            return;
+            if ( QMessageBox::warning( this, "Wellenreiter II",
+                                  tr( "Can't set interface '%1'\ninto monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) +
+                                  tr( "\nContinue with limited functionality?" ), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
+                return;
         }
     }
 
+    // open GPS device
+    if ( configwindow->enableGPS->isChecked() )
+    {
+        qDebug( "Wellenreiter:GPS enabled @ %s:%d", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
+        gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
+    }
+
     // open pcap and start sniffing
     if ( cardtype != DEVTYPE_FILE )
     {
         pcap->open( interface );
 
-        if ( configwindow->writeCaptureFile->isOn() )
+        if ( configwindow->writeCaptureFile->isChecked() )
         {
             QString dumpname( configwindow->captureFileName->text() );
+            if ( dumpname.isEmpty() ) dumpname = "captureFile";
             dumpname.append( '-' );
             dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
             dumpname.append( ".wellenreiter" );
             pcap->openDumpFile( dumpname );
         }
         else
         {
             pcap->open( interface );
         }
     }
     else
     {
         pcap->open( QFile( interface ) );
     }
 
     if ( !pcap->isOpen() )
     {
         QMessageBox::warning( this, "Wellenreiter II",
                               tr( "Can't open packet capturer for '%1':\n" ).arg( iface->name() ) + QString(strerror( errno ) ));
         return;
     }
 
     // set capturer to non-blocking mode
     pcap->setBlocking( false );
 
     // start channel hopper
     if ( cardtype != DEVTYPE_FILE )
-        iface->setChannelHopping( 1000 ); //use interval from config window
+    {
+        logwindow->log( QString().sprintf( "(i) Starting channel hopper (d=%d ms)", configwindow->hopInterval->value() ) );
+        iface->setChannelHopping( configwindow->hopInterval->value() ); //use interval from config window
+    }
 
     if ( cardtype != DEVTYPE_FILE )
     {
         // connect socket notifier and start channel hopper
         connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
         connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
     }
     else
     {
         // start timer for reading packets
         startTimer( 100 );
     }
 
     logwindow->log( "(i) Started Scanning." );
     sniffing = true;
     emit( startedSniffing() );
     if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
     else
     {
         assert( parent() );
         ( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) );
     }
 }
 
 
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
     qDebug( "Wellenreiter::timerEvent()" );
     OPacket* p = pcap->next();
     if ( !p ) // no more packets available
     {
         stopClicked();
     }
     else
     {
         receivePacket( p );
         delete p;
     }
 }
 
 
 void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p )
 {
     #ifdef QWS
     if ( action == "TouchSound" )
         ODevice::inst()->touchSound();
     else if ( action == "AlarmSound" )
         ODevice::inst()->alarmSound();
     else if ( action == "KeySound" )
         ODevice::inst()->keySound();
     else if ( action == "LedOn" )
         ODevice::inst()->setLedState( Led_Mail, Led_On );
     else if ( action == "LedOff" )
         ODevice::inst()->setLedState( Led_Mail, Led_Off );
     else if ( action == "LogMessage" )
         logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     else if ( action == "MessageBox" )
         QMessageBox::information( this, "Notification!",
         QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     #else
     #warning Actions do not work with Qt/X11 yet
     #endif
 }
 
 void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr)
 {
     #ifdef QWS
     if ( !iface )
     {
         QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) );
         return;
     }
 
     if ( sniffing )
     {
         QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Stop sniffing before\njoining a net." ) );
         return;
     }
 
     qDebug( "joinNetwork() with Interface %s: %s, %s, %d, %s",
         (const char*) iface->name(),
         (const char*) type,
         (const char*) essid,
         channel,
         (const char*) macaddr );
 
     QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" );
     int count = 3;
     qDebug("sending %d messages",count);
     msg << QString("count") << QString::number(count);
     qDebug("msg >%s< Mode >%s<", iface->name(),type.latin1() );
     msg << QString(iface->name()) << QString("Mode") << type;
     qDebug("msg >%s< essid >%s<", iface->name(),essid.latin1());
     msg << QString(iface->name()) << QString("ESSID") << essid;
     qDebug("msg >%s< channel >%d<", iface->name(),channel);
     msg << QString(iface->name()) << QString("Channel") << channel;
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index e1062df..43f6f99 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -1,91 +1,93 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** 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.
 **
 **********************************************************************/
 
 #ifndef WELLENREITER_H
 #define WELLENREITER_H
 
 #include "wellenreiterbase.h"
 
 #ifdef QWS
 #include <opie/odevice.h>
 using namespace Opie;
 #endif
 
 class QTimerEvent;
 class QPixmap;
 class OPacket;
 class OWaveLanManagementPacket;
 class OWaveLanDataPacket;
 class OPacketCapturer;
 class OWirelessNetworkInterface;
 class WellenreiterConfigWindow;
 class MLogWindow;
 class MHexWindow;
+class GPS;
 
 class Wellenreiter : public WellenreiterBase {
     Q_OBJECT
 
   public:
     Wellenreiter( QWidget* parent = 0 );
     ~Wellenreiter();
 
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
     MLogWindow* logWindow() const { return logwindow; };
     MHexWindow* hexWindow() const { return hexwindow; };
     bool isDaemonRunning() const { return sniffing; };
 
   public:
     bool sniffing;
 
   protected:
     virtual void timerEvent( QTimerEvent* );
 
   public slots:
     void channelHopped(int);
     void receivePacket(OPacket*);
     void startClicked();
     void stopClicked();
 
     void joinNetwork(const QString&,const QString&,int,const QString&);
 
   signals:
     void startedSniffing();
     void stoppedSniffing();
 
   private:
     void handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon );
     void handleData( OPacket* p, OWaveLanDataPacket* data );
     void handleNotification( OPacket* p );
     void doAction( const QString& action, const QString& protocol, OPacket* p );
     QObject* childIfToParse( OPacket* p, const QString& protocol );
     bool checkDumpPacket( OPacket* p );
 
   private:
     #ifdef QWS
     OSystem _system;                // Opie Operating System identifier
     #endif
 
     OWirelessNetworkInterface* iface;
     OPacketCapturer* pcap;
     WellenreiterConfigWindow* configwindow;
+    GPS* gps;
 
     //void readConfig();
     //void writeConfig();
 };
 
 
 
 #endif