summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-05-03 13:50:22 (UTC)
committer mickeyl <mickeyl>2004-05-03 13:50:22 (UTC)
commitaad04cffe30ef133edcd5051ce7e486f27599d83 (patch) (unidiff)
tree830ccec1732ae743073511268c7bb67764c4fb6b
parent9efa98c49988a41de7613f56818f2e31bb24e22b (diff)
downloadopie-aad04cffe30ef133edcd5051ce7e486f27599d83.zip
opie-aad04cffe30ef133edcd5051ce7e486f27599d83.tar.gz
opie-aad04cffe30ef133edcd5051ce7e486f27599d83.tar.bz2
don't always write a capture file
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp30
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp12
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h2
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
@@ -31,3 +31,3 @@
31#include <qapplication.h> 31#include <qapplication.h>
32#include <qfiledialog.h> 32#include <qfiledialog.h>
33#endif 33#endif
@@ -191,3 +191,3 @@ void WellenreiterMainWindow::showConfigure()
191{ 191{
192 odebug << "show configure..." << oendl; 192 odebug << "show configure..." << oendl;
193 cw->setCaption( tr( "Configure" ) ); 193 cw->setCaption( tr( "Configure" ) );
@@ -224,3 +224,3 @@ void WellenreiterMainWindow::changedSniffingState()
224 224
225 if ( !mw->sniffing ) 225 if ( !mw->sniffing && QFile::exists( mw->dumpname ) )
226 { 226 {
@@ -234,3 +234,3 @@ WellenreiterMainWindow::~WellenreiterMainWindow()
234{ 234{
235 odebug << "Wellenreiter: bye." << oendl; 235 odebug << "Wellenreiter: bye." << oendl;
236}; 236};
@@ -254,3 +254,3 @@ void WellenreiterMainWindow::demoReadFromGps()
254 GPS* gps = new GPS( this ); 254 GPS* gps = new GPS( this );
255 odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl; 255 odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl;
256 gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); 256 gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
@@ -308,3 +308,3 @@ void WellenreiterMainWindow::fileSaveLog()
308 f.close(); 308 f.close();
309 odebug << "Saved log to file '" << fname << "'" << oendl; 309 odebug << "Saved log to file '" << fname << "'" << oendl;
310 } 310 }
@@ -312,3 +312,3 @@ void WellenreiterMainWindow::fileSaveLog()
312 { 312 {
313 odebug << "Problem saving log to file '" << fname << "'" << oendl; 313 odebug << "Problem saving log to file '" << fname << "'" << oendl;
314 } 314 }
@@ -329,3 +329,3 @@ void WellenreiterMainWindow::fileSaveSession()
329 f.close(); 329 f.close();
330 odebug << "Saved session to file '" << fname << "'" << oendl; 330 odebug << "Saved session to file '" << fname << "'" << oendl;
331 } 331 }
@@ -333,3 +333,3 @@ void WellenreiterMainWindow::fileSaveSession()
333 { 333 {
334 odebug << "Problem saving session to file '" << fname << "'" << oendl; 334 odebug << "Problem saving session to file '" << fname << "'" << oendl;
335 } 335 }
@@ -351,3 +351,3 @@ void WellenreiterMainWindow::fileSaveHex()
351 f.close(); 351 f.close();
352 odebug << "Saved hex log to file '" << fname << "'" << oendl; 352 odebug << "Saved hex log to file '" << fname << "'" << oendl;
353 } 353 }
@@ -355,3 +355,3 @@ void WellenreiterMainWindow::fileSaveHex()
355 { 355 {
356 odebug << "Problem saving hex log to file '" << fname << "'" << oendl; 356 odebug << "Problem saving hex log to file '" << fname << "'" << oendl;
357 } 357 }
@@ -372,3 +372,3 @@ void WellenreiterMainWindow::fileLoadSession()
372 f.close(); 372 f.close();
373 odebug << "Loaded session from file '" << fname << "'" << oendl; 373 odebug << "Loaded session from file '" << fname << "'" << oendl;
374 } 374 }
@@ -376,3 +376,3 @@ void WellenreiterMainWindow::fileLoadSession()
376 { 376 {
377 odebug << "Problem loading session from file '" << fname << "'" << oendl; 377 odebug << "Problem loading session from file '" << fname << "'" << oendl;
378 } 378 }
@@ -441,3 +441,3 @@ void WellenreiterMainWindow::uploadSession()
441 { 441 {
442 odebug << "Session upload cancelled :(" << oendl; 442 odebug << "Session upload cancelled :(" << oendl;
443 return; 443 return;
@@ -445,3 +445,3 @@ void WellenreiterMainWindow::uploadSession()
445 445
446 odebug << "Starting upload..." << oendl; 446 odebug << "Starting upload..." << oendl;
447 447
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
@@ -115,2 +115,3 @@ void Wellenreiter::signalHandler( int sig )
115 { 115 {
116 Wellenreiter::instance->pcap->closeDumpFile();
116 Wellenreiter::instance->pcap->close(); 117 Wellenreiter::instance->pcap->close();
@@ -624,6 +625,2 @@ void Wellenreiter::startClicked()
624 } 625 }
625 else // write it anyway ;)
626 {
627 dumpname = "/var/log/dump.wellenreiter";
628 }
629 626
@@ -634,4 +631,7 @@ void Wellenreiter::startClicked()
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
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
@@ -57,2 +57,3 @@ class Wellenreiter : public WellenreiterBase {
57 public: 57 public:
58 QString dumpname;
58 bool sniffing; 59 bool sniffing;
@@ -99,3 +100,2 @@ class Wellenreiter : public WellenreiterBase {
99 100
100 QString dumpname;
101 Opie::Net::OWirelessNetworkInterface* iface; 101 Opie::Net::OWirelessNetworkInterface* iface;