summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-04-16 13:20:06 (UTC)
committer mickeyl <mickeyl>2003-04-16 13:20:06 (UTC)
commitbe5832dc22255be38884e352917f48d5b71ae657 (patch) (side-by-side diff)
treeeedcdeecb13bd873788fa53599a682b730c3286f
parent05b76911ab2082436c577c1461f0d1210ce0aa33 (diff)
downloadopie-be5832dc22255be38884e352917f48d5b71ae657.zip
opie-be5832dc22255be38884e352917f48d5b71ae657.tar.gz
opie-be5832dc22255be38884e352917f48d5b71ae657.tar.bz2
fix segfault after last packet when capturing from capture file
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index b4b6aa3..0105e09 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -362,28 +362,35 @@ void Wellenreiter::startClicked()
connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
}
else
{
// start timer for reading packets
startTimer( 100 );
}
logwindow->log( "(i) Started Scanning." );
sniffing = true;
emit( startedSniffing() );
if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
else
{
assert( parent() );
( (QMainWindow*) parent() )->setCaption( "Wellenreiter II - replaying capture file..." );
}
}
void Wellenreiter::timerEvent( QTimerEvent* )
{
qDebug( "Wellenreiter::timerEvent()" );
OPacket* p = pcap->next();
- receivePacket( p );
- delete p;
+ if ( !p ) // no more packets available
+ {
+ stopClicked();
+ }
+ else
+ {
+ receivePacket( p );
+ delete p;
+ }
}