summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--i18n/da/wellenreiter.ts0
-rw-r--r--i18n/de/wellenreiter.ts0
-rw-r--r--i18n/en/wellenreiter.ts0
-rw-r--r--i18n/es/wellenreiter.ts0
-rw-r--r--i18n/fr/wellenreiter.ts0
-rw-r--r--i18n/hu/wellenreiter.ts0
-rw-r--r--i18n/it/wellenreiter.ts0
-rw-r--r--i18n/ja/wellenreiter.ts0
-rw-r--r--i18n/ko/wellenreiter.ts0
-rw-r--r--i18n/nl/wellenreiter.ts0
-rw-r--r--i18n/no/wellenreiter.ts0
-rw-r--r--i18n/pl/wellenreiter.ts0
-rw-r--r--i18n/pt/wellenreiter.ts0
-rw-r--r--i18n/pt_BR/wellenreiter.ts0
-rw-r--r--i18n/sl/wellenreiter.ts0
-rw-r--r--i18n/xx/wellenreiter.ts0
-rw-r--r--i18n/zh_CN/wellenreiter.ts0
-rw-r--r--i18n/zh_TW/wellenreiter.ts0
-rw-r--r--noncore/net/wellenreiter/gui/main.cpp10
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp43
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp18
-rw-r--r--noncore/net/wellenreiter/gui/statwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp32
-rw-r--r--noncore/net/wellenreiter/wellenreiter.pro18
24 files changed, 82 insertions, 43 deletions
diff --git a/i18n/da/wellenreiter.ts b/i18n/da/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/da/wellenreiter.ts
diff --git a/i18n/de/wellenreiter.ts b/i18n/de/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/de/wellenreiter.ts
diff --git a/i18n/en/wellenreiter.ts b/i18n/en/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/en/wellenreiter.ts
diff --git a/i18n/es/wellenreiter.ts b/i18n/es/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/es/wellenreiter.ts
diff --git a/i18n/fr/wellenreiter.ts b/i18n/fr/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/fr/wellenreiter.ts
diff --git a/i18n/hu/wellenreiter.ts b/i18n/hu/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/hu/wellenreiter.ts
diff --git a/i18n/it/wellenreiter.ts b/i18n/it/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/it/wellenreiter.ts
diff --git a/i18n/ja/wellenreiter.ts b/i18n/ja/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/ja/wellenreiter.ts
diff --git a/i18n/ko/wellenreiter.ts b/i18n/ko/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/ko/wellenreiter.ts
diff --git a/i18n/nl/wellenreiter.ts b/i18n/nl/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/nl/wellenreiter.ts
diff --git a/i18n/no/wellenreiter.ts b/i18n/no/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/no/wellenreiter.ts
diff --git a/i18n/pl/wellenreiter.ts b/i18n/pl/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/pl/wellenreiter.ts
diff --git a/i18n/pt/wellenreiter.ts b/i18n/pt/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/pt/wellenreiter.ts
diff --git a/i18n/pt_BR/wellenreiter.ts b/i18n/pt_BR/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/pt_BR/wellenreiter.ts
diff --git a/i18n/sl/wellenreiter.ts b/i18n/sl/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/sl/wellenreiter.ts
diff --git a/i18n/xx/wellenreiter.ts b/i18n/xx/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/xx/wellenreiter.ts
diff --git a/i18n/zh_CN/wellenreiter.ts b/i18n/zh_CN/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/zh_CN/wellenreiter.ts
diff --git a/i18n/zh_TW/wellenreiter.ts b/i18n/zh_TW/wellenreiter.ts
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/i18n/zh_TW/wellenreiter.ts
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 03da135..96ebb3f 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -34,66 +34,66 @@
34#include <string.h> 34#include <string.h>
35#include <unistd.h> 35#include <unistd.h>
36 36
37int main( int argc, char **argv ) 37int main( int argc, char **argv )
38{ 38{
39 #ifdef QWS 39 #ifdef QWS
40 OApplication a( argc, argv, "Wellenreiter II" ); 40 OApplication a( argc, argv, "Wellenreiter II" );
41 #else 41 #else
42 QApplication a( argc, argv ); 42 QApplication a( argc, argv );
43 #endif 43 #endif
44 WellenreiterMainWindow* w = new WellenreiterMainWindow(); 44 WellenreiterMainWindow* w = new WellenreiterMainWindow();
45 #ifdef QWS 45 #ifdef QWS
46 a.showMainWidget( w ); 46 a.showMainWidget( w );
47 #else 47 #else
48 a.setMainWidget( w ); 48 a.setMainWidget( w );
49 w->show(); 49 w->show();
50 #endif 50 #endif
51 51
52 a.processEvents(); // show the window before doing the safety checks 52 a.processEvents(); // show the window before doing the safety checks
53 int result = -1; 53 int result = -1;
54 54
55 // root check 55 // root check
56 if ( getuid() ) 56 if ( getuid() )
57 { 57 {
58 qWarning( "Wellenreiter: trying to run as non-root!" ); 58 qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) );
59 result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", "You have started Wellenreiter II\n" 59 result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", QObject::tr( "You have started Wellenreiter II\n"
60 "as non-root. You will have\nonly limited functionality.\nProceed anyway?", 60 "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ),
61 QMessageBox::Yes, QMessageBox::No ); 61 QMessageBox::Yes, QMessageBox::No );
62 if ( result == QMessageBox::No ) return -1; 62 if ( result == QMessageBox::No ) return -1;
63 } 63 }
64 64
65 // dhcp check - NOT HERE! This really belongs as a static member to OProcess 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& ) ) ... 66 // and I want to call it like that: if ( OProcess::isRunning( QString& ) ) ...
67 67
68 QString line; 68 QString line;
69 QDir d = QDir( "/proc" ); 69 QDir d = QDir( "/proc" );
70 QStringList dirs = d.entryList( QDir::Dirs ); 70 QStringList dirs = d.entryList( QDir::Dirs );
71 QStringList::Iterator it; 71 QStringList::Iterator it;
72 for ( it = dirs.begin(); it != dirs.end(); ++it ) 72 for ( it = dirs.begin(); it != dirs.end(); ++it )
73 { 73 {
74 //qDebug( "next entry: %s", (const char*) *it ); 74 //qDebug( "next entry: %s", (const char*) *it );
75 QFile file( "/proc/"+*it+"/cmdline" ); 75 QFile file( "/proc/"+*it+"/cmdline" );
76 file.open( IO_ReadOnly ); 76 file.open( IO_ReadOnly );
77 if ( !file.isOpen() ) continue; 77 if ( !file.isOpen() ) continue;
78 QTextStream t( &file ); 78 QTextStream t( &file );
79 line = t.readLine(); 79 line = t.readLine();
80 //qDebug( "cmdline = %s", (const char*) line ); 80 //qDebug( "cmdline = %s", (const char*) line );
81 if ( line.contains( "dhcp" ) ) break; 81 if ( line.contains( "dhcp" ) ) break;
82 } 82 }
83 if ( line.contains( "dhcp" ) ) 83 if ( line.contains( "dhcp" ) )
84 { 84 {
85 qWarning( "Wellenreiter: found dhcp process #%d", (*it).toInt() ); 85 qWarning( "Wellenreiter: found dhcp process #%d", (*it).toInt() );
86 result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", "You have a dhcp client running.\n" 86 result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n"
87 "This can severly limit scanning!\nShould I kill it for you?", 87 "This can severly limit scanning!\nShould I kill it for you?" ),
88 QMessageBox::Yes, QMessageBox::No ); 88 QMessageBox::Yes, QMessageBox::No );
89 if ( result == QMessageBox::Yes ) 89 if ( result == QMessageBox::Yes )
90 { 90 {
91 if ( -1 == ::kill( (*it).toInt(), SIGTERM ) ) 91 if ( -1 == ::kill( (*it).toInt(), SIGTERM ) )
92 qWarning( "Wellenreiter: can't kill process (%s)", result, strerror( errno ) ); 92 qWarning( "Wellenreiter: can't kill process (%s)", result, strerror( errno ) );
93 } 93 }
94 } 94 }
95 95
96 a.exec(); 96 a.exec();
97 delete w; 97 delete w;
98 return 0; 98 return 0;
99} 99}
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 6cd364c..c4a8fbc 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -81,102 +81,102 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
81 stopButton->setEnabled( false ); 81 stopButton->setEnabled( false );
82 connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) ); 82 connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
83 83
84 QToolButton* c = new QToolButton( 0 ); 84 QToolButton* c = new QToolButton( 0 );
85 #ifdef QWS 85 #ifdef QWS
86 c->setAutoRaise( true ); 86 c->setAutoRaise( true );
87 #endif 87 #endif
88 c->setIconSet( *infoIconSet ); 88 c->setIconSet( *infoIconSet );
89 c->setEnabled( false ); 89 c->setEnabled( false );
90 90
91 QToolButton* d = new QToolButton( 0 ); 91 QToolButton* d = new QToolButton( 0 );
92 #ifdef QWS 92 #ifdef QWS
93 d->setAutoRaise( true ); 93 d->setAutoRaise( true );
94 #endif 94 #endif
95 d->setIconSet( *settingsIconSet ); 95 d->setIconSet( *settingsIconSet );
96 connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) ); 96 connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
97 97
98 // setup menu bar 98 // setup menu bar
99 99
100 int id; 100 int id;
101 101
102 QMenuBar* mb = menuBar(); 102 QMenuBar* mb = menuBar();
103 103
104 QPopupMenu* fileSave = new QPopupMenu( mb ); 104 QPopupMenu* fileSave = new QPopupMenu( mb );
105 fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) ); 105 fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) );
106 fileSave->insertItem( "&Text Log...", this, SLOT( fileSaveLog() ) ); 106 fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) );
107 fileSave->insertItem( "&Hex Log...", this, SLOT( fileSaveHex() ) ); 107 fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) );
108 108
109 QPopupMenu* fileLoad = new QPopupMenu( mb ); 109 QPopupMenu* fileLoad = new QPopupMenu( mb );
110 fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) ); 110 fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) );
111 //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) ); 111 //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
112 112
113 QPopupMenu* file = new QPopupMenu( mb ); 113 QPopupMenu* file = new QPopupMenu( mb );
114 file->insertItem( "&New", this, SLOT( fileNew() ) ); 114 file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
115 id = file->insertItem( "&Load", fileLoad ); 115 id = file->insertItem( tr( "&Load" ), fileLoad );
116 file->insertItem( "&Save", fileSave ); 116 file->insertItem( tr( "&Save" ), fileSave );
117 file->insertSeparator(); 117 file->insertSeparator();
118 file->insertItem( "&Exit", qApp, SLOT( quit() ) ); 118 file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
119 119
120 QPopupMenu* view = new QPopupMenu( mb ); 120 QPopupMenu* view = new QPopupMenu( mb );
121 view->insertItem( "&Configure..." ); 121 view->insertItem( tr( "&Configure..." ) );
122 122
123 QPopupMenu* sniffer = new QPopupMenu( mb ); 123 QPopupMenu* sniffer = new QPopupMenu( mb );
124 sniffer->insertItem( "&Configure...", this, SLOT( showConfigure() ) ); 124 sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
125 sniffer->insertSeparator(); 125 sniffer->insertSeparator();
126 startID = sniffer->insertItem( "&Start", mw, SLOT( startClicked() ) ); 126 startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
127 sniffer->setItemEnabled( startID, false ); 127 sniffer->setItemEnabled( startID, false );
128 stopID = sniffer->insertItem( "Sto&p", mw, SLOT( stopClicked() ) ); 128 stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
129 sniffer->setItemEnabled( stopID, false ); 129 sniffer->setItemEnabled( stopID, false );
130 130
131 QPopupMenu* demo = new QPopupMenu( mb ); 131 QPopupMenu* demo = new QPopupMenu( mb );
132 demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) ); 132 demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
133 133
134 id = mb->insertItem( "&File", file ); 134 id = mb->insertItem( tr( "&File" ), file );
135 id = mb->insertItem( "&View", view ); 135 id = mb->insertItem( tr( "&View" ), view );
136 mb->setItemEnabled( id, false ); 136 mb->setItemEnabled( id, false );
137 id = mb->insertItem( "&Sniffer", sniffer ); 137 id = mb->insertItem( tr( "&Sniffer" ), sniffer );
138 id = mb->insertItem( "&Demo", demo ); 138 id = mb->insertItem( tr( "&Demo" ), demo );
139 mb->setItemEnabled( id, true ); 139 mb->setItemEnabled( id, true );
140 140
141 #ifdef QWS 141 #ifdef QWS
142 mb->insertItem( startButton ); 142 mb->insertItem( startButton );
143 mb->insertItem( stopButton ); 143 mb->insertItem( stopButton );
144 mb->insertItem( c ); 144 mb->insertItem( c );
145 mb->insertItem( d ); 145 mb->insertItem( d );
146 #else // Qt3 changed the insertion order. It's now totally random :( 146 #else // Qt3 changed the insertion order. It's now totally random :(
147 mb->insertItem( d ); 147 mb->insertItem( d );
148 mb->insertItem( c ); 148 mb->insertItem( c );
149 mb->insertItem( stopButton ); 149 mb->insertItem( stopButton );
150 mb->insertItem( startButton ); 150 mb->insertItem( startButton );
151 #endif 151 #endif
152 152
153 updateToolButtonState(); 153 updateToolButtonState();
154 154
155 // setup status bar (for now only on X11) 155 // setup status bar (for now only on X11)
156 156
157 #ifndef QWS 157 #ifndef QWS
158 statusBar()->message( "Ready." ); 158 statusBar()->message( tr( "Ready." ) );
159 #endif 159 #endif
160 160
161 connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) ); 161 connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) );
162 connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) ); 162 connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) );
163}; 163};
164 164
165 165
166 166
167void WellenreiterMainWindow::showConfigure() 167void WellenreiterMainWindow::showConfigure()
168{ 168{
169 qDebug( "show configure..." ); 169 qDebug( "show configure..." );
170 cw->setCaption( tr( "Configure" ) ); 170 cw->setCaption( tr( "Configure" ) );
171 #ifdef QWS 171 #ifdef QWS
172 cw->showMaximized(); 172 cw->showMaximized();
173 #endif 173 #endif
174 int result = cw->exec(); 174 int result = cw->exec();
175 175
176 if ( result ) updateToolButtonState(); 176 if ( result ) updateToolButtonState();
177} 177}
178 178
179 179
180 180
181void WellenreiterMainWindow::updateToolButtonState() 181void WellenreiterMainWindow::updateToolButtonState()
182{ 182{
@@ -209,51 +209,51 @@ void WellenreiterMainWindow::changedSniffingState()
209WellenreiterMainWindow::~WellenreiterMainWindow() 209WellenreiterMainWindow::~WellenreiterMainWindow()
210{ 210{
211 delete infoIconSet; 211 delete infoIconSet;
212 delete settingsIconSet; 212 delete settingsIconSet;
213 delete startIconSet; 213 delete startIconSet;
214 delete stopIconSet; 214 delete stopIconSet;
215}; 215};
216 216
217void WellenreiterMainWindow::demoAddStations() 217void WellenreiterMainWindow::demoAddStations()
218{ 218{
219 mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 ); 219 mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 );
220 mw->netView()->addNewItem( "managed", "Vanille", "00:30:6D:EF:A6:23", true, 11, 10 ); 220 mw->netView()->addNewItem( "managed", "Vanille", "00:30:6D:EF:A6:23", true, 11, 10 );
221 mw->netView()->addNewItem( "adhoc", "ELAN", "00:A0:F8:E7:16:22", false, 3, 10 ); 221 mw->netView()->addNewItem( "adhoc", "ELAN", "00:A0:F8:E7:16:22", false, 3, 10 );
222 mw->netView()->addNewItem( "adhoc", "ELAN", "00:AA:01:E7:56:62", false, 3, 15 ); 222 mw->netView()->addNewItem( "adhoc", "ELAN", "00:AA:01:E7:56:62", false, 3, 15 );
223 mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 ); 223 mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 );
224} 224}
225 225
226 226
227QString WellenreiterMainWindow::getFileName( bool save ) 227QString WellenreiterMainWindow::getFileName( bool save )
228{ 228{
229 QMap<QString, QStringList> map; 229 QMap<QString, QStringList> map;
230 map.insert( tr("All"), QStringList() ); 230 map.insert( tr("All"), QStringList() );
231 QStringList text; 231 QStringList text;
232 text << "text/*"; 232 text << "text/*";
233 map.insert(tr("Text"), text ); 233 map.insert( tr("Text"), text );
234 text << "*"; 234 text << "*";
235 map.insert(tr("All"), text ); 235 map.insert( tr("All"), text );
236 236
237 QString str; 237 QString str;
238 if ( save ) 238 if ( save )
239 { 239 {
240 #ifdef QWS 240 #ifdef QWS
241 str = OFileDialog::getSaveFileName( 2, "/", QString::null, map ); 241 str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
242 #else 242 #else
243 str = QFileDialog::getSaveFileName(); 243 str = QFileDialog::getSaveFileName();
244 #endif 244 #endif
245 if ( str.isEmpty() || QFileInfo(str).isDir() ) 245 if ( str.isEmpty() || QFileInfo(str).isDir() )
246 return ""; 246 return "";
247 } 247 }
248 else 248 else
249 { 249 {
250 #ifdef QWS 250 #ifdef QWS
251 str = OFileDialog::getOpenFileName( 2, "/", QString::null, map ); 251 str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
252 #else 252 #else
253 str = QFileDialog::getOpenFileName(); 253 str = QFileDialog::getOpenFileName();
254 #endif 254 #endif
255 if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() ) 255 if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )
256 return ""; 256 return "";
257 } 257 }
258 return str; 258 return str;
259} 259}
@@ -330,32 +330,33 @@ void WellenreiterMainWindow::fileLoadSession()
330 { 330 {
331 QDataStream t( &f ); 331 QDataStream t( &f );
332 t >> *mw->netView(); 332 t >> *mw->netView();
333 f.close(); 333 f.close();
334 qDebug( "Loaded session from file '%s'", (const char*) fname ); 334 qDebug( "Loaded session from file '%s'", (const char*) fname );
335 } 335 }
336 else 336 else
337 { 337 {
338 qDebug( "Problem loading session from file '%s'", (const char*) fname ); 338 qDebug( "Problem loading session from file '%s'", (const char*) fname );
339 } 339 }
340 } 340 }
341} 341}
342 342
343void WellenreiterMainWindow::fileNew() 343void WellenreiterMainWindow::fileNew()
344{ 344{
345 mw->netView()->clear(); 345 mw->netView()->clear();
346 mw->logWindow()->clear(); 346 mw->logWindow()->clear();
347 mw->hexWindow()->clear(); 347 mw->hexWindow()->clear();
348} 348}
349 349
350void WellenreiterMainWindow::closeEvent( QCloseEvent* e ) 350void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
351{ 351{
352 if ( mw->isDaemonRunning() ) 352 if ( mw->isDaemonRunning() )
353 { 353 {
354 QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." ); 354 QMessageBox::warning( this, "Wellenreiter/Opie",
355 tr( "Sniffing in progress!\nPlease stop sniffing before closing." ) );
355 e->ignore(); 356 e->ignore();
356 } 357 }
357 else 358 else
358 { 359 {
359 QMainWindow::closeEvent( e ); 360 QMainWindow::closeEvent( e );
360 } 361 }
361} 362}
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 1cf49e0..3a6aa15 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -32,51 +32,51 @@ using namespace Opie;
32#else 32#else
33#include "resource.h" 33#include "resource.h"
34#endif 34#endif
35 35
36const int col_type = 0; 36const int col_type = 0;
37const int col_essid = 0; 37const int col_essid = 0;
38const int col_sig = 1; 38const int col_sig = 1;
39const int col_ap = 2; 39const int col_ap = 2;
40const int col_channel = 3; 40const int col_channel = 3;
41const int col_wep = 4; 41const int col_wep = 4;
42const int col_traffic = 5; 42const int col_traffic = 5;
43const int col_manuf = 6; 43const int col_manuf = 6;
44const int col_firstseen = 7; 44const int col_firstseen = 7;
45const int col_lastseen = 8; 45const int col_lastseen = 8;
46 46
47MScanListView::MScanListView( QWidget* parent, const char* name ) 47MScanListView::MScanListView( QWidget* parent, const char* name )
48 :OListView( parent, name ), _manufacturerdb( 0 ) 48 :OListView( parent, name ), _manufacturerdb( 0 )
49{ 49{
50 50
51 setFrameShape( QListView::StyledPanel ); 51 setFrameShape( QListView::StyledPanel );
52 setFrameShadow( QListView::Sunken ); 52 setFrameShadow( QListView::Sunken );
53 53
54 addColumn( tr( "Net/Station" ) ); 54 addColumn( tr( "Net/Station" ) );
55 setColumnAlignment( 0, AlignLeft || AlignVCenter ); 55 setColumnAlignment( 0, AlignLeft || AlignVCenter );
56 addColumn( tr( "B" ) ); 56 addColumn( tr( "#" ) );
57 setColumnAlignment( 1, AlignCenter ); 57 setColumnAlignment( 1, AlignCenter );
58 addColumn( tr( "AP" ) ); 58 addColumn( tr( "MAC" ) );
59 setColumnAlignment( 2, AlignCenter ); 59 setColumnAlignment( 2, AlignCenter );
60 addColumn( tr( "Chn" ) ); 60 addColumn( tr( "Chn" ) );
61 setColumnAlignment( 3, AlignCenter ); 61 setColumnAlignment( 3, AlignCenter );
62 addColumn( tr( "W" ) ); 62 addColumn( tr( "W" ) );
63 setColumnAlignment( 4, AlignCenter ); 63 setColumnAlignment( 4, AlignCenter );
64 addColumn( tr( "T" ) ); 64 addColumn( tr( "T" ) );
65 setColumnAlignment( 5, AlignCenter ); 65 setColumnAlignment( 5, AlignCenter );
66 addColumn( tr( "Manufacturer" ) ); 66 addColumn( tr( "Manufacturer" ) );
67 setColumnAlignment( 6, AlignCenter ); 67 setColumnAlignment( 6, AlignCenter );
68 addColumn( tr( "First Seen" ) ); 68 addColumn( tr( "First Seen" ) );
69 setColumnAlignment( 7, AlignCenter ); 69 setColumnAlignment( 7, AlignCenter );
70 addColumn( tr( "Last Seen" ) ); 70 addColumn( tr( "Last Seen" ) );
71 setColumnAlignment( 8, AlignCenter ); 71 setColumnAlignment( 8, AlignCenter );
72 setRootIsDecorated( true ); 72 setRootIsDecorated( true );
73 setAllColumnsShowFocus( true ); 73 setAllColumnsShowFocus( true );
74}; 74};
75 75
76MScanListView::~MScanListView() 76MScanListView::~MScanListView()
77{ 77{
78}; 78};
79 79
80OListViewItem* MScanListView::childFactory() 80OListViewItem* MScanListView::childFactory()
81{ 81{
82 return new MScanListItem( this ); 82 return new MScanListItem( this );
@@ -127,98 +127,110 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
127 network = item; 127 network = item;
128 128
129 item = static_cast<MScanListItem*> ( item->firstChild() ); 129 item = static_cast<MScanListItem*> ( item->firstChild() );
130 assert( item ); // this shouldn't fail 130 assert( item ); // this shouldn't fail
131 131
132 while ( item && ( item->text( col_ap ) != macaddr ) ) 132 while ( item && ( item->text( col_ap ) != macaddr ) )
133 { 133 {
134 qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) ); 134 qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) );
135 item = static_cast<MScanListItem*> ( item->nextSibling() ); 135 item = static_cast<MScanListItem*> ( item->nextSibling() );
136 } 136 }
137 137
138 if ( item ) 138 if ( item )
139 { 139 {
140 // we have already seen this item, it's a dupe 140 // we have already seen this item, it's a dupe
141 #ifdef DEBUG 141 #ifdef DEBUG
142 qDebug( "%s is a dupe - ignoring...", (const char*) macaddr ); 142 qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
143 #endif 143 #endif
144 item->receivedBeacon(); 144 item->receivedBeacon();
145 return; 145 return;
146 } 146 }
147 } 147 }
148 else 148 else
149 { 149 {
150 s.sprintf( "(i) new network: '%s'", (const char*) essid ); 150 s.sprintf( "(i) new network: '%s'", (const char*) essid );
151 //TODO send s to logwindow
151 network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); 152 network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 );
152 } 153 }
153 154
154 155
155 // insert new station as child from network 156 // insert new station as child from network
156
157 // no essid to reduce clutter, maybe later we have a nick or stationname to display!? 157 // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
158 158
159 qDebug( "inserting new station %s", (const char*) macaddr ); 159 qDebug( "inserting new station %s", (const char*) macaddr );
160 160
161 MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); 161 MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
162 if ( _manufacturerdb ) 162 if ( _manufacturerdb )
163 station->setManufacturer( _manufacturerdb->lookup( macaddr ) ); 163 station->setManufacturer( _manufacturerdb->lookup( macaddr ) );
164 164
165 if ( type == "managed" ) 165 if ( type == "managed" )
166 { 166 {
167 s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); 167 s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel );
168 } 168 }
169 else 169 else
170 { 170 {
171 s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); 171 s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel );
172 } 172 }
173 //TODO send s to logwindow
173 174
174} 175}
175 176
176 177
177void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type ) 178void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type )
178{ 179{
179 MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() ); 180 MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
180 181
181 while ( subitem && ( subitem->text( col_ap ) != addr ) ) 182 while ( subitem && ( subitem->text( col_ap ) != addr ) )
182 { 183 {
183 qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) ); 184 qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) );
184 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); 185 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
185 } 186 }
186 187
187 if ( subitem ) 188 if ( subitem )
188 { 189 {
189 // we have already seen this item, it's a dupe 190 // we have already seen this item, it's a dupe
190 #ifdef DEBUG 191 #ifdef DEBUG
191 qDebug( "%s is a dupe - ignoring...", (const char*) addr ); 192 qDebug( "%s is a dupe - ignoring...", (const char*) addr );
192 #endif 193 #endif
193 subitem->receivedBeacon(); //FIXME: sent data bit 194 subitem->receivedBeacon(); //FIXME: sent data bit
194 return; 195 return;
195 } 196 }
196 197
197 // Hey, it seems to be a new item :-D 198 // Hey, it seems to be a new item :-D
198 MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 ); 199 MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 );
199 if ( _manufacturerdb ) 200 if ( _manufacturerdb )
200 station->setManufacturer( _manufacturerdb->lookup( addr ) ); 201 station->setManufacturer( _manufacturerdb->lookup( addr ) );
202
203 QString s;
204 if ( type == "station" )
205 {
206 s.sprintf( "(i) new station in '%s' [??]", (const char*) network->text( col_essid ) );
207 }
208 else
209 {
210 s.sprintf( "(i) new wireless station in '%s' [??]", (const char*) network->text( col_essid ) );
211 }
212 //TODO send s to logwindow
201} 213}
202 214
203 215
204void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ) 216void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo )
205{ 217{
206 QString s; 218 QString s;
207 MScanListItem* network; 219 MScanListItem* network;
208 220
209 QListViewItemIterator it( this ); 221 QListViewItemIterator it( this );
210 while ( it.current() && 222 while ( it.current() &&
211 it.current()->text( col_ap ) != viaFrom && 223 it.current()->text( col_ap ) != viaFrom &&
212 it.current()->text( col_ap ) != viaTo ) ++it; 224 it.current()->text( col_ap ) != viaTo ) ++it;
213 225
214 MScanListItem* item = static_cast<MScanListItem*>( it.current() ); 226 MScanListItem* item = static_cast<MScanListItem*>( it.current() );
215 227
216 if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations 228 if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations
217 { 229 {
218 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from ); 230 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from );
219 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to ); 231 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to );
220 } 232 }
221 else 233 else
222 { 234 {
223 qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" ); 235 qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" );
224 } 236 }
diff --git a/noncore/net/wellenreiter/gui/statwindow.cpp b/noncore/net/wellenreiter/gui/statwindow.cpp
index 2c8c774..a9ae661 100644
--- a/noncore/net/wellenreiter/gui/statwindow.cpp
+++ b/noncore/net/wellenreiter/gui/statwindow.cpp
@@ -1,43 +1,43 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. 2** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
3** 3**
4** This file is part of Opie Environment. 4** This file is part of Opie Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "statwindow.h" 16#include "statwindow.h"
17#include <opie2/olistview.h> 17#include <opie2/olistview.h>
18 18
19MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) 19MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f )
20 :QVBox( parent, name, f ) 20 :QVBox( parent, name, f )
21{ 21{
22 table = new OListView( this ); 22 table = new OListView( this );
23 table->addColumn( "Protocol" ); 23 table->addColumn( tr( "Protocol" ) );
24 table->addColumn( "Count" ); 24 table->addColumn( tr( "Count" ) );
25 table->setItemMargin( 2 ); 25 table->setItemMargin( 2 );
26}; 26};
27 27
28 28
29void MStatWindow::updateCounter( const QString& protocol, int counter ) 29void MStatWindow::updateCounter( const QString& protocol, int counter )
30{ 30{
31 QListViewItemIterator it( table ); 31 QListViewItemIterator it( table );
32 for ( ; it.current(); ++it ) 32 for ( ; it.current(); ++it )
33 { 33 {
34 if ( it.current()->text( 0 ) == protocol ) 34 if ( it.current()->text( 0 ) == protocol )
35 { 35 {
36 it.current()->setText( 1, QString::number( counter ) ); 36 it.current()->setText( 1, QString::number( counter ) );
37 return; 37 return;
38 } 38 }
39 } 39 }
40 40
41 new OListViewItem( table, protocol, QString::number( counter ) ); 41 new OListViewItem( table, protocol, QString::number( counter ) );
42} 42}
43 43
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index c061319..62bda91 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -147,53 +147,57 @@ void Wellenreiter::receivePacket(OPacket* p)
147 { 147 {
148 QString type; 148 QString type;
149 if ( beacon->canIBSS() ) 149 if ( beacon->canIBSS() )
150 { 150 {
151 type = "adhoc"; 151 type = "adhoc";
152 } 152 }
153 else if ( beacon->canESS() ) 153 else if ( beacon->canESS() )
154 { 154 {
155 type = "managed"; 155 type = "managed";
156 } 156 }
157 else 157 else
158 { 158 {
159 qDebug( "Wellenreiter::invalid frame detected: '%s'", (const char*) p->dump( 16 ) ); 159 qDebug( "Wellenreiter::invalid frame detected: '%s'", (const char*) p->dump( 16 ) );
160 return; 160 return;
161 } 161 }
162 162
163 OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); 163 OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
164 QString essid = ssid ? ssid->ID() : QString("<unknown>"); 164 QString essid = ssid ? ssid->ID() : QString("<unknown>");
165 OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) ); 165 OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
166 int channel = ds ? ds->channel() : -1; 166 int channel = ds ? ds->channel() : -1;
167 167
168 OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); 168 OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
169 netView()->addNewItem( type, essid, header->macAddress2().toString(), beacon->canPrivacy(), channel, 0 ); 169 netView()->addNewItem( type, essid, header->macAddress2().toString(), beacon->canPrivacy(), channel, 0 );
170 170
171 // do we have a prism header? 171 // update graph window
172 OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) ); 172 if ( ds )
173 if ( ds && prism ) 173 {
174 graphwindow->traffic( ds->channel(), prism->signalStrength() ); 174 OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
175 175 if ( prism )
176 graphwindow->traffic( ds->channel(), prism->signalStrength() );
177 else
178 graphwindow->traffic( ds->channel(), 95 );
179 }
176 return; 180 return;
177 } 181 }
178 182
179 // check for a data frame 183 // check for a data frame
180 OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) ); 184 OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) );
181 if ( data ) 185 if ( data )
182 { 186 {
183 OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" ); 187 OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
184 if ( wlan->fromDS() && !wlan->toDS() ) 188 if ( wlan->fromDS() && !wlan->toDS() )
185 { 189 {
186 qDebug( "FromDS traffic: '%s' -> '%s' via '%s'", 190 qDebug( "FromDS traffic: '%s' -> '%s' via '%s'",
187 (const char*) wlan->macAddress3().toString(true), 191 (const char*) wlan->macAddress3().toString(true),
188 (const char*) wlan->macAddress1().toString(true), 192 (const char*) wlan->macAddress1().toString(true),
189 (const char*) wlan->macAddress2().toString(true) ); 193 (const char*) wlan->macAddress2().toString(true) );
190 netView()->fromDStraffic( wlan->macAddress3().toString(), 194 netView()->fromDStraffic( wlan->macAddress3().toString(),
191 wlan->macAddress1().toString(), 195 wlan->macAddress1().toString(),
192 wlan->macAddress2().toString() ); 196 wlan->macAddress2().toString() );
193 } 197 }
194 else 198 else
195 if ( !wlan->fromDS() && wlan->toDS() ) 199 if ( !wlan->fromDS() && wlan->toDS() )
196 { 200 {
197 qDebug( "ToDS traffic: '%s' -> '%s' via '%s'", 201 qDebug( "ToDS traffic: '%s' -> '%s' via '%s'",
198 (const char*) wlan->macAddress2().toString(true), 202 (const char*) wlan->macAddress2().toString(true),
199 (const char*) wlan->macAddress3().toString(true), 203 (const char*) wlan->macAddress3().toString(true),
@@ -238,152 +242,156 @@ void Wellenreiter::stopClicked()
238 disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); 242 disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
239 iface->setChannelHopping(); // stop hopping channels 243 iface->setChannelHopping(); // stop hopping channels
240 } 244 }
241 else 245 else
242 killTimers(); 246 killTimers();
243 247
244 pcap->close(); 248 pcap->close();
245 sniffing = false; 249 sniffing = false;
246 250
247 if ( iface ) 251 if ( iface )
248 { 252 {
249 // switch off monitor mode 253 // switch off monitor mode
250 iface->setMonitorMode( false ); 254 iface->setMonitorMode( false );
251 // switch off promisc flag 255 // switch off promisc flag
252 iface->setPromiscuousMode( false ); 256 iface->setPromiscuousMode( false );
253 257
254 system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess 258 system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess
255 } 259 }
256 260
257 logwindow->log( "(i) Stopped Scanning." ); 261 logwindow->log( "(i) Stopped Scanning." );
258 assert( parent() ); 262 assert( parent() );
259 ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" ); 263 ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" );
260 264
261 // message the user 265 // message the user
262 QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." ); 266 QMessageBox::information( this, "Wellenreiter II",
267 tr( "Your wireless card\nshould now be usable again." ) );
263 268
264 sniffing = false; 269 sniffing = false;
265 emit( stoppedSniffing() ); 270 emit( stoppedSniffing() );
266 271
267 // print out statistics 272 // print out statistics
268 for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it ) 273 for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it )
269 statwindow->updateCounter( it.key(), it.data() ); 274 statwindow->updateCounter( it.key(), it.data() );
270} 275}
271 276
272 277
273void Wellenreiter::startClicked() 278void Wellenreiter::startClicked()
274{ 279{
275 // get configuration from config window 280 // get configuration from config window
276 281
277 const QString& interface = configwindow->interfaceName->currentText(); 282 const QString& interface = configwindow->interfaceName->currentText();
278 const int cardtype = configwindow->daemonDeviceType(); 283 const int cardtype = configwindow->daemonDeviceType();
279 const int interval = configwindow->daemonHopInterval(); 284 const int interval = configwindow->daemonHopInterval();
280 285
281 if ( ( interface == "" ) || ( cardtype == 0 ) ) 286 if ( ( interface == "" ) || ( cardtype == 0 ) )
282 { 287 {
283 QMessageBox::information( this, "Wellenreiter II", "Your device is not\nproperly configured. Please reconfigure!" ); 288 QMessageBox::information( this, "Wellenreiter II",
289 tr( "Your device is not\nproperly configured. Please reconfigure!" ) );
284 return; 290 return;
285 } 291 }
286 292
287 // configure device 293 // configure device
288 294
289 ONetwork* net = ONetwork::instance(); 295 ONetwork* net = ONetwork::instance();
290 iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); 296 iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface ));
291 297
292 // set monitor mode 298 // set monitor mode
293 299
294 switch ( cardtype ) 300 switch ( cardtype )
295 { 301 {
296 case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break; 302 case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break;
297 case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break; 303 case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break;
298 case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break; 304 case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break;
299 case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break; 305 case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break;
300 case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", "Bring your device into\nmonitor mode now." ); break; 306 case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
301 case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; 307 case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break;
302 default: assert( 0 ); // shouldn't reach this 308 default: assert( 0 ); // shouldn't reach this
303 } 309 }
304 310
305 // switch device into monitor mode 311 // switch device into monitor mode
306 if ( cardtype < DEVTYPE_FILE ) 312 if ( cardtype < DEVTYPE_FILE )
307 { 313 {
308 if ( cardtype != DEVTYPE_MANUAL ) 314 if ( cardtype != DEVTYPE_MANUAL )
309 iface->setMonitorMode( true ); 315 iface->setMonitorMode( true );
310 if ( !iface->monitorMode() ) 316 if ( !iface->monitorMode() )
311 { 317 {
312 QMessageBox::warning( this, "Wellenreiter II", "Can't set device into monitor mode." ); 318 QMessageBox::warning( this, "Wellenreiter II",
319 tr( "Can't set device into monitor mode." ) );
313 return; 320 return;
314 } 321 }
315 } 322 }
316 323
317 // open pcap and start sniffing 324 // open pcap and start sniffing
318 if ( cardtype != DEVTYPE_FILE ) 325 if ( cardtype != DEVTYPE_FILE )
319 { 326 {
320 if ( configwindow->writeCaptureFile->isEnabled() ) 327 if ( configwindow->writeCaptureFile->isEnabled() ) //FIXME: bug!?
321 { 328 {
322 QString dumpname( configwindow->captureFileName->text() ); 329 QString dumpname( configwindow->captureFileName->text() );
323 dumpname.append( '-' ); 330 dumpname.append( '-' );
324 dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) ); 331 dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
325 dumpname.append( ".wellenreiter" ); 332 dumpname.append( ".wellenreiter" );
326 pcap->open( interface, dumpname ); 333 pcap->open( interface, dumpname );
327 } 334 }
328 else 335 else
329 { 336 {
330 pcap->open( interface ); 337 pcap->open( interface );
331 } 338 }
332 } 339 }
333 else 340 else
334 { 341 {
335 pcap->open( QFile( interface ) ); 342 pcap->open( QFile( interface ) );
336 } 343 }
337 344
338 if ( !pcap->isOpen() ) 345 if ( !pcap->isOpen() )
339 { 346 {
340 QMessageBox::warning( this, "Wellenreiter II", "Can't open packet capturer:\n" + QString(strerror( errno ) )); 347 QMessageBox::warning( this, "Wellenreiter II",
348 tr( "Can't open packet capturer:\n" ) + QString(strerror( errno ) ));
341 return; 349 return;
342 } 350 }
343 351
344 // set capturer to non-blocking mode 352 // set capturer to non-blocking mode
345 pcap->setBlocking( false ); 353 pcap->setBlocking( false );
346 354
347 // start channel hopper 355 // start channel hopper
348 if ( cardtype != DEVTYPE_FILE ) 356 if ( cardtype != DEVTYPE_FILE )
349 iface->setChannelHopping( 1000 ); //use interval from config window 357 iface->setChannelHopping( 1000 ); //use interval from config window
350 358
351 if ( cardtype != DEVTYPE_FILE ) 359 if ( cardtype != DEVTYPE_FILE )
352 { 360 {
353 // connect socket notifier and start channel hopper 361 // connect socket notifier and start channel hopper
354 connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); 362 connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
355 connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); 363 connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
356 } 364 }
357 else 365 else
358 { 366 {
359 // start timer for reading packets 367 // start timer for reading packets
360 startTimer( 100 ); 368 startTimer( 100 );
361 } 369 }
362 370
363 logwindow->log( "(i) Started Scanning." ); 371 logwindow->log( "(i) Started Scanning." );
364 sniffing = true; 372 sniffing = true;
365 emit( startedSniffing() ); 373 emit( startedSniffing() );
366 if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title 374 if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
367 else 375 else
368 { 376 {
369 assert( parent() ); 377 assert( parent() );
370 ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II - replaying capture file..." ); 378 ( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) );
371 } 379 }
372} 380}
373 381
374 382
375void Wellenreiter::timerEvent( QTimerEvent* ) 383void Wellenreiter::timerEvent( QTimerEvent* )
376{ 384{
377 qDebug( "Wellenreiter::timerEvent()" ); 385 qDebug( "Wellenreiter::timerEvent()" );
378 OPacket* p = pcap->next(); 386 OPacket* p = pcap->next();
379 if ( !p ) // no more packets available 387 if ( !p ) // no more packets available
380 { 388 {
381 stopClicked(); 389 stopClicked();
382 } 390 }
383 else 391 else
384 { 392 {
385 receivePacket( p ); 393 receivePacket( p );
386 delete p; 394 delete p;
387 } 395 }
388} 396}
389 397
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index eb60c4a..7085c5a 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,14 +1,32 @@
1TEMPLATE = subdirs 1TEMPLATE = subdirs
2 2
3!contains( platform, x11 ) { 3!contains( platform, x11 ) {
4 message( Configuring Wellenreiter for build on Opie ) 4 message( Configuring Wellenreiter for build on Opie )
5 SUBDIRS = gui 5 SUBDIRS = gui
6 include ( $(OPIEDIR)/include.pro ) 6 include ( $(OPIEDIR)/include.pro )
7} 7}
8 8
9contains( platform, x11 ) { 9contains( platform, x11 ) {
10 message( Configuring Wellenreiter for build on Qt/X11 ) 10 message( Configuring Wellenreiter for build on Qt/X11 )
11 SUBDIRS = lib gui 11 SUBDIRS = lib gui
12 system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics ) 12 system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics )
13} 13}
14 14
15TRANSLATIONS = ../../../i18n/de/wellenreiter.ts \
16 ../../../i18n/nl/wellenreiter.ts \
17 ../../../i18n/da/wellenreiter.ts \
18 ../../../i18n/xx/wellenreiter.ts \
19 ../../../i18n/en/wellenreiter.ts \
20 ../../../i18n/es/wellenreiter.ts \
21 ../../../i18n/fr/wellenreiter.ts \
22 ../../../i18n/hu/wellenreiter.ts \
23 ../../../i18n/ja/wellenreiter.ts \
24 ../../../i18n/ko/wellenreiter.ts \
25 ../../../i18n/no/wellenreiter.ts \
26 ../../../i18n/pl/wellenreiter.ts \
27 ../../../i18n/pt/wellenreiter.ts \
28 ../../../i18n/pt_BR/wellenreiter.ts \
29 ../../../i18n/sl/wellenreiter.ts \
30 ../../../i18n/zh_CN/wellenreiter.ts \
31 ../../../i18n/zh_TW/wellenreiter.ts
32