From aad04cffe30ef133edcd5051ce7e486f27599d83 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Mon, 03 May 2004 13:50:22 +0000
Subject: don't always write a capture file

---
(limited to 'noncore/net/wellenreiter/gui')

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
@@ -29,7 +29,7 @@
 #else
 #include "resource.h"
 #include <qapplication.h>
-#include <qfiledialog.h> 
+#include <qfiledialog.h>
 #endif
 using namespace Opie::Core;
 using namespace Opie::Net;
@@ -189,7 +189,7 @@ 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 );
 
@@ -222,7 +222,7 @@ void WellenreiterMainWindow::changedSniffingState()
     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 );
@@ -232,7 +232,7 @@ void WellenreiterMainWindow::changedSniffingState()
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
-    odebug << "Wellenreiter: bye." << oendl; 
+    odebug << "Wellenreiter: bye." << oendl;
 };
 
 
@@ -252,7 +252,7 @@ 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() ) );
@@ -306,11 +306,11 @@ void WellenreiterMainWindow::fileSaveLog()
             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;
         }
     }
 }
@@ -327,11 +327,11 @@ void WellenreiterMainWindow::fileSaveSession()
             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;
         }
     }
 }
@@ -349,11 +349,11 @@ void WellenreiterMainWindow::fileSaveHex()
             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;
         }
     }
     */
@@ -370,11 +370,11 @@ void WellenreiterMainWindow::fileLoadSession()
             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;
         }
     }
 }
@@ -439,11 +439,11 @@ 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;
     struct hostent *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
@@ -113,6 +113,7 @@ 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();
     }
@@ -622,18 +623,17 @@ void Wellenreiter::startClicked()
         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() )
     {
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
@@ -55,6 +55,7 @@ class Wellenreiter : public WellenreiterBase {
     QString captureFileName() const { return dumpname; };
 
   public:
+    QString dumpname;
     bool sniffing;
     static Wellenreiter* instance;
     static void signalHandler( int sig );
@@ -97,7 +98,6 @@ class Wellenreiter : public WellenreiterBase {
     Opie::Core::OSystem _system;                // Opie Operating System identifier
     #endif
 
-    QString dumpname;
     Opie::Net::OWirelessNetworkInterface* iface;
     Opie::Net::OPacketCapturer* pcap;
     WellenreiterConfigWindow* configwindow;
--
cgit v0.9.0.2