summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp25
1 files changed, 13 insertions, 12 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index e8d9de7..c8d77a7 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -513,29 +513,30 @@ void Wellenreiter::startClicked()
return;
}
// configure device
ONetwork* net = ONetwork::instance();
// TODO: check if interface is wireless and support sniffing for non-wireless interfaces
- if ( !net->isPresent( interface ) )
- {
- QMessageBox::information( this, "Wellenreiter II",
- tr( "The configured device (%1)\nis not available on this system\n. Please reconfigure!" ).arg( interface ) );
- return;
- }
-
- iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless!
- assert( iface );
-
- // bring device UP
if ( cardtype != DEVTYPE_FILE )
{
+
+ if ( !net->isPresent( interface ) )
+ {
+ QMessageBox::information( this, "Wellenreiter II",
+ tr( "The configured device (%1)\nis not available on this system\n. Please reconfigure!" ).arg( interface ) );
+ return;
+ }
+
+ iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless!
+ assert( iface );
+
+ // bring device UP
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;
}
}
@@ -639,17 +640,17 @@ void Wellenreiter::startClicked()
#endif
emit( startedSniffing() );
if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
else
{
assert( parent() );
( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) );
- }
+ }
}
void Wellenreiter::timerEvent( QTimerEvent* )
{
qDebug( "Wellenreiter::timerEvent()" );
OPacket* p = pcap->next();
if ( !p ) // no more packets available