Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 1d4a98b..ec89f1e 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -303,5 +303,5 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) | |||
303 | // if so, do what the user requested (protocolAction), e.g. pass or discard | 303 | // if so, do what the user requested (protocolAction), e.g. pass or discard |
304 | if ( !configwindow->writeCaptureFile->isChecked() ) | 304 | if ( !configwindow->writeCaptureFile->isChecked() ) |
305 | return false; | 305 | return true; // semantic change - we're logging anyway now to /tmp/wellenreiter |
306 | 306 | ||
307 | QObjectList* l = p->queryList(); | 307 | QObjectList* l = p->queryList(); |
@@ -507,26 +507,26 @@ void Wellenreiter::startClicked() | |||
507 | 507 | ||
508 | // open pcap and start sniffing | 508 | // open pcap and start sniffing |
509 | if ( cardtype != DEVTYPE_FILE ) | ||
510 | { | ||
511 | pcap->open( interface ); | ||
512 | 509 | ||
513 | if ( configwindow->writeCaptureFile->isChecked() ) | 510 | QString dumpname; |
511 | if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file? | ||
514 | { | 512 | { |
515 | QString dumpname( configwindow->captureFileName->text() ); | 513 | dumpname = configwindow->captureFileName->text(); |
516 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; | 514 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; |
517 | dumpname.append( '-' ); | 515 | dumpname.append( '-' ); |
518 | dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); | 516 | dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); |
519 | dumpname.append( ".wellenreiter" ); | 517 | dumpname.append( ".wellenreiter" ); |
520 | pcap->openDumpFile( dumpname ); | ||
521 | } | 518 | } |
522 | else | 519 | else // write it anyway ;) |
523 | { | 520 | { |
524 | pcap->open( interface ); | 521 | dumpname = "/var/log/dump.wellenreiter"; |
525 | } | ||
526 | } | 522 | } |
523 | |||
524 | if ( cardtype != DEVTYPE_FILE ) | ||
525 | pcap->open( interface ); | ||
527 | else | 526 | else |
528 | { | ||
529 | pcap->open( QFile( interface ) ); | 527 | pcap->open( QFile( interface ) ); |
530 | } | 528 | |
529 | qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname ); | ||
530 | pcap->openDumpFile( dumpname ); | ||
531 | 531 | ||
532 | if ( !pcap->isOpen() ) | 532 | if ( !pcap->isOpen() ) |