author | mickeyl <mickeyl> | 2003-04-10 15:49:08 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-10 15:49:08 (UTC) |
commit | 4e8e3741dca909782e15bb197e5b6a78750536c2 (patch) (unidiff) | |
tree | 37285f8d053b3995aee46487277b57248862848c | |
parent | 3733471135ea180709fcf4695607cce0c5fc7fb5 (diff) | |
download | opie-4e8e3741dca909782e15bb197e5b6a78750536c2.zip opie-4e8e3741dca909782e15bb197e5b6a78750536c2.tar.gz opie-4e8e3741dca909782e15bb197e5b6a78750536c2.tar.bz2 |
Wellenreiter can now open and replay capture files as written by tcpdump, ethereal, etc.
Next task: writing capture files
-rw-r--r-- | noncore/net/wellenreiter/gui/configbase.ui | 6 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 46 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.h | 14 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 94 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 3 |
7 files changed, 121 insertions, 48 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui index dda7ba0..3ece270 100644 --- a/noncore/net/wellenreiter/gui/configbase.ui +++ b/noncore/net/wellenreiter/gui/configbase.ui | |||
@@ -171,2 +171,8 @@ | |||
171 | </item> | 171 | </item> |
172 | <item> | ||
173 | <property> | ||
174 | <name>text</name> | ||
175 | <string><file></string> | ||
176 | </property> | ||
177 | </item> | ||
172 | <property stdset="1"> | 178 | <property stdset="1"> |
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index ba1119e..4aca526 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -17,4 +17,6 @@ | |||
17 | #include "configwindow.h" | 17 | #include "configwindow.h" |
18 | #include "mainwindow.h" | ||
18 | 19 | ||
19 | /* QT */ | 20 | /* QT */ |
21 | #include <qapplication.h> | ||
20 | #include <qcombobox.h> | 22 | #include <qcombobox.h> |
@@ -35,7 +37,8 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
35 | { | 37 | { |
36 | _devicetype[ "cisco" ] = 1; | 38 | _devicetype[ "cisco" ] = DEVTYPE_CISCO; |
37 | _devicetype[ "wlan-ng" ] = 2; | 39 | _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG; |
38 | _devicetype[ "hostap" ] = 3; | 40 | _devicetype[ "hostap" ] = DEVTYPE_HOSTAP; |
39 | _devicetype[ "orinoco" ] = 4; | 41 | _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO; |
40 | _devicetype[ "<manual>" ] = 5; | 42 | _devicetype[ "<manual>" ] = DEVTYPE_MANUAL; |
43 | _devicetype[ "<file>" ] = DEVTYPE_FILE; | ||
41 | 44 | ||
@@ -61,6 +64,6 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
61 | modules >> line; | 64 | modules >> line; |
62 | if ( line.contains( "cisco" ) ) devicetype = 1; | 65 | if ( line.contains( "cisco" ) ) devicetype = DEVTYPE_CISCO; |
63 | else if ( line.contains( "hostap" ) ) devicetype = 3; | 66 | else if ( line.contains( "hostap" ) ) devicetype = DEVTYPE_HOSTAP; |
64 | else if ( line.contains( "prism" ) ) devicetype = 2; | 67 | else if ( line.contains( "prism" ) ) devicetype = DEVTYPE_WLAN_NG; |
65 | else if ( line.contains( "orinoco" ) ) devicetype = 4; | 68 | else if ( line.contains( "orinoco" ) ) devicetype = DEVTYPE_ORINOCO; |
66 | } | 69 | } |
@@ -69,3 +72,4 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
69 | deviceType->setCurrentItem( devicetype ); | 72 | deviceType->setCurrentItem( devicetype ); |
70 | qDebug( "Wellenreiter: guessed device type to be %d", devicetype ); | 73 | _guess = devicetype; |
74 | qDebug( "Wellenreiter: guessed device type to be #%d", devicetype ); | ||
71 | } | 75 | } |
@@ -81,4 +85,7 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
81 | WellenreiterConfigWindow::_instance = this; | 85 | WellenreiterConfigWindow::_instance = this; |
86 | |||
87 | connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) ); | ||
82 | }; | 88 | }; |
83 | 89 | ||
90 | |||
84 | int WellenreiterConfigWindow::daemonDeviceType() | 91 | int WellenreiterConfigWindow::daemonDeviceType() |
@@ -96,2 +103,3 @@ int WellenreiterConfigWindow::daemonDeviceType() | |||
96 | 103 | ||
104 | |||
97 | int WellenreiterConfigWindow::daemonHopInterval() | 105 | int WellenreiterConfigWindow::daemonHopInterval() |
@@ -100 +108,19 @@ int WellenreiterConfigWindow::daemonHopInterval() | |||
100 | } | 108 | } |
109 | |||
110 | |||
111 | void WellenreiterConfigWindow::changedDeviceType(int t) | ||
112 | { | ||
113 | if ( t != DEVTYPE_FILE ) return; | ||
114 | QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(false); | ||
115 | if ( !name.isNull() && QFile::exists( name ) ) | ||
116 | { | ||
117 | interfaceName->insertItem( name ); | ||
118 | interfaceName->setCurrentItem( interfaceName->count()-1 ); | ||
119 | } | ||
120 | else | ||
121 | { | ||
122 | deviceType->setCurrentItem( _guess ); | ||
123 | } | ||
124 | |||
125 | } | ||
126 | |||
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h index 5fd0327..7df1a80 100644 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/noncore/net/wellenreiter/gui/configwindow.h | |||
@@ -23,2 +23,10 @@ | |||
23 | 23 | ||
24 | const int DEVTYPE_SELECT = 0; | ||
25 | const int DEVTYPE_CISCO = 1; | ||
26 | const int DEVTYPE_WLAN_NG = 2; | ||
27 | const int DEVTYPE_HOSTAP = 3; | ||
28 | const int DEVTYPE_ORINOCO = 4; | ||
29 | const int DEVTYPE_MANUAL = 5; | ||
30 | const int DEVTYPE_FILE = 6; | ||
31 | |||
24 | class WellenreiterConfigWindow; | 32 | class WellenreiterConfigWindow; |
@@ -27,2 +35,3 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase | |||
27 | { | 35 | { |
36 | Q_OBJECT | ||
28 | 37 | ||
@@ -36,2 +45,5 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase | |||
36 | 45 | ||
46 | public slots: | ||
47 | void changedDeviceType(int); | ||
48 | |||
37 | protected: | 49 | protected: |
@@ -39,2 +51,3 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase | |||
39 | static WellenreiterConfigWindow* _instance; | 51 | static WellenreiterConfigWindow* _instance; |
52 | int _guess; | ||
40 | 53 | ||
@@ -43,2 +56 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase | |||
43 | #endif | #endif | |
44 | |||
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 94e3f28..6cd364c 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -225,2 +225,3 @@ void WellenreiterMainWindow::demoAddStations() | |||
225 | 225 | ||
226 | |||
226 | QString WellenreiterMainWindow::getFileName( bool save ) | 227 | QString WellenreiterMainWindow::getFileName( bool save ) |
@@ -259,2 +260,3 @@ QString WellenreiterMainWindow::getFileName( bool save ) | |||
259 | 260 | ||
261 | |||
260 | void WellenreiterMainWindow::fileSaveLog() | 262 | void WellenreiterMainWindow::fileSaveLog() |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h index 1e191e5..926bb0a 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.h +++ b/noncore/net/wellenreiter/gui/mainwindow.h | |||
@@ -32,2 +32,3 @@ class WellenreiterMainWindow: public QMainWindow | |||
32 | ~WellenreiterMainWindow(); | 32 | ~WellenreiterMainWindow(); |
33 | QString getFileName( bool save ); | ||
33 | 34 | ||
@@ -51,5 +52,2 @@ class WellenreiterMainWindow: public QMainWindow | |||
51 | 52 | ||
52 | private: | ||
53 | QString getFileName( bool save ); | ||
54 | |||
55 | public slots: | 53 | public slots: |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 3372883..5c10c3b 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -223,24 +223,24 @@ void Wellenreiter::stopClicked() | |||
223 | { | 223 | { |
224 | disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 224 | if ( iface ) |
225 | disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); | 225 | { |
226 | iface->setChannelHopping(); // stop hopping channels | 226 | disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); |
227 | disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); | ||
228 | iface->setChannelHopping(); // stop hopping channels | ||
229 | } | ||
230 | else | ||
231 | killTimers(); | ||
232 | |||
227 | pcap->close(); | 233 | pcap->close(); |
228 | sniffing = false; | 234 | sniffing = false; |
229 | #ifdef QWS | ||
230 | oApp->setTitle(); | ||
231 | #else | ||
232 | qApp->mainWidget()->setCaption( "Wellenreiter II" ); | ||
233 | #endif | ||
234 | 235 | ||
235 | // get interface name from config window | 236 | if ( iface ) |
236 | const QString& interface = configwindow->interfaceName->currentText(); | 237 | { |
237 | ONetwork* net = ONetwork::instance(); | 238 | // switch off monitor mode |
238 | iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); | 239 | iface->setMonitorMode( false ); |
240 | // switch off promisc flag | ||
241 | iface->setPromiscuousMode( false ); | ||
239 | 242 | ||
240 | // switch off monitor mode | 243 | system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess |
241 | iface->setMonitorMode( false ); | 244 | } |
242 | // switch off promisc flag | ||
243 | iface->setPromiscuousMode( false ); | ||
244 | 245 | ||
245 | system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess | ||
246 | logwindow->log( "(i) Stopped Scanning." ); | 246 | logwindow->log( "(i) Stopped Scanning." ); |
@@ -299,17 +299,21 @@ void Wellenreiter::startClicked() | |||
299 | { | 299 | { |
300 | case 1: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break; | 300 | case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break; |
301 | case 2: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break; | 301 | case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break; |
302 | case 3: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break; | 302 | case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break; |
303 | case 4: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break; | 303 | case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break; |
304 | default: | 304 | case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", "Bring your device into\nmonitor mode now." ); break; |
305 | QMessageBox::information( this, "Wellenreiter II", "Bring your device into\nmonitor mode now." ); | 305 | case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; |
306 | default: assert( 0 ); // shouldn't reach this | ||
306 | } | 307 | } |
307 | 308 | ||
308 | if ( cardtype > 0 && cardtype < 5 ) | 309 | // switch device into monitor mode |
309 | iface->setMonitorMode( true ); | 310 | if ( cardtype < DEVTYPE_FILE ) |
310 | |||
311 | if ( !iface->monitorMode() ) | ||
312 | { | 311 | { |
313 | QMessageBox::warning( this, "Wellenreiter II", "Can't set device into monitor mode." ); | 312 | if ( cardtype != DEVTYPE_MANUAL ) |
314 | return; | 313 | iface->setMonitorMode( true ); |
314 | if ( !iface->monitorMode() ) | ||
315 | { | ||
316 | QMessageBox::warning( this, "Wellenreiter II", "Can't set device into monitor mode." ); | ||
317 | return; | ||
318 | } | ||
315 | } | 319 | } |
@@ -317,3 +321,6 @@ void Wellenreiter::startClicked() | |||
317 | // open pcap and start sniffing | 321 | // open pcap and start sniffing |
318 | pcap->open( interface ); | 322 | if ( cardtype != DEVTYPE_FILE ) |
323 | pcap->open( interface ); | ||
324 | else | ||
325 | pcap->open( QFile( interface ) ); | ||
319 | 326 | ||
@@ -329,7 +336,16 @@ void Wellenreiter::startClicked() | |||
329 | // start channel hopper | 336 | // start channel hopper |
330 | iface->setChannelHopping( 1000 ); //use interval from config window | 337 | if ( cardtype != DEVTYPE_FILE ) |
338 | iface->setChannelHopping( 1000 ); //use interval from config window | ||
331 | 339 | ||
332 | // connect | 340 | if ( cardtype != DEVTYPE_FILE ) |
333 | connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 341 | { |
334 | connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); | 342 | // connect socket notifier and start channel hopper |
343 | connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | ||
344 | connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); | ||
345 | } | ||
346 | else | ||
347 | { | ||
348 | // start timer for reading packets | ||
349 | startTimer( 100 ); | ||
350 | } | ||
335 | 351 | ||
@@ -339 +355,11 @@ void Wellenreiter::startClicked() | |||
339 | } | 355 | } |
356 | |||
357 | |||
358 | void Wellenreiter::timerEvent( QTimerEvent* ) | ||
359 | { | ||
360 | qDebug( "Wellenreiter::timerEvent()" ); | ||
361 | OPacket* p = pcap->next(); | ||
362 | receivePacket( p ); | ||
363 | delete p; | ||
364 | } | ||
365 | |||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index 839c77e..c37a9f2 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -51,2 +51,5 @@ class Wellenreiter : public WellenreiterBase { | |||
51 | 51 | ||
52 | protected: | ||
53 | virtual void timerEvent( QTimerEvent* ); | ||
54 | |||
52 | public slots: | 55 | public slots: |