summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-09-09 13:42:04 (UTC)
committer mickeyl <mickeyl>2003-09-09 13:42:04 (UTC)
commit807165ababca1b8c93b88d6b41f75ec96ce5e799 (patch) (unidiff)
tree5042886f052d34d7d79bf4e784f87cbad171c86c
parentfca4c73a5f0c672db9150f312eb85f1299e80e1b (diff)
downloadopie-807165ababca1b8c93b88d6b41f75ec96ce5e799.zip
opie-807165ababca1b8c93b88d6b41f75ec96ce5e799.tar.gz
opie-807165ababca1b8c93b88d6b41f75ec96ce5e799.tar.bz2
reading GPS data from gpsd is now working. TODO: save the data
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/gps.cpp29
-rw-r--r--noncore/net/wellenreiter/gui/gps.h12
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp11
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp21
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.h6
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp8
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp4
7 files changed, 64 insertions, 27 deletions
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index 3206655..288afee 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -14,8 +14,11 @@
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "gps.h" 16#include "gps.h"
17#include <unistd.h> 17#include <unistd.h>
18
19#include <qtextstream.h>
20
18GPS::GPS( QObject* parent, const char * name ) 21GPS::GPS( QObject* parent, const char * name )
19 :QObject( parent, name ) 22 :QObject( parent, name )
20{ 23{
21 qDebug( "GPS::GPS()" ); 24 qDebug( "GPS::GPS()" );
@@ -34,9 +37,9 @@ bool GPS::open( const QString& host, int port )
34 _socket->connectToHost( host, port ); 37 _socket->connectToHost( host, port );
35} 38}
36 39
37 40
38float GPS::latitude() const 41GpsLocation GPS::position() const
39{ 42{
40 char buf[256]; 43 char buf[256];
41 44
42 int result = _socket->writeBlock( "p\r\n", 3 ); 45 int result = _socket->writeBlock( "p\r\n", 3 );
@@ -46,21 +49,21 @@ float GPS::latitude() const
46 int numAvail = _socket->bytesAvailable(); 49 int numAvail = _socket->bytesAvailable();
47 qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail ); 50 qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail );
48 if ( numAvail ) 51 if ( numAvail )
49 { 52 {
53 QTextStream stream( _socket );
50 54
51 int num = _socket->readLine( &buf[0], sizeof buf ); 55 QString str;
52 if ( num ) 56 stream.readRawBytes( &buf[0], 7 );
53 { 57 float lat = -111.111;
54 qDebug( "GPS got %d bytes ['%s']", num, &buf[0] ); 58 stream >> lat;
55 return 0.0; 59 stream.skipWhiteSpace();
56 } 60 float lon = -111.111;
61 stream >> lon;
62 stream.readRawBytes( &buf[0], 200 ); // read and discard the stuff until EOF
63
64 return GpsLocation( lat, lon );
57 } 65 }
58 } 66 }
59 return -1.0; 67 return GpsLocation( -1.0, -1.0 );
60}
61
62
63float GPS::longitute() const
64{
65} 68}
66 69
diff --git a/noncore/net/wellenreiter/gui/gps.h b/noncore/net/wellenreiter/gui/gps.h
index ad0b6de..8143fe4 100644
--- a/noncore/net/wellenreiter/gui/gps.h
+++ b/noncore/net/wellenreiter/gui/gps.h
@@ -18,8 +18,17 @@
18 18
19#include <qobject.h> 19#include <qobject.h>
20#include <qsocket.h> 20#include <qsocket.h>
21 21
22struct GpsLocation
23{
24 GpsLocation( const float& lat, const float& lon ) : latitude(lat), longitude(lon) {};
25 ~GpsLocation() {};
26 float latitude;
27 float longitude;
28};
29
30
22class GPS : public QObject 31class GPS : public QObject
23{ 32{
24 Q_OBJECT 33 Q_OBJECT
25 34
@@ -27,10 +36,9 @@ class GPS : public QObject
27 GPS( QObject* parent = 0, const char * name = "GPS" ); 36 GPS( QObject* parent = 0, const char * name = "GPS" );
28 ~GPS(); 37 ~GPS();
29 38
30 bool open( const QString& host = "localhost", int port = 2947 ); 39 bool open( const QString& host = "localhost", int port = 2947 );
31 float latitude() const; 40 GpsLocation position() const;
32 float longitute() const;
33 41
34 private: 42 private:
35 QSocket* _socket; 43 QSocket* _socket;
36}; 44};
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 27ecae3..868b0b0 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -13,8 +13,9 @@
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "configwindow.h" 16#include "configwindow.h"
17#include "gps.h"
17#include "logwindow.h" 18#include "logwindow.h"
18#include "hexwindow.h" 19#include "hexwindow.h"
19#include "mainwindow.h" 20#include "mainwindow.h"
20#include "wellenreiter.h" 21#include "wellenreiter.h"
@@ -217,13 +218,13 @@ WellenreiterMainWindow::~WellenreiterMainWindow()
217void WellenreiterMainWindow::demoAddStations() 218void WellenreiterMainWindow::demoAddStations()
218{ 219{
219 //mw = 0; // test SIGSGV handling 220 //mw = 0; // test SIGSGV handling
220 221
221 mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80 ); 222 mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 10.10, 20.20 ) );
222 mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10 ); 223 mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) );
223 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:A0:F8:E7:16:22"), false, 3, 10 ); 224 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:A0:F8:E7:16:22"), false, 3, 10, GpsLocation( 5.5, 2.3 ) );
224 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:AA:01:E7:56:62"), false, 3, 15 ); 225 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:AA:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) );
225 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:B0:8E:E7:56:E2"), false, 3, 20 ); 226 mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:B0:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.5 ) );
226} 227}
227 228
228 229
229QString WellenreiterMainWindow::getFileName( bool save ) 230QString WellenreiterMainWindow::getFileName( bool save )
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index f4cfe52..d695c17 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -46,8 +46,9 @@ const int col_traffic = 5;
46const int col_ip = 6; 46const int col_ip = 6;
47const int col_manuf = 7; 47const int col_manuf = 7;
48const int col_firstseen = 8; 48const int col_firstseen = 8;
49const int col_lastseen = 9; 49const int col_lastseen = 9;
50const int col_location = 10;
50 51
51MScanListView::MScanListView( QWidget* parent, const char* name ) 52MScanListView::MScanListView( QWidget* parent, const char* name )
52 :OListView( parent, name ) 53 :OListView( parent, name )
53{ 54{
@@ -74,8 +75,10 @@ MScanListView::MScanListView( QWidget* parent, const char* name )
74 addColumn( tr( "First Seen" ) ); 75 addColumn( tr( "First Seen" ) );
75 setColumnAlignment( col_firstseen, AlignCenter ); 76 setColumnAlignment( col_firstseen, AlignCenter );
76 addColumn( tr( "Last Seen" ) ); 77 addColumn( tr( "Last Seen" ) );
77 setColumnAlignment( col_lastseen, AlignCenter ); 78 setColumnAlignment( col_lastseen, AlignCenter );
79 addColumn( tr( "Location" ) );
80 setColumnAlignment( col_location, AlignCenter );
78 setRootIsDecorated( true ); 81 setRootIsDecorated( true );
79 setAllColumnsShowFocus( true ); 82 setAllColumnsShowFocus( true );
80 83
81 connect( this, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ), 84 connect( this, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
@@ -112,9 +115,15 @@ void MScanListView::serializeFrom( QDataStream& s)
112 OListView::serializeFrom( s ); 115 OListView::serializeFrom( s );
113} 116}
114 117
115 118
116void MScanListView::addNewItem( const QString& type, const QString& essid, const OMacAddress& mac, bool wep, int channel, int signal ) 119void MScanListView::addNewItem( const QString& type,
120 const QString& essid,
121 const OMacAddress& mac,
122 bool wep,
123 int channel,
124 int signal,
125 const GpsLocation& loc )
117{ 126{
118 QString macaddr = mac.toString(true); 127 QString macaddr = mac.toString(true);
119 128
120 #ifdef DEBUG 129 #ifdef DEBUG
@@ -178,8 +187,9 @@ void MScanListView::addNewItem( const QString& type, const QString& essid, const
178 #endif 187 #endif
179 188
180 MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); 189 MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
181 station->setManufacturer( mac.manufacturer() ); 190 station->setManufacturer( mac.manufacturer() );
191 station->setLocation( loc.latitude, loc.longitude );
182 192
183 if ( type == "managed" ) 193 if ( type == "managed" )
184 { 194 {
185 s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel ); 195 s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel );
@@ -467,8 +477,17 @@ void MScanListItem::setManufacturer( const QString& manufacturer )
467 setText( col_manuf, manufacturer ); 477 setText( col_manuf, manufacturer );
468} 478}
469 479
470 480
481void MScanListItem::setLocation( const float& latitude, const float& longitude )
482{
483 if ( latitude == 0.0 || longitude == 0.0 )
484 setText( col_location, "N/A" );
485 else
486 setText( col_location, QString().sprintf( "%.2f / %.2f", latitude, longitude ) );
487}
488
489
471void MScanListItem::playSound( const QString& sound ) const 490void MScanListItem::playSound( const QString& sound ) const
472{ 491{
473 #ifdef QWS 492 #ifdef QWS
474 if ( sound == "Ignore" ) return; 493 if ( sound == "Ignore" ) return;
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 5aba0d2..2703b6a 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -15,8 +15,10 @@
15 15
16#ifndef SCANLIST_H 16#ifndef SCANLIST_H
17#define SCANLIST_H 17#define SCANLIST_H
18 18
19#include "gps.h"
20
19/* OPIE */ 21/* OPIE */
20#include <opie2/olistview.h> 22#include <opie2/olistview.h>
21#include <opie2/onetutils.h> 23#include <opie2/onetutils.h>
22 24
@@ -38,9 +40,10 @@ class MScanListView: public OListView
38 virtual void serializeTo( QDataStream& s ) const; 40 virtual void serializeTo( QDataStream& s ) const;
39 virtual void serializeFrom( QDataStream& s ); 41 virtual void serializeFrom( QDataStream& s );
40 42
41 public slots: 43 public slots:
42 void addNewItem( const QString& type, const QString& essid, const OMacAddress& macaddr, bool wep, int channel, int signal ); 44 void addNewItem( const QString& type, const QString& essid, const OMacAddress& macaddr, bool wep, int channel, int signal, const GpsLocation& location );
45
43 void fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); 46 void fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
44 void toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); 47 void toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
45 void WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ); 48 void WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo );
46 void IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); 49 void IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
@@ -98,8 +101,9 @@ class MScanListItem: public OListViewItem
98 void setSignal( int signal ) { /* TODO */ }; 101 void setSignal( int signal ) { /* TODO */ };
99 void receivedBeacon(); 102 void receivedBeacon();
100 103
101 void setManufacturer( const QString& manufacturer ); 104 void setManufacturer( const QString& manufacturer );
105 void setLocation( const float& latitude, const float& longitude );
102 106
103 virtual OListViewItem* childFactory(); 107 virtual OListViewItem* childFactory();
104 virtual void serializeTo( QDataStream& s ) const; 108 virtual void serializeTo( QDataStream& s ) const;
105 virtual void serializeFrom( QDataStream& s ); 109 virtual void serializeFrom( QDataStream& s );
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index c03debb..5dc2e79 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -170,16 +170,18 @@ void Wellenreiter::handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon )
170 int channel = ds ? ds->channel() : -1; 170 int channel = ds ? ds->channel() : -1;
171 171
172 OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); 172 OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
173 173
174 GpsLocation loc( 0, 0 );
174 if ( configwindow->enableGPS->isChecked() ) 175 if ( configwindow->enableGPS->isChecked() )
175 { 176 {
177 // TODO: add check if GPS is working!?
176 qDebug( "Wellenreiter::gathering GPS data..." ); 178 qDebug( "Wellenreiter::gathering GPS data..." );
177 float lat = gps->latitude(); 179 loc = gps->position();
178 qDebug( "Wellenreiter::GPS data received is ( %f , %f )", lat, 0.0 ); 180 qDebug( "Wellenreiter::GPS data received is ( %f , %f )", loc.latitude, loc.longitude );
179 } 181 }
180 182
181 netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0 ); 183 netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0, loc );
182 184
183 // update graph window 185 // update graph window
184 if ( ds ) 186 if ( ds )
185 { 187 {
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index 36fbb9a..eac5d89 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -122,12 +122,12 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
122 TextLabel1_4_2_font.setPointSize( 10 ); 122 TextLabel1_4_2_font.setPointSize( 10 );
123 TextLabel1_4_2->setFont( TextLabel1_4_2_font ); 123 TextLabel1_4_2->setFont( TextLabel1_4_2_font );
124 TextLabel1_4_2->setText( tr( "<p align=center>\n" 124 TextLabel1_4_2->setText( tr( "<p align=center>\n"
125"<hr>\n" 125"<hr>\n"
126"Michael 'Mickey' Lauer<br><hr>\n"
126"Max Moser<br>\n" 127"Max Moser<br>\n"
127"Martin J. Muench<br>\n" 128"Martin J. Muench<br>\n"
128"Michael Lauer<br><hr>\n" 129"<b>www.wellenreiter.net</b>\n"
129"<b>www.remote-exploit.org</b>\n"
130"</p>" ) ); 130"</p>" ) );
131 TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) ); 131 TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) );
132 132
133 aboutLayout->addWidget( TextLabel1_4_2, 1, 0 ); 133 aboutLayout->addWidget( TextLabel1_4_2, 1, 0 );