author | mickeyl <mickeyl> | 2003-12-09 21:33:48 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-09 21:33:48 (UTC) |
commit | 0a1f6405780b18c9f3d953adcfd072de8fd4dc18 (patch) (unidiff) | |
tree | b155d2ee3c7766155b028f4e8ee92599fd50e8a9 /noncore/net/wellenreiter/gui/wellenreiter.cpp | |
parent | dc1fc74ee3988fb3a89f6fc46cbcfe8b74416647 (diff) | |
download | opie-0a1f6405780b18c9f3d953adcfd072de8fd4dc18.zip opie-0a1f6405780b18c9f3d953adcfd072de8fd4dc18.tar.gz opie-0a1f6405780b18c9f3d953adcfd072de8fd4dc18.tar.bz2 |
misc. fixes and preparations for uploading dumps
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 | |||
@@ -304,3 +304,3 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) | |||
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 | ||
@@ -508,9 +508,7 @@ void Wellenreiter::startClicked() | |||
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"; |
@@ -519,13 +517,15 @@ void Wellenreiter::startClicked() | |||
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 | ||