-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 30 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 12 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 8525109..ef7ffcf 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp @@ -30,5 +30,5 @@ #include "resource.h" #include <qapplication.h> -#include <qfiledialog.h> +#include <qfiledialog.h> #endif using namespace Opie::Core; @@ -190,5 +190,5 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n void WellenreiterMainWindow::showConfigure() { - odebug << "show configure..." << oendl; + odebug << "show configure..." << oendl; cw->setCaption( tr( "Configure" ) ); int result = QPEApplication::execDialog( cw ); @@ -223,5 +223,5 @@ void WellenreiterMainWindow::changedSniffingState() menuBar()->setItemEnabled( stopID, mw->sniffing ); - if ( !mw->sniffing ) + if ( !mw->sniffing && QFile::exists( mw->dumpname ) ) { menuBar()->setItemEnabled( uploadID, true ); @@ -233,5 +233,5 @@ void WellenreiterMainWindow::changedSniffingState() WellenreiterMainWindow::~WellenreiterMainWindow() { - odebug << "Wellenreiter: bye." << oendl; + odebug << "Wellenreiter: bye." << oendl; }; @@ -253,5 +253,5 @@ void WellenreiterMainWindow::demoReadFromGps() WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance(); GPS* gps = new GPS( this ); - odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl; + odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl; gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); GpsLocation loc = gps->position(); @@ -307,9 +307,9 @@ void WellenreiterMainWindow::fileSaveLog() t << mw->logWindow()->getLog(); f.close(); - odebug << "Saved log to file '" << fname << "'" << oendl; + odebug << "Saved log to file '" << fname << "'" << oendl; } else { - odebug << "Problem saving log to file '" << fname << "'" << oendl; + odebug << "Problem saving log to file '" << fname << "'" << oendl; } } @@ -328,9 +328,9 @@ void WellenreiterMainWindow::fileSaveSession() t << *mw->netView(); f.close(); - odebug << "Saved session to file '" << fname << "'" << oendl; + odebug << "Saved session to file '" << fname << "'" << oendl; } else { - odebug << "Problem saving session to file '" << fname << "'" << oendl; + odebug << "Problem saving session to file '" << fname << "'" << oendl; } } @@ -350,9 +350,9 @@ void WellenreiterMainWindow::fileSaveHex() t << mw->hexWindow()->getLog(); f.close(); - odebug << "Saved hex log to file '" << fname << "'" << oendl; + odebug << "Saved hex log to file '" << fname << "'" << oendl; } else { - odebug << "Problem saving hex log to file '" << fname << "'" << oendl; + odebug << "Problem saving hex log to file '" << fname << "'" << oendl; } } @@ -371,9 +371,9 @@ void WellenreiterMainWindow::fileLoadSession() t >> *mw->netView(); f.close(); - odebug << "Loaded session from file '" << fname << "'" << oendl; + odebug << "Loaded session from file '" << fname << "'" << oendl; } else { - odebug << "Problem loading session from file '" << fname << "'" << oendl; + odebug << "Problem loading session from file '" << fname << "'" << oendl; } } @@ -440,9 +440,9 @@ void WellenreiterMainWindow::uploadSession() if ( !result ) { - odebug << "Session upload cancelled :(" << oendl; + odebug << "Session upload cancelled :(" << oendl; return; } - odebug << "Starting upload..." << oendl; + odebug << "Starting upload..." << oendl; struct sockaddr_in raddr; 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 @@ -114,4 +114,5 @@ void Wellenreiter::signalHandler( int sig ) if ( Wellenreiter::instance->sniffing ) { + Wellenreiter::instance->pcap->closeDumpFile(); Wellenreiter::instance->pcap->close(); Wellenreiter::instance->stopClicked(); @@ -623,8 +624,4 @@ void Wellenreiter::startClicked() dumpname.append( ".wellenreiter" ); } - else // write it anyway ;) - { - dumpname = "/var/log/dump.wellenreiter"; - } if ( cardtype != DEVTYPE_FILE ) @@ -633,6 +630,9 @@ void Wellenreiter::startClicked() pcap->openCaptureFile( interface ); - odebug << "Wellenreiter:: dumping to " << dumpname << "" << oendl; - pcap->openDumpFile( dumpname ); + if ( configwindow->writeCaptureFile->isChecked() ) + { + odebug << "Wellenreiter:: dumping to " << dumpname << oendl; + pcap->openDumpFile( dumpname ); + } if ( !pcap->isOpen() ) diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index 32e5690..f582a5f 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h @@ -56,4 +56,5 @@ class Wellenreiter : public WellenreiterBase { public: + QString dumpname; bool sniffing; static Wellenreiter* instance; @@ -98,5 +99,4 @@ class Wellenreiter : public WellenreiterBase { #endif - QString dumpname; Opie::Net::OWirelessNetworkInterface* iface; Opie::Net::OPacketCapturer* pcap; |