author | mickeyl <mickeyl> | 2003-08-11 19:04:52 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-08-11 19:04:52 (UTC) |
commit | e7f79ca3acf58aef3ff150a2974f8087189621f5 (patch) (unidiff) | |
tree | b8397506f85d9a3b547940e416111de4b2da1f18 | |
parent | 62cb34a352c38f97967882a7ac604d9670f0e75f (diff) | |
download | opie-e7f79ca3acf58aef3ff150a2974f8087189621f5.zip opie-e7f79ca3acf58aef3ff150a2974f8087189621f5.tar.gz opie-e7f79ca3acf58aef3ff150a2974f8087189621f5.tar.bz2 |
assorted fixes and more work on GPS
-rw-r--r-- | noncore/net/wellenreiter/gui/configbase.ui | 52 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 18 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.h | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gps.cpp | 48 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gps.h | 19 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 38 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 2 |
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 | |||
@@ -312,6 +312,10 @@ | |||
312 | <name>enabled</name> | 312 | <name>enabled</name> |
313 | <bool>true</bool> | 313 | <bool>true</bool> |
314 | </property> | 314 | </property> |
315 | <property stdset="1"> | ||
316 | <name>editable</name> | ||
317 | <bool>false</bool> | ||
318 | </property> | ||
315 | <property> | 319 | <property> |
316 | <name>whatsThis</name> | 320 | <name>whatsThis</name> |
317 | <string>Choose the interface used for sniffing.</string> | 321 | <string>Choose the interface used for sniffing.</string> |
@@ -1020,7 +1024,7 @@ | |||
1020 | </item> | 1024 | </item> |
1021 | <property stdset="1"> | 1025 | <property stdset="1"> |
1022 | <name>name</name> | 1026 | <name>name</name> |
1023 | <cstring>ComboBox8</cstring> | 1027 | <cstring>gpsdHost</cstring> |
1024 | </property> | 1028 | </property> |
1025 | <property stdset="1"> | 1029 | <property stdset="1"> |
1026 | <name>enabled</name> | 1030 | <name>enabled</name> |
@@ -1050,7 +1054,7 @@ | |||
1050 | <class>QSpinBox</class> | 1054 | <class>QSpinBox</class> |
1051 | <property stdset="1"> | 1055 | <property stdset="1"> |
1052 | <name>name</name> | 1056 | <name>name</name> |
1053 | <cstring>SpinBox2</cstring> | 1057 | <cstring>gpsdPort</cstring> |
1054 | </property> | 1058 | </property> |
1055 | <property stdset="1"> | 1059 | <property stdset="1"> |
1056 | <name>enabled</name> | 1060 | <name>enabled</name> |
@@ -1072,67 +1076,67 @@ | |||
1072 | </hbox> | 1076 | </hbox> |
1073 | </widget> | 1077 | </widget> |
1074 | <widget> | 1078 | <widget> |
1075 | <class>QCheckBox</class> | 1079 | <class>QLineEdit</class> |
1076 | <property stdset="1"> | 1080 | <property stdset="1"> |
1077 | <name>name</name> | 1081 | <name>name</name> |
1078 | <cstring>enableGPS</cstring> | 1082 | <cstring>commandGPS</cstring> |
1083 | </property> | ||
1084 | <property stdset="1"> | ||
1085 | <name>enabled</name> | ||
1086 | <bool>false</bool> | ||
1079 | </property> | 1087 | </property> |
1080 | <property stdset="1"> | 1088 | <property stdset="1"> |
1081 | <name>geometry</name> | 1089 | <name>geometry</name> |
1082 | <rect> | 1090 | <rect> |
1083 | <x>10</x> | 1091 | <x>10</x> |
1084 | <y>10</y> | 1092 | <y>110</y> |
1085 | <width>199</width> | 1093 | <width>210</width> |
1086 | <height>21</height> | 1094 | <height>22</height> |
1087 | </rect> | 1095 | </rect> |
1088 | </property> | 1096 | </property> |
1089 | <property stdset="1"> | 1097 | <property stdset="1"> |
1090 | <name>text</name> | 1098 | <name>text</name> |
1091 | <string>Enable GPS logging w/ gpsd</string> | 1099 | <string>gpsd -p /dev/ttyS3 -s 57600</string> |
1092 | </property> | 1100 | </property> |
1093 | </widget> | 1101 | </widget> |
1094 | <widget> | 1102 | <widget> |
1095 | <class>QCheckBox</class> | 1103 | <class>QCheckBox</class> |
1096 | <property stdset="1"> | 1104 | <property stdset="1"> |
1097 | <name>name</name> | 1105 | <name>name</name> |
1098 | <cstring>startGPS</cstring> | 1106 | <cstring>enableGPS</cstring> |
1099 | </property> | 1107 | </property> |
1100 | <property stdset="1"> | 1108 | <property stdset="1"> |
1101 | <name>geometry</name> | 1109 | <name>geometry</name> |
1102 | <rect> | 1110 | <rect> |
1103 | <x>10</x> | 1111 | <x>10</x> |
1104 | <y>80</y> | 1112 | <y>10</y> |
1105 | <width>171</width> | 1113 | <width>199</width> |
1106 | <height>21</height> | 1114 | <height>21</height> |
1107 | </rect> | 1115 | </rect> |
1108 | </property> | 1116 | </property> |
1109 | <property stdset="1"> | 1117 | <property stdset="1"> |
1110 | <name>text</name> | 1118 | <name>text</name> |
1111 | <string>Start gpsd on localhost</string> | 1119 | <string>Enable GPS logging w/ gpsd</string> |
1112 | </property> | 1120 | </property> |
1113 | </widget> | 1121 | </widget> |
1114 | <widget> | 1122 | <widget> |
1115 | <class>QLineEdit</class> | 1123 | <class>QCheckBox</class> |
1116 | <property stdset="1"> | 1124 | <property stdset="1"> |
1117 | <name>name</name> | 1125 | <name>name</name> |
1118 | <cstring>commandGPS</cstring> | 1126 | <cstring>startGPS</cstring> |
1119 | </property> | ||
1120 | <property stdset="1"> | ||
1121 | <name>enabled</name> | ||
1122 | <bool>false</bool> | ||
1123 | </property> | 1127 | </property> |
1124 | <property stdset="1"> | 1128 | <property stdset="1"> |
1125 | <name>geometry</name> | 1129 | <name>geometry</name> |
1126 | <rect> | 1130 | <rect> |
1127 | <x>10</x> | 1131 | <x>10</x> |
1128 | <y>110</y> | 1132 | <y>80</y> |
1129 | <width>210</width> | 1133 | <width>171</width> |
1130 | <height>22</height> | 1134 | <height>21</height> |
1131 | </rect> | 1135 | </rect> |
1132 | </property> | 1136 | </property> |
1133 | <property stdset="1"> | 1137 | <property stdset="1"> |
1134 | <name>text</name> | 1138 | <name>text</name> |
1135 | <string>gpsd -p /dev/ttyS3 -s 57600</string> | 1139 | <string>Start gpsd on localhost</string> |
1136 | </property> | 1140 | </property> |
1137 | </widget> | 1141 | </widget> |
1138 | </widget> | 1142 | </widget> |
@@ -1207,13 +1211,13 @@ | |||
1207 | <connection> | 1211 | <connection> |
1208 | <sender>enableGPS</sender> | 1212 | <sender>enableGPS</sender> |
1209 | <signal>toggled(bool)</signal> | 1213 | <signal>toggled(bool)</signal> |
1210 | <receiver>ComboBox8</receiver> | 1214 | <receiver>gpsdHost</receiver> |
1211 | <slot>setEnabled(bool)</slot> | 1215 | <slot>setEnabled(bool)</slot> |
1212 | </connection> | 1216 | </connection> |
1213 | <connection> | 1217 | <connection> |
1214 | <sender>enableGPS</sender> | 1218 | <sender>enableGPS</sender> |
1215 | <signal>toggled(bool)</signal> | 1219 | <signal>toggled(bool)</signal> |
1216 | <receiver>SpinBox2</receiver> | 1220 | <receiver>gpsdPort</receiver> |
1217 | <slot>setEnabled(bool)</slot> | 1221 | <slot>setEnabled(bool)</slot> |
1218 | </connection> | 1222 | </connection> |
1219 | <connection> | 1223 | <connection> |
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 | |||
@@ -190,3 +190,21 @@ void WellenreiterConfigWindow::channelAllClicked(int state) | |||
190 | channel14->setChecked( b ); | 190 | channel14->setChecked( b ); |
191 | } | 191 | } |
192 | 192 | ||
193 | |||
194 | bool WellenreiterConfigWindow::useGPS() const | ||
195 | { | ||
196 | return enableGPS->isChecked(); | ||
197 | } | ||
198 | |||
199 | |||
200 | const QString WellenreiterConfigWindow::gpsHost() const | ||
201 | { | ||
202 | return useGPS() ? gpsdHost->currentText() : QString::null; | ||
203 | } | ||
204 | |||
205 | |||
206 | int WellenreiterConfigWindow::gpsPort() const | ||
207 | { | ||
208 | bool ok; | ||
209 | return useGPS() ? gpsdPort->value() : -1; | ||
210 | } | ||
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 | |||
@@ -46,6 +46,10 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase | |||
46 | bool usePrismHeader() const; | 46 | bool usePrismHeader() const; |
47 | bool isChannelChecked( int ) const; | 47 | bool isChannelChecked( int ) const; |
48 | 48 | ||
49 | bool useGPS() const; | ||
50 | const QString gpsHost() const; | ||
51 | int gpsPort() const; | ||
52 | |||
49 | public slots: | 53 | public slots: |
50 | void changedDeviceType(int); | 54 | void changedDeviceType(int); |
51 | void getCaptureFileNameClicked(); | 55 | void getCaptureFileNameClicked(); |
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 | |||
@@ -15,3 +15,51 @@ | |||
15 | 15 | ||
16 | #include "gps.h" | 16 | #include "gps.h" |
17 | 17 | ||
18 | GPS::GPS( QObject* parent, const char * name ) | ||
19 | :QObject( parent, name ) | ||
20 | { | ||
21 | qDebug( "GPS::GPS()" ); | ||
22 | _socket = new QSocket( this, "gpsd commsock" ); | ||
23 | } | ||
24 | |||
25 | |||
26 | GPS::~GPS() | ||
27 | { | ||
28 | qDebug( "GPS::~GPS()" ); | ||
29 | } | ||
30 | |||
31 | |||
32 | bool GPS::open( const QString& host, int port ) | ||
33 | { | ||
34 | _socket->connectToHost( host, port ); | ||
35 | } | ||
36 | |||
37 | |||
38 | float GPS::latitude() const | ||
39 | { | ||
40 | char buf[256]; | ||
41 | |||
42 | int result = _socket->writeBlock( "p\r\n", 3 ); | ||
43 | if ( result ) | ||
44 | { | ||
45 | qDebug( "GPS write succeeded" ); | ||
46 | _socket->waitForMore( 20 ); | ||
47 | if ( _socket->canReadLine() ) | ||
48 | { | ||
49 | |||
50 | int num = _socket->readLine( &buf[0], sizeof buf ); | ||
51 | if ( num ) | ||
52 | { | ||
53 | qDebug( "GPS got line: %s", &buf ); | ||
54 | return 0.0; | ||
55 | } | ||
56 | } | ||
57 | } | ||
58 | return -1.0; | ||
59 | } | ||
60 | |||
61 | |||
62 | float GPS::longitute() const | ||
63 | { | ||
64 | } | ||
65 | |||
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 | |||
@@ -16,4 +16,23 @@ | |||
16 | #ifndef GPS_H | 16 | #ifndef GPS_H |
17 | #define GPS_H | 17 | #define GPS_H |
18 | 18 | ||
19 | #include <qobject.h> | ||
20 | #include <qsocket.h> | ||
21 | |||
22 | class GPS : public QObject | ||
23 | { | ||
24 | Q_OBJECT | ||
25 | |||
26 | public: | ||
27 | GPS( QObject* parent = 0, const char * name = "GPS" ); | ||
28 | ~GPS(); | ||
29 | |||
30 | bool open( const QString& host = "localhost", int port = 2947 ); | ||
31 | float latitude() const; | ||
32 | float longitute() const; | ||
33 | |||
34 | private: | ||
35 | QSocket* _socket; | ||
36 | }; | ||
37 | |||
19 | #endif // GPS_H | 38 | #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 | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | // Local | 16 | // Local |
17 | 17 | ||
18 | #include "gps.h" | ||
18 | #include "wellenreiter.h" | 19 | #include "wellenreiter.h" |
19 | #include "scanlist.h" | 20 | #include "scanlist.h" |
20 | #include "logwindow.h" | 21 | #include "logwindow.h" |
@@ -85,6 +86,8 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
85 | connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ), | 86 | connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ), |
86 | this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) ); | 87 | this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) ); |
87 | pcap = new OPacketCapturer(); | 88 | pcap = new OPacketCapturer(); |
89 | |||
90 | gps = new GPS( this ); | ||
88 | } | 91 | } |
89 | 92 | ||
90 | 93 | ||
@@ -167,6 +170,14 @@ void Wellenreiter::handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon ) | |||
167 | int channel = ds ? ds->channel() : -1; | 170 | int channel = ds ? ds->channel() : -1; |
168 | 171 | ||
169 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); | 172 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); |
173 | |||
174 | if ( configwindow->enableGPS->isChecked() ) | ||
175 | { | ||
176 | qDebug( "Wellenreiter::gathering GPS data..." ); | ||
177 | float lat = gps->latitude(); | ||
178 | qDebug( "Wellenreiter::GPS data received is ( %f , %f )", lat, 0.0 ); | ||
179 | } | ||
180 | |||
170 | netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0 ); | 181 | netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0 ); |
171 | 182 | ||
172 | // update graph window | 183 | // update graph window |
@@ -238,7 +249,7 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) | |||
238 | { | 249 | { |
239 | // go through all child packets and see if one is inside the child hierarchy for p | 250 | // go through all child packets and see if one is inside the child hierarchy for p |
240 | // if so, do what the user requested (protocolAction), e.g. pass or discard | 251 | // if so, do what the user requested (protocolAction), e.g. pass or discard |
241 | if ( !configwindow->writeCaptureFile->isOn() ) | 252 | if ( !configwindow->writeCaptureFile->isChecked() ) |
242 | return false; | 253 | return false; |
243 | 254 | ||
244 | QObjectList* l = p->queryList(); | 255 | QObjectList* l = p->queryList(); |
@@ -357,7 +368,10 @@ void Wellenreiter::startClicked() | |||
357 | 368 | ||
358 | // configure device | 369 | // configure device |
359 | ONetwork* net = ONetwork::instance(); | 370 | ONetwork* net = ONetwork::instance(); |
360 | iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); | 371 | |
372 | // TODO: check if interface is wireless and support sniffing for non-wireless interfaces | ||
373 | |||
374 | iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless! | ||
361 | 375 | ||
362 | // bring device UP | 376 | // bring device UP |
363 | iface->setUp( true ); | 377 | iface->setUp( true ); |
@@ -389,20 +403,29 @@ void Wellenreiter::startClicked() | |||
389 | iface->setMonitorMode( true ); | 403 | iface->setMonitorMode( true ); |
390 | if ( !iface->monitorMode() ) | 404 | if ( !iface->monitorMode() ) |
391 | { | 405 | { |
392 | QMessageBox::warning( this, "Wellenreiter II", | 406 | if ( QMessageBox::warning( this, "Wellenreiter II", |
393 | tr( "Can't set interface '%1'\ninto monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) ); | 407 | tr( "Can't set interface '%1'\ninto monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) + |
408 | tr( "\nContinue with limited functionality?" ), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) | ||
394 | return; | 409 | return; |
395 | } | 410 | } |
396 | } | 411 | } |
397 | 412 | ||
413 | // open GPS device | ||
414 | if ( configwindow->enableGPS->isChecked() ) | ||
415 | { | ||
416 | qDebug( "Wellenreiter:GPS enabled @ %s:%d", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | ||
417 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | ||
418 | } | ||
419 | |||
398 | // open pcap and start sniffing | 420 | // open pcap and start sniffing |
399 | if ( cardtype != DEVTYPE_FILE ) | 421 | if ( cardtype != DEVTYPE_FILE ) |
400 | { | 422 | { |
401 | pcap->open( interface ); | 423 | pcap->open( interface ); |
402 | 424 | ||
403 | if ( configwindow->writeCaptureFile->isOn() ) | 425 | if ( configwindow->writeCaptureFile->isChecked() ) |
404 | { | 426 | { |
405 | QString dumpname( configwindow->captureFileName->text() ); | 427 | QString dumpname( configwindow->captureFileName->text() ); |
428 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; | ||
406 | dumpname.append( '-' ); | 429 | dumpname.append( '-' ); |
407 | dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); | 430 | dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); |
408 | dumpname.append( ".wellenreiter" ); | 431 | dumpname.append( ".wellenreiter" ); |
@@ -430,7 +453,10 @@ void Wellenreiter::startClicked() | |||
430 | 453 | ||
431 | // start channel hopper | 454 | // start channel hopper |
432 | if ( cardtype != DEVTYPE_FILE ) | 455 | if ( cardtype != DEVTYPE_FILE ) |
433 | iface->setChannelHopping( 1000 ); //use interval from config window | 456 | { |
457 | logwindow->log( QString().sprintf( "(i) Starting channel hopper (d=%d ms)", configwindow->hopInterval->value() ) ); | ||
458 | iface->setChannelHopping( configwindow->hopInterval->value() ); //use interval from config window | ||
459 | } | ||
434 | 460 | ||
435 | if ( cardtype != DEVTYPE_FILE ) | 461 | if ( cardtype != DEVTYPE_FILE ) |
436 | { | 462 | { |
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 | |||
@@ -33,6 +33,7 @@ class OWirelessNetworkInterface; | |||
33 | class WellenreiterConfigWindow; | 33 | class WellenreiterConfigWindow; |
34 | class MLogWindow; | 34 | class MLogWindow; |
35 | class MHexWindow; | 35 | class MHexWindow; |
36 | class GPS; | ||
36 | 37 | ||
37 | class Wellenreiter : public WellenreiterBase { | 38 | class Wellenreiter : public WellenreiterBase { |
38 | Q_OBJECT | 39 | Q_OBJECT |
@@ -81,6 +82,7 @@ class Wellenreiter : public WellenreiterBase { | |||
81 | OWirelessNetworkInterface* iface; | 82 | OWirelessNetworkInterface* iface; |
82 | OPacketCapturer* pcap; | 83 | OPacketCapturer* pcap; |
83 | WellenreiterConfigWindow* configwindow; | 84 | WellenreiterConfigWindow* configwindow; |
85 | GPS* gps; | ||
84 | 86 | ||
85 | //void readConfig(); | 87 | //void readConfig(); |
86 | //void writeConfig(); | 88 | //void writeConfig(); |