summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-08-11 19:04:52 (UTC)
committer mickeyl <mickeyl>2003-08-11 19:04:52 (UTC)
commite7f79ca3acf58aef3ff150a2974f8087189621f5 (patch) (side-by-side diff)
treeb8397506f85d9a3b547940e416111de4b2da1f18
parent62cb34a352c38f97967882a7ac604d9670f0e75f (diff)
downloadopie-e7f79ca3acf58aef3ff150a2974f8087189621f5.zip
opie-e7f79ca3acf58aef3ff150a2974f8087189621f5.tar.gz
opie-e7f79ca3acf58aef3ff150a2974f8087189621f5.tar.bz2
assorted fixes and more work on GPS
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui52
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp18
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.h4
-rw-r--r--noncore/net/wellenreiter/gui/gps.cpp48
-rw-r--r--noncore/net/wellenreiter/gui/gps.h19
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp38
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h2
7 files changed, 151 insertions, 30 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
@@ -309,12 +309,16 @@
<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" >
@@ -1017,13 +1021,13 @@
<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">
@@ -1047,13 +1051,13 @@
</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">
@@ -1069,73 +1073,73 @@
<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>
@@ -1204,19 +1208,19 @@
<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>
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
@@ -187,6 +187,24 @@ void WellenreiterConfigWindow::channelAllClicked(int state)
channel11->setChecked( b );
channel12->setChecked( b );
channel13->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
@@ -43,12 +43,16 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
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);
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
@@ -12,6 +12,54 @@
** 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
@@ -13,7 +13,26 @@
**
**********************************************************************/
#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
@@ -12,12 +12,13 @@
** 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"
@@ -82,12 +83,14 @@ Wellenreiter::Wellenreiter( QWidget* parent )
#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;
@@ -164,12 +167,20 @@ void Wellenreiter::handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon )
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" ) );
@@ -235,13 +246,13 @@ QObject* Wellenreiter::childIfToParse( OPacket* p, const QString& 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;
@@ -354,13 +365,16 @@ void Wellenreiter::startClicked()
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",
@@ -386,26 +400,35 @@ void Wellenreiter::startClicked()
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 ) );
+ 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
@@ -427,13 +450,16 @@ void Wellenreiter::startClicked()
// 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) ) );
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
@@ -30,12 +30,13 @@ 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 );
@@ -78,12 +79,13 @@ class Wellenreiter : public WellenreiterBase {
OSystem _system; // Opie Operating System identifier
#endif
OWirelessNetworkInterface* iface;
OPacketCapturer* pcap;
WellenreiterConfigWindow* configwindow;
+ GPS* gps;
//void readConfig();
//void writeConfig();
};