Diffstat (limited to 'noncore/net/wellenreiter/gui/scanlist.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index a2be782..ed9ec14 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -133,68 +133,68 @@ void MScanListView::addNewItem( const QString& type, | |||
133 | (const char*) essid, (const char*) macaddr, channel ); | 133 | (const char*) essid, (const char*) macaddr, channel ); |
134 | #endif | 134 | #endif |
135 | 135 | ||
136 | // search, if we already have seen this net | 136 | // search, if we already have seen this net |
137 | 137 | ||
138 | QString s; | 138 | QString s; |
139 | MScanListItem* network; | 139 | MScanListItem* network; |
140 | MScanListItem* item = static_cast<MScanListItem*> ( firstChild() ); | 140 | MScanListItem* item = static_cast<MScanListItem*> ( firstChild() ); |
141 | 141 | ||
142 | while ( item && ( item->text( col_essid ) != essid ) ) | 142 | while ( item && ( item->text( col_essid ) != essid ) ) |
143 | { | 143 | { |
144 | #ifdef DEBUG | 144 | #ifdef DEBUG |
145 | odebug << "itemtext: " << (const char*) item->text( col_essid ) << "" << oendl; | 145 | odebug << "itemtext: " << item->text( col_essid ) << "" << oendl; |
146 | #endif | 146 | #endif |
147 | item = static_cast<MScanListItem*> ( item->nextSibling() ); | 147 | item = static_cast<MScanListItem*> ( item->nextSibling() ); |
148 | } | 148 | } |
149 | if ( item ) | 149 | if ( item ) |
150 | { | 150 | { |
151 | // we have already seen this net, check all childs if MAC exists | 151 | // we have already seen this net, check all childs if MAC exists |
152 | 152 | ||
153 | network = item; | 153 | network = item; |
154 | 154 | ||
155 | item = static_cast<MScanListItem*> ( item->firstChild() ); | 155 | item = static_cast<MScanListItem*> ( item->firstChild() ); |
156 | assert( item ); // this shouldn't fail | 156 | assert( item ); // this shouldn't fail |
157 | 157 | ||
158 | while ( item && ( item->text( col_ap ) != macaddr ) ) | 158 | while ( item && ( item->text( col_ap ) != macaddr ) ) |
159 | { | 159 | { |
160 | #ifdef DEBUG | 160 | #ifdef DEBUG |
161 | odebug << "subitemtext: " << (const char*) item->text( col_ap ) << "" << oendl; | 161 | odebug << "subitemtext: " << item->text( col_ap ) << "" << oendl; |
162 | #endif | 162 | #endif |
163 | item = static_cast<MScanListItem*> ( item->nextSibling() ); | 163 | item = static_cast<MScanListItem*> ( item->nextSibling() ); |
164 | } | 164 | } |
165 | 165 | ||
166 | if ( item ) | 166 | if ( item ) |
167 | { | 167 | { |
168 | // we have already seen this item, it's a dupe | 168 | // we have already seen this item, it's a dupe |
169 | #ifdef DEBUG | 169 | #ifdef DEBUG |
170 | odebug << "" << (const char*) macaddr << " is a dupe - ignoring..." << oendl; | 170 | odebug << "" << macaddr << " is a dupe - ignoring..." << oendl; |
171 | #endif | 171 | #endif |
172 | item->receivedBeacon(); | 172 | item->receivedBeacon(); |
173 | return; | 173 | return; |
174 | } | 174 | } |
175 | } | 175 | } |
176 | else | 176 | else |
177 | { | 177 | { |
178 | s.sprintf( "(i) New network: ESSID '%s'", (const char*) essid ); | 178 | s.sprintf( "(i) New network: ESSID '%s'", (const char*) essid ); |
179 | MLogWindow::logwindow()->log( s ); | 179 | MLogWindow::logwindow()->log( s ); |
180 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0, probe ); | 180 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0, probe ); |
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | // insert new station as child from network | 184 | // insert new station as child from network |
185 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? | 185 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? |
186 | 186 | ||
187 | #ifdef DEBUG | 187 | #ifdef DEBUG |
188 | odebug << "inserting new station " << (const char*) macaddr << "" << oendl; | 188 | odebug << "inserting new station " << macaddr << "" << oendl; |
189 | #endif | 189 | #endif |
190 | 190 | ||
191 | MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); | 191 | MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); |
192 | station->setManufacturer( mac.manufacturer() ); | 192 | station->setManufacturer( mac.manufacturer() ); |
193 | station->setLocation( loc.dmsPosition() ); | 193 | station->setLocation( loc.dmsPosition() ); |
194 | 194 | ||
195 | if ( type == "managed" ) | 195 | if ( type == "managed" ) |
196 | { | 196 | { |
197 | s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel ); | 197 | s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel ); |
198 | } | 198 | } |
199 | else | 199 | else |
200 | { | 200 | { |
@@ -202,59 +202,59 @@ void MScanListView::addNewItem( const QString& type, | |||
202 | } | 202 | } |
203 | MLogWindow::logwindow()->log( s ); | 203 | MLogWindow::logwindow()->log( s ); |
204 | } | 204 | } |
205 | 205 | ||
206 | 206 | ||
207 | void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& addr, const QString& type ) | 207 | void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& addr, const QString& type ) |
208 | { | 208 | { |
209 | MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() ); | 209 | MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() ); |
210 | 210 | ||
211 | while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) ) | 211 | while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) ) |
212 | { | 212 | { |
213 | #ifdef DEBUG | 213 | #ifdef DEBUG |
214 | odebug << "subitemtext: " << (const char*) subitem->text( col_ap ) << "" << oendl; | 214 | odebug << "subitemtext: " << subitem->text( col_ap ) << "" << oendl; |
215 | #endif | 215 | #endif |
216 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); | 216 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); |
217 | } | 217 | } |
218 | 218 | ||
219 | if ( subitem ) | 219 | if ( subitem ) |
220 | { | 220 | { |
221 | // we have already seen this item, it's a dupe | 221 | // we have already seen this item, it's a dupe |
222 | #ifdef DEBUG | 222 | #ifdef DEBUG |
223 | odebug << "" << (const char*) addr.toString(true) << " is a dupe - ignoring..." << oendl; | 223 | odebug << "" << addr.toString(true) << " is a dupe - ignoring..." << oendl; |
224 | #endif | 224 | #endif |
225 | subitem->receivedBeacon(); //FIXME: sent data bit | 225 | subitem->receivedBeacon(); //FIXME: sent data bit |
226 | return; | 226 | return; |
227 | } | 227 | } |
228 | 228 | ||
229 | // Hey, it seems to be a new item :-D | 229 | // Hey, it seems to be a new item :-D |
230 | MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr.toString(true), false, -1, -1 ); | 230 | MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr.toString(true), false, -1, -1 ); |
231 | station->setManufacturer( addr.manufacturer() ); | 231 | station->setManufacturer( addr.manufacturer() ); |
232 | 232 | ||
233 | QString s; | 233 | QString s; |
234 | if ( type == "station" ) | 234 | if ( type == "station" ) |
235 | { | 235 | { |
236 | s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) ); | 236 | s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) ); |
237 | } | 237 | } |
238 | else | 238 | else |
239 | { | 239 | { |
240 | s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) ); | 240 | s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) ); |
241 | } | 241 | } |
242 | MLogWindow::logwindow()->log( s ); | 242 | MLogWindow::logwindow()->log( s ); |
243 | } | 243 | } |
244 | 244 | ||
245 | 245 | ||
246 | void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) | 246 | void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) |
247 | { | 247 | { |
248 | odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << (const char*) viaTo.toString() << " seem to form a WDS" << oendl; | 248 | odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << viaTo.toString() << " seem to form a WDS" << oendl; |
249 | QString s; | 249 | QString s; |
250 | MScanListItem* network; | 250 | MScanListItem* network; |
251 | 251 | ||
252 | QListViewItemIterator it( this ); | 252 | QListViewItemIterator it( this ); |
253 | while ( it.current() && | 253 | while ( it.current() && |
254 | it.current()->text( col_ap ) != viaFrom.toString(true) && | 254 | it.current()->text( col_ap ) != viaFrom.toString(true) && |
255 | it.current()->text( col_ap ) != viaTo.toString(true) ) ++it; | 255 | it.current()->text( col_ap ) != viaTo.toString(true) ) ++it; |
256 | 256 | ||
257 | MScanListItem* item = static_cast<MScanListItem*>( it.current() ); | 257 | MScanListItem* item = static_cast<MScanListItem*>( it.current() ); |
258 | 258 | ||
259 | if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations | 259 | if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations |
260 | { | 260 | { |
@@ -314,70 +314,70 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t | |||
314 | } | 314 | } |
315 | 315 | ||
316 | 316 | ||
317 | void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ) | 317 | void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ) |
318 | { | 318 | { |
319 | owarn << "D'oh! Not yet implemented..." << oendl; | 319 | owarn << "D'oh! Not yet implemented..." << oendl; |
320 | MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" ); | 320 | MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" ); |
321 | } | 321 | } |
322 | 322 | ||
323 | 323 | ||
324 | void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) | 324 | void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) |
325 | { | 325 | { |
326 | odebug << "identify " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; | 326 | odebug << "identify " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; |
327 | 327 | ||
328 | QListViewItemIterator it( this ); | 328 | QListViewItemIterator it( this ); |
329 | for ( ; it.current(); ++it ) | 329 | for ( ; it.current(); ++it ) |
330 | { | 330 | { |
331 | if ( it.current()->text( col_ap ) == macaddr.toString(true) ) | 331 | if ( it.current()->text( col_ap ) == macaddr.toString(true) ) |
332 | { | 332 | { |
333 | it.current()->setText( col_ip, ip ); | 333 | it.current()->setText( col_ip, ip ); |
334 | return; | 334 | return; |
335 | } | 335 | } |
336 | } | 336 | } |
337 | odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; | 337 | odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; |
338 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!", | 338 | MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!", |
339 | (const char*) macaddr.toString(), (const char*) ip ) ); | 339 | (const char*) macaddr.toString(), (const char*) ip ) ); |
340 | } | 340 | } |
341 | 341 | ||
342 | 342 | ||
343 | void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip ) | 343 | void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip ) |
344 | { | 344 | { |
345 | odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; | 345 | odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; |
346 | 346 | ||
347 | //TODO: Refactor that out, we need it all over the place. | 347 | //TODO: Refactor that out, we need it all over the place. |
348 | // Best to do it in a more comfortable abstraction in OListView | 348 | // Best to do it in a more comfortable abstraction in OListView |
349 | // (Hmm, didn't I already start something in this direction?) | 349 | // (Hmm, didn't I already start something in this direction?) |
350 | 350 | ||
351 | QListViewItemIterator it( this ); | 351 | QListViewItemIterator it( this ); |
352 | for ( ; it.current(); ++it ) | 352 | for ( ; it.current(); ++it ) |
353 | { | 353 | { |
354 | if ( it.current()->text( col_ap ) == macaddr.toString(true) ) | 354 | if ( it.current()->text( col_ap ) == macaddr.toString(true) ) |
355 | { | 355 | { |
356 | 356 | ||
357 | MScanListItem* subitem = static_cast<MScanListItem*>( it.current()->firstChild() ); | 357 | MScanListItem* subitem = static_cast<MScanListItem*>( it.current()->firstChild() ); |
358 | 358 | ||
359 | while ( subitem && ( subitem->text( col_essid ) != name ) ) | 359 | while ( subitem && ( subitem->text( col_essid ) != name ) ) |
360 | { | 360 | { |
361 | #ifdef DEBUG | 361 | #ifdef DEBUG |
362 | odebug << "subitemtext: " << (const char*) subitem->text( col_essid ) << "" << oendl; | 362 | odebug << "subitemtext: " << subitem->text( col_essid ) << "" << oendl; |
363 | #endif | 363 | #endif |
364 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); | 364 | subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); |
365 | } | 365 | } |
366 | 366 | ||
367 | if ( subitem ) | 367 | if ( subitem ) |
368 | { | 368 | { |
369 | // we have already seen this item, it's a dupe | 369 | // we have already seen this item, it's a dupe |
370 | #ifdef DEBUG | 370 | #ifdef DEBUG |
371 | odebug << "" << (const char*) name << " is a dupe - ignoring..." << oendl; | 371 | odebug << "" << name << " is a dupe - ignoring..." << oendl; |
372 | #endif | 372 | #endif |
373 | subitem->receivedBeacon(); //FIXME: sent data bit | 373 | subitem->receivedBeacon(); //FIXME: sent data bit |
374 | return; | 374 | return; |
375 | } | 375 | } |
376 | 376 | ||
377 | // never seen that - add new item | 377 | // never seen that - add new item |
378 | 378 | ||
379 | MScanListItem* item = new MScanListItem( it.current(), "service", "N/A", " ", false, -1, -1 ); | 379 | MScanListItem* item = new MScanListItem( it.current(), "service", "N/A", " ", false, -1, -1 ); |
380 | item->setText( col_essid, name ); | 380 | item->setText( col_essid, name ); |
381 | 381 | ||
382 | return; | 382 | return; |
383 | } | 383 | } |
@@ -546,22 +546,22 @@ void MScanListItem::setManufacturer( const QString& manufacturer ) | |||
546 | 546 | ||
547 | 547 | ||
548 | void MScanListItem::setLocation( const QString& location ) | 548 | void MScanListItem::setLocation( const QString& location ) |
549 | { | 549 | { |
550 | setText( col_location, location ); | 550 | setText( col_location, location ); |
551 | } | 551 | } |
552 | 552 | ||
553 | 553 | ||
554 | void MScanListItem::receivedBeacon() | 554 | void MScanListItem::receivedBeacon() |
555 | { | 555 | { |
556 | _beacons++; | 556 | _beacons++; |
557 | #ifdef DEBUG | 557 | #ifdef DEBUG |
558 | odebug << "MScanListItem " << (const char*) _macaddr << ": received beacon #" << _beacons << "" << oendl; | 558 | odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; |
559 | #endif | 559 | #endif |
560 | setText( col_sig, QString::number( _beacons ) ); | 560 | setText( col_sig, QString::number( _beacons ) ); |
561 | setText( col_lastseen, QTime::currentTime().toString() ); | 561 | setText( col_lastseen, QTime::currentTime().toString() ); |
562 | 562 | ||
563 | MScanListItem* p = (MScanListItem*) parent(); | 563 | MScanListItem* p = (MScanListItem*) parent(); |
564 | if ( p ) p->receivedBeacon(); | 564 | if ( p ) p->receivedBeacon(); |
565 | 565 | ||
566 | } | 566 | } |
567 | 567 | ||