author | mickeyl <mickeyl> | 2003-05-04 20:40:28 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-05-04 20:40:28 (UTC) |
commit | 7372d0271b19bc6ead8e796a949746ae45fe13fa (patch) (unidiff) | |
tree | 35f2e418dfc4184ae335f24a487bce5a6787f129 /noncore | |
parent | 09dceae91b14a4b2d936ebfc6c7c276686c2b98c (diff) | |
download | opie-7372d0271b19bc6ead8e796a949746ae45fe13fa.zip opie-7372d0271b19bc6ead8e796a949746ae45fe13fa.tar.gz opie-7372d0271b19bc6ead8e796a949746ae45fe13fa.tar.bz2 |
- cleanup and code refactoring towards 1.0
- match IP addresses to MAC addresses by looking @ ARP packets
- show IP addresses
- reduce debug output
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 18 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/logwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/logwindow.h | 5 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 8 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 98 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 58 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 7 |
8 files changed, 158 insertions, 42 deletions
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 927f4b7..62e1d9a 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -45,3 +45,21 @@ contains( platform, x11 ) { | |||
45 | DESTDIR = $(OPIEDIR)/output/bin | 45 | DESTDIR = $(OPIEDIR)/output/bin |
46 | } | 46 | } |
47 | 47 | ||
48 | TRANSLATIONS = ../../../../i18n/de/wellenreiter.ts \ | ||
49 | ../../../../i18n/nl/wellenreiter.ts \ | ||
50 | ../../../../i18n/da/wellenreiter.ts \ | ||
51 | ../../../../i18n/xx/wellenreiter.ts \ | ||
52 | ../../../../i18n/en/wellenreiter.ts \ | ||
53 | ../../../../i18n/es/wellenreiter.ts \ | ||
54 | ../../../../i18n/fr/wellenreiter.ts \ | ||
55 | ../../../../i18n/hu/wellenreiter.ts \ | ||
56 | ../../../../i18n/ja/wellenreiter.ts \ | ||
57 | ../../../../i18n/ko/wellenreiter.ts \ | ||
58 | ../../../../i18n/no/wellenreiter.ts \ | ||
59 | ../../../../i18n/pl/wellenreiter.ts \ | ||
60 | ../../../../i18n/pt/wellenreiter.ts \ | ||
61 | ../../../../i18n/pt_BR/wellenreiter.ts \ | ||
62 | ../../../../i18n/sl/wellenreiter.ts \ | ||
63 | ../../../../i18n/zh_CN/wellenreiter.ts \ | ||
64 | ../../../../i18n/zh_TW/wellenreiter.ts | ||
65 | |||
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp index 12f74fd..6078fa2 100644 --- a/noncore/net/wellenreiter/gui/logwindow.cpp +++ b/noncore/net/wellenreiter/gui/logwindow.cpp | |||
@@ -17,11 +17,15 @@ | |||
17 | #include <qmultilineedit.h> | 17 | #include <qmultilineedit.h> |
18 | #include <qdatetime.h> | 18 | #include <qdatetime.h> |
19 | 19 | ||
20 | MLogWindow* MLogWindow::_instance; | ||
21 | |||
20 | MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f ) | 22 | MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f ) |
21 | :QVBox( parent, name, f ) | 23 | :QVBox( parent, name, f ) |
22 | { | 24 | { |
23 | ledit = new QMultiLineEdit( this ); | 25 | ledit = new QMultiLineEdit( this ); |
24 | ledit->setReadOnly( true ); | 26 | ledit->setReadOnly( true ); |
27 | |||
28 | MLogWindow::_instance = this; | ||
25 | } | 29 | } |
26 | 30 | ||
27 | 31 | ||
diff --git a/noncore/net/wellenreiter/gui/logwindow.h b/noncore/net/wellenreiter/gui/logwindow.h index 6e0fe50..da8c274 100644 --- a/noncore/net/wellenreiter/gui/logwindow.h +++ b/noncore/net/wellenreiter/gui/logwindow.h | |||
@@ -31,9 +31,14 @@ class MLogWindow: public QVBox | |||
31 | const QString getLog() const; | 31 | const QString getLog() const; |
32 | void clear(); | 32 | void clear(); |
33 | 33 | ||
34 | static MLogWindow* logwindow() { return MLogWindow::_instance; }; | ||
35 | |||
34 | protected: | 36 | protected: |
35 | QMultiLineEdit* ledit; | 37 | QMultiLineEdit* ledit; |
36 | 38 | ||
39 | private: | ||
40 | static MLogWindow* _instance; | ||
41 | |||
37 | }; | 42 | }; |
38 | 43 | ||
39 | #endif | 44 | #endif |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index c4a8fbc..773d825 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -132,11 +132,11 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
132 | demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); | 132 | demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); |
133 | 133 | ||
134 | id = mb->insertItem( tr( "&File" ), file ); | 134 | id = mb->insertItem( tr( "&File" ), file ); |
135 | id = mb->insertItem( tr( "&View" ), view ); | 135 | //id = mb->insertItem( tr( "&View" ), view ); |
136 | mb->setItemEnabled( id, false ); | 136 | //mb->setItemEnabled( id, false ); |
137 | id = mb->insertItem( tr( "&Sniffer" ), sniffer ); | 137 | id = mb->insertItem( tr( "&Sniffer" ), sniffer ); |
138 | id = mb->insertItem( tr( "&Demo" ), demo ); | 138 | //id = mb->insertItem( tr( "&Demo" ), demo ); |
139 | mb->setItemEnabled( id, true ); | 139 | //mb->setItemEnabled( id, true ); |
140 | 140 | ||
141 | #ifdef QWS | 141 | #ifdef QWS |
142 | mb->insertItem( startButton ); | 142 | mb->insertItem( startButton ); |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 3a6aa15..d5665b4 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include "scanlist.h" | 16 | #include "scanlist.h" |
17 | #include "configwindow.h" | 17 | #include "configwindow.h" |
18 | #include "logwindow.h" | ||
18 | 19 | ||
19 | #include <assert.h> | 20 | #include <assert.h> |
20 | #include "manufacturers.h" | 21 | #include "manufacturers.h" |
@@ -40,9 +41,10 @@ const int col_ap = 2; | |||
40 | const int col_channel = 3; | 41 | const int col_channel = 3; |
41 | const int col_wep = 4; | 42 | const int col_wep = 4; |
42 | const int col_traffic = 5; | 43 | const int col_traffic = 5; |
43 | const int col_manuf = 6; | 44 | const int col_ip = 6; |
44 | const int col_firstseen = 7; | 45 | const int col_manuf = 7; |
45 | const int col_lastseen = 8; | 46 | const int col_firstseen = 8; |
47 | const int col_lastseen = 9; | ||
46 | 48 | ||
47 | MScanListView::MScanListView( QWidget* parent, const char* name ) | 49 | MScanListView::MScanListView( QWidget* parent, const char* name ) |
48 | :OListView( parent, name ), _manufacturerdb( 0 ) | 50 | :OListView( parent, name ), _manufacturerdb( 0 ) |
@@ -52,23 +54,25 @@ MScanListView::MScanListView( QWidget* parent, const char* name ) | |||
52 | setFrameShadow( QListView::Sunken ); | 54 | setFrameShadow( QListView::Sunken ); |
53 | 55 | ||
54 | addColumn( tr( "Net/Station" ) ); | 56 | addColumn( tr( "Net/Station" ) ); |
55 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); | 57 | setColumnAlignment( col_essid, AlignLeft || AlignVCenter ); |
56 | addColumn( tr( "#" ) ); | 58 | addColumn( tr( "#" ) ); |
57 | setColumnAlignment( 1, AlignCenter ); | 59 | setColumnAlignment( col_sig, AlignCenter ); |
58 | addColumn( tr( "MAC" ) ); | 60 | addColumn( tr( "MAC" ) ); |
59 | setColumnAlignment( 2, AlignCenter ); | 61 | setColumnAlignment( col_ap, AlignCenter ); |
60 | addColumn( tr( "Chn" ) ); | 62 | addColumn( tr( "Chn" ) ); |
61 | setColumnAlignment( 3, AlignCenter ); | 63 | setColumnAlignment( col_channel, AlignCenter ); |
62 | addColumn( tr( "W" ) ); | 64 | addColumn( tr( "W" ) ); |
63 | setColumnAlignment( 4, AlignCenter ); | 65 | setColumnAlignment( col_wep, AlignCenter ); |
64 | addColumn( tr( "T" ) ); | 66 | addColumn( tr( "T" ) ); |
65 | setColumnAlignment( 5, AlignCenter ); | 67 | setColumnAlignment( col_traffic, AlignCenter ); |
68 | addColumn( tr( "IP" ) ); | ||
69 | setColumnAlignment( col_ip, AlignCenter ); | ||
66 | addColumn( tr( "Manufacturer" ) ); | 70 | addColumn( tr( "Manufacturer" ) ); |
67 | setColumnAlignment( 6, AlignCenter ); | 71 | setColumnAlignment( col_manuf, AlignCenter ); |
68 | addColumn( tr( "First Seen" ) ); | 72 | addColumn( tr( "First Seen" ) ); |
69 | setColumnAlignment( 7, AlignCenter ); | 73 | setColumnAlignment( col_firstseen, AlignCenter ); |
70 | addColumn( tr( "Last Seen" ) ); | 74 | addColumn( tr( "Last Seen" ) ); |
71 | setColumnAlignment( 8, AlignCenter ); | 75 | setColumnAlignment( col_lastseen, AlignCenter ); |
72 | setRootIsDecorated( true ); | 76 | setRootIsDecorated( true ); |
73 | setAllColumnsShowFocus( true ); | 77 | setAllColumnsShowFocus( true ); |
74 | }; | 78 | }; |
@@ -103,11 +107,10 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
103 | { | 107 | { |
104 | // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...) | 108 | // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...) |
105 | 109 | ||
106 | qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", | 110 | #ifdef DEBUG |
107 | (const char*) type, | 111 | qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", (const char*) type, |
108 | (const char*) essid, | 112 | (const char*) essid, (const char*) macaddr, channel ); |
109 | (const char*) macaddr, | 113 | #endif |
110 | channel ); | ||
111 | 114 | ||
112 | // search, if we already have seen this net | 115 | // search, if we already have seen this net |
113 | 116 | ||
@@ -117,7 +120,9 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
117 | 120 | ||
118 | while ( item && ( item->text( col_essid ) != essid ) ) | 121 | while ( item && ( item->text( col_essid ) != essid ) ) |
119 | { | 122 | { |
123 | #ifdef DEBUG | ||
120 | qDebug( "itemtext: %s", (const char*) item->text( col_essid ) ); | 124 | qDebug( "itemtext: %s", (const char*) item->text( col_essid ) ); |
125 | #endif | ||
121 | item = static_cast<MScanListItem*> ( item->nextSibling() ); | 126 | item = static_cast<MScanListItem*> ( item->nextSibling() ); |
122 | } | 127 | } |
123 | if ( item ) | 128 | if ( item ) |
@@ -131,7 +136,9 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
131 | 136 | ||
132 | while ( item && ( item->text( col_ap ) != macaddr ) ) | 137 | while ( item && ( item->text( col_ap ) != macaddr ) ) |
133 | { | 138 | { |
139 | #ifdef DEBUG | ||
134 | qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) ); | 140 | qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) ); |
141 | #endif | ||
135 | item = static_cast<MScanListItem*> ( item->nextSibling() ); | 142 | item = static_cast<MScanListItem*> ( item->nextSibling() ); |
136 | } | 143 | } |
137 | 144 | ||
@@ -147,8 +154,8 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
147 | } | 154 | } |
148 | else | 155 | else |
149 | { | 156 | { |
150 | s.sprintf( "(i) new network: '%s'", (const char*) essid ); | 157 | s.sprintf( "(i) New network: ESSID '%s'", (const char*) essid ); |
151 | //TODO send s to logwindow | 158 | MLogWindow::logwindow()->log( s ); |
152 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); | 159 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); |
153 | } | 160 | } |
154 | 161 | ||
@@ -156,7 +163,9 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
156 | // insert new station as child from network | 163 | // insert new station as child from network |
157 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? | 164 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? |
158 | 165 | ||
166 | #ifdef DEBUG | ||
159 | qDebug( "inserting new station %s", (const char*) macaddr ); | 167 | qDebug( "inserting new station %s", (const char*) macaddr ); |
168 | #endif | ||
160 | 169 | ||
161 | MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); | 170 | MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); |
162 | if ( _manufacturerdb ) | 171 | if ( _manufacturerdb ) |
@@ -164,13 +173,13 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
164 | 173 | ||
165 | if ( type == "managed" ) | 174 | if ( type == "managed" ) |
166 | { | 175 | { |
167 | s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); | 176 | s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel ); |
168 | } | 177 | } |
169 | else | 178 | else |
170 | { | 179 | { |
171 | s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); | 180 | s.sprintf( "(i) New AdHoc station in '%s' [%d]", (const char*) essid, channel ); |
172 | } | 181 | } |
173 | //TODO send s to logwindow | 182 | MLogWindow::logwindow()->log( s ); |
174 | 183 | ||
175 | } | 184 | } |
176 | 185 | ||
@@ -181,7 +190,9 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, cons | |||
181 | 190 | ||
182 | while ( subitem && ( subitem->text( col_ap ) != addr ) ) | 191 | while ( subitem && ( subitem->text( col_ap ) != addr ) ) |
183 | { | 192 | { |
193 | #ifdef DEBUG | ||
184 | qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) ); | 194 | qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) ); |
195 | #endif | ||
185 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); | 196 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); |
186 | } | 197 | } |
187 | 198 | ||
@@ -203,13 +214,13 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, cons | |||
203 | QString s; | 214 | QString s; |
204 | if ( type == "station" ) | 215 | if ( type == "station" ) |
205 | { | 216 | { |
206 | s.sprintf( "(i) new station in '%s' [??]", (const char*) network->text( col_essid ) ); | 217 | s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) ); |
207 | } | 218 | } |
208 | else | 219 | else |
209 | { | 220 | { |
210 | s.sprintf( "(i) new wireless station in '%s' [??]", (const char*) network->text( col_essid ) ); | 221 | s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) ); |
211 | } | 222 | } |
212 | //TODO send s to logwindow | 223 | MLogWindow::logwindow()->log( s ); |
213 | } | 224 | } |
214 | 225 | ||
215 | 226 | ||
@@ -233,6 +244,7 @@ void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QStri | |||
233 | else | 244 | else |
234 | { | 245 | { |
235 | qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" ); | 246 | qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" ); |
247 | MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" ); | ||
236 | } | 248 | } |
237 | } | 249 | } |
238 | 250 | ||
@@ -254,9 +266,12 @@ void MScanListView::toDStraffic( QString from, QString to, QString via ) | |||
254 | else | 266 | else |
255 | { | 267 | { |
256 | qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); | 268 | qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); |
269 | MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" ); | ||
270 | |||
257 | } | 271 | } |
258 | } | 272 | } |
259 | 273 | ||
274 | |||
260 | void MScanListView::fromDStraffic( QString from, QString to, QString via ) | 275 | void MScanListView::fromDStraffic( QString from, QString to, QString via ) |
261 | { | 276 | { |
262 | QString s; | 277 | QString s; |
@@ -274,14 +289,37 @@ void MScanListView::fromDStraffic( QString from, QString to, QString via ) | |||
274 | else | 289 | else |
275 | { | 290 | { |
276 | qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); | 291 | qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); |
292 | MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" ); | ||
277 | } | 293 | } |
278 | } | 294 | } |
279 | 295 | ||
296 | |||
280 | void MScanListView::IBSStraffic( QString from, QString to, QString via ) | 297 | void MScanListView::IBSStraffic( QString from, QString to, QString via ) |
281 | { | 298 | { |
282 | qWarning( "D'oh! Not yet implemented..." ); | 299 | qWarning( "D'oh! Not yet implemented..." ); |
300 | MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" ); | ||
283 | } | 301 | } |
284 | 302 | ||
303 | |||
304 | void MScanListView::identify( const QString& macaddr, const QString& ip ) | ||
305 | { | ||
306 | qDebug( "identify %s = %s", (const char*) macaddr, (const char*) ip ); | ||
307 | |||
308 | QListViewItemIterator it( this ); | ||
309 | for ( ; it.current(); ++it ) | ||
310 | { | ||
311 | if ( it.current()->text( col_ap ) == macaddr ) | ||
312 | { | ||
313 | it.current()->setText( col_ip, ip ); | ||
314 | return; | ||
315 | } | ||
316 | } | ||
317 | qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" ); | ||
318 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!", | ||
319 | (const char*) macaddr, (const char*) ip ) ); | ||
320 | } | ||
321 | |||
322 | |||
285 | //============================================================ | 323 | //============================================================ |
286 | // MScanListItem | 324 | // MScanListItem |
287 | //============================================================ | 325 | //============================================================ |
@@ -292,7 +330,9 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS | |||
292 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), | 330 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), |
293 | _channel( channel ), _signal( signal ), _beacons( 1 ) | 331 | _channel( channel ), _signal( signal ), _beacons( 1 ) |
294 | { | 332 | { |
333 | #ifdef DEBUG | ||
295 | qDebug( "creating scanlist item" ); | 334 | qDebug( "creating scanlist item" ); |
335 | #endif | ||
296 | if ( WellenreiterConfigWindow::instance() && type == "network" ) | 336 | if ( WellenreiterConfigWindow::instance() && type == "network" ) |
297 | playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() ); | 337 | playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() ); |
298 | decorateItem( type, essid, macaddr, wep, channel, signal ); | 338 | decorateItem( type, essid, macaddr, wep, channel, signal ); |
@@ -302,7 +342,9 @@ MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid | |||
302 | bool wep, int channel, int signal ) | 342 | bool wep, int channel, int signal ) |
303 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) | 343 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) |
304 | { | 344 | { |
345 | #ifdef DEBUG | ||
305 | qDebug( "creating scanlist item" ); | 346 | qDebug( "creating scanlist item" ); |
347 | #endif | ||
306 | decorateItem( type, essid, macaddr, wep, channel, signal ); | 348 | decorateItem( type, essid, macaddr, wep, channel, signal ); |
307 | } | 349 | } |
308 | 350 | ||
@@ -313,7 +355,9 @@ OListViewItem* MScanListItem::childFactory() | |||
313 | 355 | ||
314 | void MScanListItem::serializeTo( QDataStream& s ) const | 356 | void MScanListItem::serializeTo( QDataStream& s ) const |
315 | { | 357 | { |
358 | #ifdef DEBUG | ||
316 | qDebug( "serializing MScanListItem" ); | 359 | qDebug( "serializing MScanListItem" ); |
360 | #endif | ||
317 | OListViewItem::serializeTo( s ); | 361 | OListViewItem::serializeTo( s ); |
318 | 362 | ||
319 | s << _type; | 363 | s << _type; |
@@ -322,7 +366,9 @@ void MScanListItem::serializeTo( QDataStream& s ) const | |||
322 | 366 | ||
323 | void MScanListItem::serializeFrom( QDataStream& s ) | 367 | void MScanListItem::serializeFrom( QDataStream& s ) |
324 | { | 368 | { |
369 | #ifdef DEBUG | ||
325 | qDebug( "serializing MScanListItem" ); | 370 | qDebug( "serializing MScanListItem" ); |
371 | #endif | ||
326 | OListViewItem::serializeFrom( s ); | 372 | OListViewItem::serializeFrom( s ); |
327 | 373 | ||
328 | char wep; | 374 | char wep; |
@@ -340,11 +386,13 @@ void MScanListItem::serializeFrom( QDataStream& s ) | |||
340 | 386 | ||
341 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) | 387 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) |
342 | { | 388 | { |
389 | #ifdef DEBUG | ||
343 | qDebug( "decorating scanlist item %s / %s / %s [%d]", | 390 | qDebug( "decorating scanlist item %s / %s / %s [%d]", |
344 | (const char*) type, | 391 | (const char*) type, |
345 | (const char*) essid, | 392 | (const char*) essid, |
346 | (const char*) macaddr, | 393 | (const char*) macaddr, |
347 | channel ); | 394 | channel ); |
395 | #endif | ||
348 | 396 | ||
349 | // set icon for managed or adhoc mode | 397 | // set icon for managed or adhoc mode |
350 | QString name; | 398 | QString name; |
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index 56bf837..4cb9216 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h | |||
@@ -46,6 +46,8 @@ class MScanListView: public OListView | |||
46 | void WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ); | 46 | void WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ); |
47 | void IBSStraffic( QString from, QString to, QString via ); // NYI | 47 | void IBSStraffic( QString from, QString to, QString via ); // NYI |
48 | 48 | ||
49 | void identify( const QString& macaddr, const QString& ipaddr ); | ||
50 | |||
49 | protected: | 51 | protected: |
50 | void addIfNotExisting( MScanListItem* parent, QString addr, const QString& type = "station" ); | 52 | void addIfNotExisting( MScanListItem* parent, QString addr, const QString& type = "station" ); |
51 | 53 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 62bda91..9e1010b 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -137,13 +137,7 @@ void Wellenreiter::channelHopped(int c) | |||
137 | } | 137 | } |
138 | 138 | ||
139 | 139 | ||
140 | void Wellenreiter::receivePacket(OPacket* p) | 140 | void Wellenreiter::handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon ) |
141 | { | ||
142 | hexWindow()->log( p->dump( 8 ) ); | ||
143 | |||
144 | // check if we received a beacon frame | ||
145 | OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); | ||
146 | if ( beacon && beacon->managementType() == "Beacon" ) | ||
147 | { | 141 | { |
148 | QString type; | 142 | QString type; |
149 | if ( beacon->canIBSS() ) | 143 | if ( beacon->canIBSS() ) |
@@ -156,7 +150,7 @@ void Wellenreiter::receivePacket(OPacket* p) | |||
156 | } | 150 | } |
157 | else | 151 | else |
158 | { | 152 | { |
159 | qDebug( "Wellenreiter::invalid frame detected: '%s'", (const char*) p->dump( 16 ) ); | 153 | qWarning( "Wellenreiter::invalid frame [possibly noise] detected!" ); |
160 | return; | 154 | return; |
161 | } | 155 | } |
162 | 156 | ||
@@ -177,12 +171,10 @@ void Wellenreiter::receivePacket(OPacket* p) | |||
177 | else | 171 | else |
178 | graphwindow->traffic( ds->channel(), 95 ); | 172 | graphwindow->traffic( ds->channel(), 95 ); |
179 | } | 173 | } |
180 | return; | ||
181 | } | 174 | } |
182 | 175 | ||
183 | // check for a data frame | 176 | |
184 | OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) ); | 177 | void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data ) |
185 | if ( data ) | ||
186 | { | 178 | { |
187 | OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" ); | 179 | OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" ); |
188 | if ( wlan->fromDS() && !wlan->toDS() ) | 180 | if ( wlan->fromDS() && !wlan->toDS() ) |
@@ -229,8 +221,50 @@ void Wellenreiter::receivePacket(OPacket* p) | |||
229 | wlan->macAddress1().toString(), | 221 | wlan->macAddress1().toString(), |
230 | wlan->macAddress3().toString() ); | 222 | wlan->macAddress3().toString() ); |
231 | } | 223 | } |
224 | |||
225 | OARPPacket* arp = (OARPPacket*) p->child( "ARP" ); | ||
226 | if ( arp ) | ||
227 | { | ||
228 | qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() ); | ||
229 | if ( arp->type() == "REQUEST" ) | ||
230 | { | ||
231 | netView()->identify( arp->senderMacAddress().toString(), arp->senderIPV4Address().toString() ); | ||
232 | } | ||
233 | else if ( arp->type() == "REPLY" ) | ||
234 | { | ||
235 | netView()->identify( arp->senderMacAddress().toString(), arp->senderIPV4Address().toString() ); | ||
236 | netView()->identify( arp->targetMacAddress().toString(), arp->targetIPV4Address().toString() ); | ||
237 | } | ||
238 | } | ||
239 | |||
240 | OIPPacket* ip = (OIPPacket*) p->child( "IP" ); | ||
241 | if ( ip ) | ||
242 | { | ||
243 | qDebug( "Received IP packet." ); | ||
244 | } | ||
245 | } | ||
246 | |||
247 | |||
248 | void Wellenreiter::receivePacket( OPacket* p ) | ||
249 | { | ||
250 | hexWindow()->log( p->dump( 8 ) ); | ||
251 | |||
252 | // check if we received a beacon frame | ||
253 | OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); | ||
254 | if ( beacon && beacon->managementType() == "Beacon" ) | ||
255 | { | ||
256 | handleBeacon( p, beacon ); | ||
232 | return; | 257 | return; |
233 | } | 258 | } |
259 | |||
260 | //TODO: WEP check here | ||
261 | |||
262 | // check for a data frame | ||
263 | OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) ); | ||
264 | if ( data ) | ||
265 | { | ||
266 | handleData( p, data ); | ||
267 | } | ||
234 | } | 268 | } |
235 | 269 | ||
236 | 270 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index c37a9f2..ea8a692 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -26,9 +26,10 @@ using namespace Opie; | |||
26 | class QTimerEvent; | 26 | class QTimerEvent; |
27 | class QPixmap; | 27 | class QPixmap; |
28 | class OPacket; | 28 | class OPacket; |
29 | class OWaveLanManagementPacket; | ||
30 | class OWaveLanDataPacket; | ||
29 | class OPacketCapturer; | 31 | class OPacketCapturer; |
30 | class OWirelessNetworkInterface; | 32 | class OWirelessNetworkInterface; |
31 | |||
32 | class ManufacturerDB; | 33 | class ManufacturerDB; |
33 | class WellenreiterConfigWindow; | 34 | class WellenreiterConfigWindow; |
34 | class MLogWindow; | 35 | class MLogWindow; |
@@ -63,6 +64,10 @@ class Wellenreiter : public WellenreiterBase { | |||
63 | void stoppedSniffing(); | 64 | void stoppedSniffing(); |
64 | 65 | ||
65 | private: | 66 | private: |
67 | void handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon ); | ||
68 | void handleData( OPacket* p, OWaveLanDataPacket* data ); | ||
69 | |||
70 | private: | ||
66 | #ifdef QWS | 71 | #ifdef QWS |
67 | OSystem _system; // Opie Operating System identifier | 72 | OSystem _system; // Opie Operating System identifier |
68 | #endif | 73 | #endif |