Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 38 |
1 files changed, 19 insertions, 19 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 | |||
@@ -302,7 +302,7 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) | |||
302 | // go through all child packets and see if one is inside the child hierarchy for p | 302 | // go through all child packets and see if one is inside the child hierarchy for 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(); |
308 | QObjectListIt it( *l ); | 308 | QObjectListIt it( *l ); |
@@ -506,29 +506,29 @@ void Wellenreiter::startClicked() | |||
506 | } | 506 | } |
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; |
514 | { | 511 | if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file? |
515 | QString dumpname( configwindow->captureFileName->text() ); | 512 | { |
516 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; | 513 | dumpname = configwindow->captureFileName->text(); |
517 | dumpname.append( '-' ); | 514 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; |
518 | dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); | 515 | dumpname.append( '-' ); |
519 | dumpname.append( ".wellenreiter" ); | 516 | dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); |
520 | pcap->openDumpFile( dumpname ); | 517 | dumpname.append( ".wellenreiter" ); |
521 | } | ||
522 | else | ||
523 | { | ||
524 | pcap->open( interface ); | ||
525 | } | ||
526 | } | 518 | } |
527 | else | 519 | else // write it anyway ;) |
528 | { | 520 | { |
529 | pcap->open( QFile( interface ) ); | 521 | dumpname = "/var/log/dump.wellenreiter"; |
530 | } | 522 | } |
531 | 523 | ||
524 | if ( cardtype != DEVTYPE_FILE ) | ||
525 | pcap->open( interface ); | ||
526 | else | ||
527 | pcap->open( QFile( interface ) ); | ||
528 | |||
529 | qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname ); | ||
530 | pcap->openDumpFile( dumpname ); | ||
531 | |||
532 | if ( !pcap->isOpen() ) | 532 | if ( !pcap->isOpen() ) |
533 | { | 533 | { |
534 | QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg( | 534 | QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg( |