summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/main.cpp59
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp13
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp2
3 files changed, 72 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 8d4ef57..03da135 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -20,6 +20,20 @@
20#include <qapplication.h> 20#include <qapplication.h>
21#endif 21#endif
22 22
23#include <qmessagebox.h>
24#include <qstringlist.h>
25
26// ==> OProcess
27#include <qdir.h>
28#include <qfileinfo.h>
29#include <qregexp.h>
30#include <qtextstream.h>
31
32#include <errno.h>
33#include <signal.h>
34#include <string.h>
35#include <unistd.h>
36
23int main( int argc, char **argv ) 37int main( int argc, char **argv )
24{ 38{
25 #ifdef QWS 39 #ifdef QWS
@@ -34,6 +48,51 @@ int main( int argc, char **argv )
34 a.setMainWidget( w ); 48 a.setMainWidget( w );
35 w->show(); 49 w->show();
36 #endif 50 #endif
51
52 a.processEvents(); // show the window before doing the safety checks
53 int result = -1;
54
55 // root check
56 if ( getuid() )
57 {
58 qWarning( "Wellenreiter: trying to run as non-root!" );
59 result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", "You have started Wellenreiter II\n"
60 "as non-root. You will have\nonly limited functionality.\nProceed anyway?",
61 QMessageBox::Yes, QMessageBox::No );
62 if ( result == QMessageBox::No ) return -1;
63 }
64
65 // dhcp check - NOT HERE! This really belongs as a static member to OProcess
66 // and I want to call it like that: if ( OProcess::isRunning( QString& ) ) ...
67
68 QString line;
69 QDir d = QDir( "/proc" );
70 QStringList dirs = d.entryList( QDir::Dirs );
71 QStringList::Iterator it;
72 for ( it = dirs.begin(); it != dirs.end(); ++it )
73 {
74 //qDebug( "next entry: %s", (const char*) *it );
75 QFile file( "/proc/"+*it+"/cmdline" );
76 file.open( IO_ReadOnly );
77 if ( !file.isOpen() ) continue;
78 QTextStream t( &file );
79 line = t.readLine();
80 //qDebug( "cmdline = %s", (const char*) line );
81 if ( line.contains( "dhcp" ) ) break;
82 }
83 if ( line.contains( "dhcp" ) )
84 {
85 qWarning( "Wellenreiter: found dhcp process #%d", (*it).toInt() );
86 result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", "You have a dhcp client running.\n"
87 "This can severly limit scanning!\nShould I kill it for you?",
88 QMessageBox::Yes, QMessageBox::No );
89 if ( result == QMessageBox::Yes )
90 {
91 if ( -1 == ::kill( (*it).toInt(), SIGTERM ) )
92 qWarning( "Wellenreiter: can't kill process (%s)", result, strerror( errno ) );
93 }
94 }
95
37 a.exec(); 96 a.exec();
38 delete w; 97 delete w;
39 return 0; 98 return 0;
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index be2a86e..b4b6aa3 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -35,6 +35,7 @@ using namespace Opie;
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36#include <qlineedit.h> 36#include <qlineedit.h>
37#include <qmessagebox.h> 37#include <qmessagebox.h>
38#include <qregexp.h>
38#include <qspinbox.h> 39#include <qspinbox.h>
39#include <qtoolbutton.h> 40#include <qtoolbutton.h>
40#include <qmainwindow.h> 41#include <qmainwindow.h>
@@ -325,7 +326,11 @@ void Wellenreiter::startClicked()
325 { 326 {
326 if ( configwindow->writeCaptureFile->isEnabled() ) 327 if ( configwindow->writeCaptureFile->isEnabled() )
327 { 328 {
328 pcap->open( interface, configwindow->captureFileName->text() ); 329 QString dumpname( configwindow->captureFileName->text() );
330 dumpname.append( '-' );
331 dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
332 dumpname.append( ".wellenreiter" );
333 pcap->open( interface, dumpname );
329 } 334 }
330 else 335 else
331 { 336 {
@@ -365,6 +370,12 @@ void Wellenreiter::startClicked()
365 logwindow->log( "(i) Started Scanning." ); 370 logwindow->log( "(i) Started Scanning." );
366 sniffing = true; 371 sniffing = true;
367 emit( startedSniffing() ); 372 emit( startedSniffing() );
373 if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
374 else
375 {
376 assert( parent() );
377 ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II - replaying capture file..." );
378 }
368} 379}
369 380
370 381
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index 245b9fc..9745069 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -131,7 +131,7 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f
131 TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) ); 131 TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) );
132 TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) ); 132 TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
133 TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) ); 133 TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
134 TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stats" ) ); 134 TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) );
135 TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) ); 135 TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
136#else 136#else
137 TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) ); 137 TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) );