don't always write a capture file

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
@@ -24,17 +24,17 @@
 /* OPIE */
 #ifdef QWS
 #include <qpe/resource.h>
 #include <opie2/odebug.h>
 #include <opie2/ofiledialog.h>
 #else
 #include "resource.h"
 #include <qapplication.h>
-#include <qfiledialog.h> 
+#include <qfiledialog.h>
 #endif
 using namespace Opie::Core;
 using namespace Opie::Net;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qcombobox.h>
 #include <qdatastream.h>
@@ -184,17 +184,17 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) );
     connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) );
 };
 
 
 
 void WellenreiterMainWindow::showConfigure()
 {
-    odebug << "show configure..." << oendl; 
+    odebug << "show configure..." << oendl;
     cw->setCaption( tr( "Configure" ) );
     int result = QPEApplication::execDialog( cw );
 
     if ( result ) updateToolButtonState();
 }
 
 
 void WellenreiterMainWindow::updateToolButtonState()
@@ -217,27 +217,27 @@ void WellenreiterMainWindow::updateToolButtonState()
 
 void WellenreiterMainWindow::changedSniffingState()
 {
     startButton->setEnabled( !mw->sniffing );
     menuBar()->setItemEnabled( startID, !mw->sniffing );
     stopButton->setEnabled( mw->sniffing );
     menuBar()->setItemEnabled( stopID, mw->sniffing );
 
-    if ( !mw->sniffing )
+    if ( !mw->sniffing && QFile::exists( mw->dumpname ) )
     {
         menuBar()->setItemEnabled( uploadID, true );
         uploadButton->setEnabled( true );
     }
 }
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
-    odebug << "Wellenreiter: bye." << oendl; 
+    odebug << "Wellenreiter: bye." << oendl;
 };
 
 
 void WellenreiterMainWindow::demoAddStations()
 {
     //mw = 0; // test SIGSEGV handling
 
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 39.8794, -94.0936) );
@@ -247,17 +247,17 @@ void WellenreiterMainWindow::demoAddStations()
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:05:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.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();
     QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) );
     delete gps;
 }
 
 
 QString WellenreiterMainWindow::getFileName( bool save )
@@ -301,42 +301,42 @@ void WellenreiterMainWindow::fileSaveLog()
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QTextStream t( &f );
             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;
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveSession()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
 
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QDataStream t( &f );
             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;
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveHex()
 {
     #warning DOES NOT WORK AT THE MOMENT
     /*
@@ -344,42 +344,42 @@ void WellenreiterMainWindow::fileSaveHex()
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QTextStream t( &f );
             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;
         }
     }
     */
 }
 
 void WellenreiterMainWindow::fileLoadSession()
 {
     QString fname = getFileName( false );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_ReadOnly) )
         {
             QDataStream t( &f );
             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;
         }
     }
 }
 
 
 void WellenreiterMainWindow::fileNew()
 {
     mw->netView()->clear();
@@ -434,21 +434,21 @@ void WellenreiterMainWindow::uploadSession()
     location->setText( "WL II Location" );
     comments->setText( "No Comments." );
     connect( accept, SIGNAL( clicked() ), d, SLOT( accept() ) );
     connect( reject, SIGNAL( clicked() ), d, SLOT( reject() ) );
     int result = d->exec();
 
     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;
     struct hostent *rhost_info;
     int sock = -1;
     bool ok = false;
 
     rhost_info = (struct hostent *) ::gethostbyname( CAP_hostname );
     if ( rhost_info )
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
@@ -108,16 +108,17 @@ void Wellenreiter::initialTimer()
 }
 
 
 void Wellenreiter::signalHandler( int sig )
 {
     oerr << "Aye! Received SIGSEGV or SIGBUS! Trying to exit gracefully..." << oendl;
     if ( Wellenreiter::instance->sniffing )
     {
+        Wellenreiter::instance->pcap->closeDumpFile();
         Wellenreiter::instance->pcap->close();
         Wellenreiter::instance->stopClicked();
     }
     oerr << "Phew. Seemed to work." << oendl;
     ::exit( -1 );
 }
 
 
@@ -617,28 +618,27 @@ void Wellenreiter::startClicked()
     if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file?
     {
         dumpname = configwindow->captureFileName->text();
         if ( dumpname.isEmpty() ) dumpname = "captureFile";
         dumpname.append( '-' );
         dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
         dumpname.append( ".wellenreiter" );
     }
-    else // write it anyway ;)
-    {
-        dumpname = "/var/log/dump.wellenreiter";
-    }
 
     if ( cardtype != DEVTYPE_FILE )
         pcap->open( interface );
     else
         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() )
     {
         QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg(
                               cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) ));
         return;
     }
 
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
@@ -50,16 +50,17 @@ class Wellenreiter : public WellenreiterBase {
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
     MLogWindow* logWindow() const { return logwindow; };
     PacketView* hexWindow() const { return hexwindow; };
     bool isDaemonRunning() const { return sniffing; };
     QString captureFileName() const { return dumpname; };
 
   public:
+    QString dumpname;
     bool sniffing;
     static Wellenreiter* instance;
     static void signalHandler( int sig );
 
   protected:
     virtual void timerEvent( QTimerEvent* );
 
   public slots:
@@ -92,17 +93,16 @@ class Wellenreiter : public WellenreiterBase {
     bool checkDumpPacket( Opie::Net::OPacket* p );
     void registerSignalHandler();
 
   private:
     #ifdef QWS
     Opie::Core::OSystem _system;                // Opie Operating System identifier
     #endif
 
-    QString dumpname;
     Opie::Net::OWirelessNetworkInterface* iface;
     Opie::Net::OPacketCapturer* pcap;
     WellenreiterConfigWindow* configwindow;
     GPS* gps;
 
     //void readConfig();
     //void writeConfig();
 };