Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index fe8f22d..2f85790 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -104,24 +104,25 @@ Wellenreiter::~Wellenreiter() | |||
104 | void Wellenreiter::initialTimer() | 104 | void Wellenreiter::initialTimer() |
105 | { | 105 | { |
106 | odebug << "preloading manufacturer database..." << oendl; | 106 | odebug << "preloading manufacturer database..." << oendl; |
107 | OManufacturerDB::instance(); | 107 | OManufacturerDB::instance(); |
108 | } | 108 | } |
109 | 109 | ||
110 | 110 | ||
111 | void Wellenreiter::signalHandler( int sig ) | 111 | void Wellenreiter::signalHandler( int sig ) |
112 | { | 112 | { |
113 | oerr << "Aye! Received SIGSEGV or SIGBUS! Trying to exit gracefully..." << oendl; | 113 | oerr << "Aye! Received SIGSEGV or SIGBUS! Trying to exit gracefully..." << oendl; |
114 | if ( Wellenreiter::instance->sniffing ) | 114 | if ( Wellenreiter::instance->sniffing ) |
115 | { | 115 | { |
116 | Wellenreiter::instance->pcap->closeDumpFile(); | ||
116 | Wellenreiter::instance->pcap->close(); | 117 | Wellenreiter::instance->pcap->close(); |
117 | Wellenreiter::instance->stopClicked(); | 118 | Wellenreiter::instance->stopClicked(); |
118 | } | 119 | } |
119 | oerr << "Phew. Seemed to work." << oendl; | 120 | oerr << "Phew. Seemed to work." << oendl; |
120 | ::exit( -1 ); | 121 | ::exit( -1 ); |
121 | } | 122 | } |
122 | 123 | ||
123 | 124 | ||
124 | void Wellenreiter::registerSignalHandler() | 125 | void Wellenreiter::registerSignalHandler() |
125 | { | 126 | { |
126 | Wellenreiter::instance = this; | 127 | Wellenreiter::instance = this; |
127 | struct sigaction action; | 128 | struct sigaction action; |
@@ -613,36 +614,35 @@ void Wellenreiter::startClicked() | |||
613 | } | 614 | } |
614 | 615 | ||
615 | // open pcap and start sniffing | 616 | // open pcap and start sniffing |
616 | 617 | ||
617 | if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file? | 618 | if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file? |
618 | { | 619 | { |
619 | dumpname = configwindow->captureFileName->text(); | 620 | dumpname = configwindow->captureFileName->text(); |
620 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; | 621 | if ( dumpname.isEmpty() ) dumpname = "captureFile"; |
621 | dumpname.append( '-' ); | 622 | dumpname.append( '-' ); |
622 | dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); | 623 | dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); |
623 | dumpname.append( ".wellenreiter" ); | 624 | dumpname.append( ".wellenreiter" ); |
624 | } | 625 | } |
625 | else // write it anyway ;) | ||
626 | { | ||
627 | dumpname = "/var/log/dump.wellenreiter"; | ||
628 | } | ||
629 | 626 | ||
630 | if ( cardtype != DEVTYPE_FILE ) | 627 | if ( cardtype != DEVTYPE_FILE ) |
631 | pcap->open( interface ); | 628 | pcap->open( interface ); |
632 | else | 629 | else |
633 | pcap->openCaptureFile( interface ); | 630 | pcap->openCaptureFile( interface ); |
634 | 631 | ||
635 | odebug << "Wellenreiter:: dumping to " << dumpname << "" << oendl; | 632 | if ( configwindow->writeCaptureFile->isChecked() ) |
636 | pcap->openDumpFile( dumpname ); | 633 | { |
634 | odebug << "Wellenreiter:: dumping to " << dumpname << oendl; | ||
635 | pcap->openDumpFile( dumpname ); | ||
636 | } | ||
637 | 637 | ||
638 | if ( !pcap->isOpen() ) | 638 | if ( !pcap->isOpen() ) |
639 | { | 639 | { |
640 | QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg( | 640 | QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg( |
641 | cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) )); | 641 | cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) )); |
642 | return; | 642 | return; |
643 | } | 643 | } |
644 | 644 | ||
645 | // set capturer to non-blocking mode | 645 | // set capturer to non-blocking mode |
646 | pcap->setBlocking( false ); | 646 | pcap->setBlocking( false ); |
647 | 647 | ||
648 | // start channel hopper | 648 | // start channel hopper |