author | mickeyl <mickeyl> | 2003-10-03 13:44:35 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-03 13:44:35 (UTC) |
commit | 120b0fe68c1352ba03ad6e73d26bcbe8452ef6ed (patch) (unidiff) | |
tree | 253c82439683b8fc2352de0859c92671568fdaff /noncore | |
parent | 9450f41ce6109fb9d22fca7b1c72c606fd37f5a7 (diff) | |
download | opie-120b0fe68c1352ba03ad6e73d26bcbe8452ef6ed.zip opie-120b0fe68c1352ba03ad6e73d26bcbe8452ef6ed.tar.gz opie-120b0fe68c1352ba03ad6e73d26bcbe8452ef6ed.tar.bz2 |
fix a few SIGSEGVs related to not checking the value of iface, if we
are capturing from a file (DEVTYPE_FILE)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 14f251a..405eda8 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -382,20 +382,22 @@ void Wellenreiter::startClicked() | |||
382 | 382 | ||
383 | // TODO: check if interface is wireless and support sniffing for non-wireless interfaces | 383 | // TODO: check if interface is wireless and support sniffing for non-wireless interfaces |
384 | 384 | ||
385 | iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless! | 385 | iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless! |
386 | 386 | ||
387 | // bring device UP | 387 | // bring device UP |
388 | iface->setUp( true ); | 388 | if ( cardtype != DEVTYPE_FILE ) |
389 | if ( !iface->isUp() ) | ||
390 | { | 389 | { |
391 | QMessageBox::warning( this, "Wellenreiter II", | 390 | iface->setUp( true ); |
392 | tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) ); | 391 | if ( !iface->isUp() ) |
393 | return; | 392 | { |
393 | QMessageBox::warning( this, "Wellenreiter II", | ||
394 | tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) ); | ||
395 | return; | ||
396 | } | ||
394 | } | 397 | } |
395 | |||
396 | // set monitor mode | 398 | // set monitor mode |
397 | bool usePrism = configwindow->usePrismHeader(); | 399 | bool usePrism = configwindow->usePrismHeader(); |
398 | 400 | ||
399 | switch ( cardtype ) | 401 | switch ( cardtype ) |
400 | { | 402 | { |
401 | case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break; | 403 | case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break; |
@@ -451,14 +453,14 @@ void Wellenreiter::startClicked() | |||
451 | { | 453 | { |
452 | pcap->open( QFile( interface ) ); | 454 | pcap->open( QFile( interface ) ); |
453 | } | 455 | } |
454 | 456 | ||
455 | if ( !pcap->isOpen() ) | 457 | if ( !pcap->isOpen() ) |
456 | { | 458 | { |
457 | QMessageBox::warning( this, "Wellenreiter II", | 459 | QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg( |
458 | tr( "Can't open packet capturer for '%1':\n" ).arg( iface->name() ) + QString(strerror( errno ) )); | 460 | cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) )); |
459 | return; | 461 | return; |
460 | } | 462 | } |
461 | 463 | ||
462 | // set capturer to non-blocking mode | 464 | // set capturer to non-blocking mode |
463 | pcap->setBlocking( false ); | 465 | pcap->setBlocking( false ); |
464 | 466 | ||