Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 9e1010b..705aab6 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -322,30 +322,32 @@ void Wellenreiter::startClicked() | |||
322 | QMessageBox::information( this, "Wellenreiter II", | 322 | QMessageBox::information( this, "Wellenreiter II", |
323 | tr( "Your device is not\nproperly configured. Please reconfigure!" ) ); | 323 | tr( "Your device is not\nproperly configured. Please reconfigure!" ) ); |
324 | return; | 324 | return; |
325 | } | 325 | } |
326 | 326 | ||
327 | // configure device | 327 | // configure device |
328 | 328 | ||
329 | ONetwork* net = ONetwork::instance(); | 329 | ONetwork* net = ONetwork::instance(); |
330 | iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); | 330 | iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); |
331 | 331 | ||
332 | // set monitor mode | 332 | // set monitor mode |
333 | 333 | ||
334 | bool usePrism = configwindow->usePrismHeader(); | ||
335 | |||
334 | switch ( cardtype ) | 336 | switch ( cardtype ) |
335 | { | 337 | { |
336 | case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break; | 338 | case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break; |
337 | case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break; | 339 | case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break; |
338 | case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break; | 340 | case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break; |
339 | case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break; | 341 | case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break; |
340 | case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break; | 342 | case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break; |
341 | case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; | 343 | case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; |
342 | default: assert( 0 ); // shouldn't reach this | 344 | default: assert( 0 ); // shouldn't reach this |
343 | } | 345 | } |
344 | 346 | ||
345 | // switch device into monitor mode | 347 | // switch device into monitor mode |
346 | if ( cardtype < DEVTYPE_FILE ) | 348 | if ( cardtype < DEVTYPE_FILE ) |
347 | { | 349 | { |
348 | if ( cardtype != DEVTYPE_MANUAL ) | 350 | if ( cardtype != DEVTYPE_MANUAL ) |
349 | iface->setMonitorMode( true ); | 351 | iface->setMonitorMode( true ); |
350 | if ( !iface->monitorMode() ) | 352 | if ( !iface->monitorMode() ) |
351 | { | 353 | { |