author | mickeyl <mickeyl> | 2003-10-03 13:44:35 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-03 13:44:35 (UTC) |
commit | 120b0fe68c1352ba03ad6e73d26bcbe8452ef6ed (patch) (side-by-side diff) | |
tree | 253c82439683b8fc2352de0859c92671568fdaff /noncore/net/wellenreiter/gui/wellenreiter.cpp | |
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)
Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-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 @@ -376,32 +376,34 @@ void Wellenreiter::startClicked() tr( "Your device is not\nproperly configured. Please reconfigure!" ) ); return; } // configure device ONetwork* net = ONetwork::instance(); // TODO: check if interface is wireless and support sniffing for non-wireless interfaces iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless! // bring device UP - iface->setUp( true ); - if ( !iface->isUp() ) + if ( cardtype != DEVTYPE_FILE ) { - QMessageBox::warning( this, "Wellenreiter II", - tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) ); - return; + iface->setUp( true ); + if ( !iface->isUp() ) + { + QMessageBox::warning( this, "Wellenreiter II", + tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) ); + return; + } } - // set monitor mode bool usePrism = configwindow->usePrismHeader(); switch ( cardtype ) { case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break; case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break; case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break; case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break; case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break; case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; default: assert( 0 ); // shouldn't reach this @@ -445,26 +447,26 @@ void Wellenreiter::startClicked() else { pcap->open( interface ); } } else { pcap->open( QFile( interface ) ); } if ( !pcap->isOpen() ) { - QMessageBox::warning( this, "Wellenreiter II", - tr( "Can't open packet capturer for '%1':\n" ).arg( iface->name() ) + QString(strerror( errno ) )); + QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg( + cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) )); return; } // set capturer to non-blocking mode pcap->setBlocking( false ); // start channel hopper if ( cardtype != DEVTYPE_FILE ) { logwindow->log( QString().sprintf( "(i) Starting channel hopper (d=%d ms)", configwindow->hopInterval->value() ) ); iface->setChannelHopping( configwindow->hopInterval->value() ); //use interval from config window } |