summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-05-04 20:40:28 (UTC)
committer mickeyl <mickeyl>2003-05-04 20:40:28 (UTC)
commit7372d0271b19bc6ead8e796a949746ae45fe13fa (patch) (unidiff)
tree35f2e418dfc4184ae335f24a487bce5a6787f129
parent09dceae91b14a4b2d936ebfc6c7c276686c2b98c (diff)
downloadopie-7372d0271b19bc6ead8e796a949746ae45fe13fa.zip
opie-7372d0271b19bc6ead8e796a949746ae45fe13fa.tar.gz
opie-7372d0271b19bc6ead8e796a949746ae45fe13fa.tar.bz2
- cleanup and code refactoring towards 1.0
- match IP addresses to MAC addresses by looking @ ARP packets - show IP addresses - reduce debug output
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro18
-rw-r--r--noncore/net/wellenreiter/gui/logwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/logwindow.h5
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp8
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp98
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.h2
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp186
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h7
8 files changed, 222 insertions, 106 deletions
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 927f4b7..62e1d9a 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -36,12 +36,30 @@ TARGET = wellenreiter
36 message( qws ) 36 message( qws )
37 include ( $(OPIEDIR)/include.pro ) 37 include ( $(OPIEDIR)/include.pro )
38 LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 -lstdc++ 38 LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 -lstdc++
39} 39}
40 40
41contains( platform, x11 ) { 41contains( platform, x11 ) {
42 LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter 42 LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
43 SOURCES += resource.cpp 43 SOURCES += resource.cpp
44 HEADERS += resource.h 44 HEADERS += resource.h
45 DESTDIR = $(OPIEDIR)/output/bin 45 DESTDIR = $(OPIEDIR)/output/bin
46} 46}
47 47
48TRANSLATIONS = ../../../../i18n/de/wellenreiter.ts \
49 ../../../../i18n/nl/wellenreiter.ts \
50 ../../../../i18n/da/wellenreiter.ts \
51 ../../../../i18n/xx/wellenreiter.ts \
52 ../../../../i18n/en/wellenreiter.ts \
53 ../../../../i18n/es/wellenreiter.ts \
54 ../../../../i18n/fr/wellenreiter.ts \
55 ../../../../i18n/hu/wellenreiter.ts \
56 ../../../../i18n/ja/wellenreiter.ts \
57 ../../../../i18n/ko/wellenreiter.ts \
58 ../../../../i18n/no/wellenreiter.ts \
59 ../../../../i18n/pl/wellenreiter.ts \
60 ../../../../i18n/pt/wellenreiter.ts \
61 ../../../../i18n/pt_BR/wellenreiter.ts \
62 ../../../../i18n/sl/wellenreiter.ts \
63 ../../../../i18n/zh_CN/wellenreiter.ts \
64 ../../../../i18n/zh_TW/wellenreiter.ts
65
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp
index 12f74fd..6078fa2 100644
--- a/noncore/net/wellenreiter/gui/logwindow.cpp
+++ b/noncore/net/wellenreiter/gui/logwindow.cpp
@@ -8,29 +8,33 @@
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 "logwindow.h" 16#include "logwindow.h"
17#include <qmultilineedit.h> 17#include <qmultilineedit.h>
18#include <qdatetime.h> 18#include <qdatetime.h>
19 19
20MLogWindow* MLogWindow::_instance;
21
20MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f ) 22MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f )
21 :QVBox( parent, name, f ) 23 :QVBox( parent, name, f )
22{ 24{
23 ledit = new QMultiLineEdit( this ); 25 ledit = new QMultiLineEdit( this );
24 ledit->setReadOnly( true ); 26 ledit->setReadOnly( true );
27
28 MLogWindow::_instance = this;
25} 29}
26 30
27 31
28void MLogWindow::log( QString text ) 32void MLogWindow::log( QString text )
29{ 33{
30 QTime time = QTime::currentTime(); 34 QTime time = QTime::currentTime();
31 QString line; 35 QString line;
32 line.sprintf( "[%s] %s\n", (const char*) time.toString(), (const char*) text ); 36 line.sprintf( "[%s] %s\n", (const char*) time.toString(), (const char*) text );
33 int col; 37 int col;
34 int row; 38 int row;
35 ledit->getCursorPosition( &col, &row ); 39 ledit->getCursorPosition( &col, &row );
36 ledit->insertAt( line, col, row ); 40 ledit->insertAt( line, col, row );
diff --git a/noncore/net/wellenreiter/gui/logwindow.h b/noncore/net/wellenreiter/gui/logwindow.h
index 6e0fe50..da8c274 100644
--- a/noncore/net/wellenreiter/gui/logwindow.h
+++ b/noncore/net/wellenreiter/gui/logwindow.h
@@ -22,19 +22,24 @@ class QString;
22class QMultiLineEdit; 22class QMultiLineEdit;
23 23
24class MLogWindow: public QVBox 24class MLogWindow: public QVBox
25{ 25{
26 26
27 public: 27 public:
28 MLogWindow( QWidget * parent = 0, const char * name = "MLogWindow", WFlags f = 0 ); 28 MLogWindow( QWidget * parent = 0, const char * name = "MLogWindow", WFlags f = 0 );
29 29
30 void log( QString text ); 30 void log( QString text );
31 const QString getLog() const; 31 const QString getLog() const;
32 void clear(); 32 void clear();
33 33
34 static MLogWindow* logwindow() { return MLogWindow::_instance; };
35
34 protected: 36 protected:
35 QMultiLineEdit* ledit; 37 QMultiLineEdit* ledit;
36 38
39 private:
40 static MLogWindow* _instance;
41
37}; 42};
38 43
39#endif 44#endif
40 45
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index c4a8fbc..773d825 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -123,29 +123,29 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
123 QPopupMenu* sniffer = new QPopupMenu( mb ); 123 QPopupMenu* sniffer = new QPopupMenu( mb );
124 sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) ); 124 sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
125 sniffer->insertSeparator(); 125 sniffer->insertSeparator();
126 startID = sniffer->insertItem( tr( "&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( tr( "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( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); 132 demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
133 133
134 id = mb->insertItem( tr( "&File" ), file ); 134 id = mb->insertItem( tr( "&File" ), file );
135 id = mb->insertItem( tr( "&View" ), view ); 135 //id = mb->insertItem( tr( "&View" ), view );
136 mb->setItemEnabled( id, false ); 136 //mb->setItemEnabled( id, false );
137 id = mb->insertItem( tr( "&Sniffer" ), sniffer ); 137 id = mb->insertItem( tr( "&Sniffer" ), sniffer );
138 id = mb->insertItem( tr( "&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
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 3a6aa15..d5665b4 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -6,24 +6,25 @@
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 "scanlist.h" 16#include "scanlist.h"
17#include "configwindow.h" 17#include "configwindow.h"
18#include "logwindow.h"
18 19
19#include <assert.h> 20#include <assert.h>
20#include "manufacturers.h" 21#include "manufacturers.h"
21#include <qdatetime.h> 22#include <qdatetime.h>
22#include <qtextstream.h> 23#include <qtextstream.h>
23 24
24#ifdef QWS 25#ifdef QWS
25#include <opie/odevice.h> 26#include <opie/odevice.h>
26using namespace Opie; 27using namespace Opie;
27#endif 28#endif
28 29
29 30
@@ -31,53 +32,56 @@ using namespace Opie;
31#include <qpe/resource.h> 32#include <qpe/resource.h>
32#else 33#else
33#include "resource.h" 34#include "resource.h"
34#endif 35#endif
35 36
36const int col_type = 0; 37const int col_type = 0;
37const int col_essid = 0; 38const int col_essid = 0;
38const int col_sig = 1; 39const int col_sig = 1;
39const int col_ap = 2; 40const int col_ap = 2;
40const int col_channel = 3; 41const int col_channel = 3;
41const int col_wep = 4; 42const int col_wep = 4;
42const int col_traffic = 5; 43const int col_traffic = 5;
43const int col_manuf = 6; 44const int col_ip = 6;
44const int col_firstseen = 7; 45const int col_manuf = 7;
45const int col_lastseen = 8; 46const int col_firstseen = 8;
47const int col_lastseen = 9;
46 48
47MScanListView::MScanListView( QWidget* parent, const char* name ) 49MScanListView::MScanListView( QWidget* parent, const char* name )
48 :OListView( parent, name ), _manufacturerdb( 0 ) 50 :OListView( parent, name ), _manufacturerdb( 0 )
49{ 51{
50 52
51 setFrameShape( QListView::StyledPanel ); 53 setFrameShape( QListView::StyledPanel );
52 setFrameShadow( QListView::Sunken ); 54 setFrameShadow( QListView::Sunken );
53 55
54 addColumn( tr( "Net/Station" ) ); 56 addColumn( tr( "Net/Station" ) );
55 setColumnAlignment( 0, AlignLeft || AlignVCenter ); 57 setColumnAlignment( col_essid, AlignLeft || AlignVCenter );
56 addColumn( tr( "#" ) ); 58 addColumn( tr( "#" ) );
57 setColumnAlignment( 1, AlignCenter ); 59 setColumnAlignment( col_sig, AlignCenter );
58 addColumn( tr( "MAC" ) ); 60 addColumn( tr( "MAC" ) );
59 setColumnAlignment( 2, AlignCenter ); 61 setColumnAlignment( col_ap, AlignCenter );
60 addColumn( tr( "Chn" ) ); 62 addColumn( tr( "Chn" ) );
61 setColumnAlignment( 3, AlignCenter ); 63 setColumnAlignment( col_channel, AlignCenter );
62 addColumn( tr( "W" ) ); 64 addColumn( tr( "W" ) );
63 setColumnAlignment( 4, AlignCenter ); 65 setColumnAlignment( col_wep, AlignCenter );
64 addColumn( tr( "T" ) ); 66 addColumn( tr( "T" ) );
65 setColumnAlignment( 5, AlignCenter ); 67 setColumnAlignment( col_traffic, AlignCenter );
68 addColumn( tr( "IP" ) );
69 setColumnAlignment( col_ip, AlignCenter );
66 addColumn( tr( "Manufacturer" ) ); 70 addColumn( tr( "Manufacturer" ) );
67 setColumnAlignment( 6, AlignCenter ); 71 setColumnAlignment( col_manuf, AlignCenter );
68 addColumn( tr( "First Seen" ) ); 72 addColumn( tr( "First Seen" ) );
69 setColumnAlignment( 7, AlignCenter ); 73 setColumnAlignment( col_firstseen, AlignCenter );
70 addColumn( tr( "Last Seen" ) ); 74 addColumn( tr( "Last Seen" ) );
71 setColumnAlignment( 8, AlignCenter ); 75 setColumnAlignment( col_lastseen, AlignCenter );
72 setRootIsDecorated( true ); 76 setRootIsDecorated( true );
73 setAllColumnsShowFocus( true ); 77 setAllColumnsShowFocus( true );
74}; 78};
75 79
76MScanListView::~MScanListView() 80MScanListView::~MScanListView()
77{ 81{
78}; 82};
79 83
80OListViewItem* MScanListView::childFactory() 84OListViewItem* MScanListView::childFactory()
81{ 85{
82 return new MScanListItem( this ); 86 return new MScanListItem( this );
83} 87}
@@ -94,266 +98,310 @@ void MScanListView::serializeFrom( QDataStream& s)
94 OListView::serializeFrom( s ); 98 OListView::serializeFrom( s );
95} 99}
96 100
97void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb ) 101void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb )
98{ 102{
99 _manufacturerdb = manufacturerdb; 103 _manufacturerdb = manufacturerdb;
100} 104}
101 105
102void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) 106void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
103{ 107{
104 // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...) 108 // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...)
105 109
106 qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", 110 #ifdef DEBUG
107 (const char*) type, 111 qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", (const char*) type,
108 (const char*) essid, 112 (const char*) essid, (const char*) macaddr, channel );
109 (const char*) macaddr, 113 #endif
110 channel );
111 114
112 // search, if we already have seen this net 115 // search, if we already have seen this net
113 116
114 QString s; 117 QString s;
115 MScanListItem* network; 118 MScanListItem* network;
116 MScanListItem* item = static_cast<MScanListItem*> ( firstChild() ); 119 MScanListItem* item = static_cast<MScanListItem*> ( firstChild() );
117 120
118 while ( item && ( item->text( col_essid ) != essid ) ) 121 while ( item && ( item->text( col_essid ) != essid ) )
119 { 122 {
123 #ifdef DEBUG
120 qDebug( "itemtext: %s", (const char*) item->text( col_essid ) ); 124 qDebug( "itemtext: %s", (const char*) item->text( col_essid ) );
125 #endif
121 item = static_cast<MScanListItem*> ( item->nextSibling() ); 126 item = static_cast<MScanListItem*> ( item->nextSibling() );
122 } 127 }
123 if ( item ) 128 if ( item )
124 { 129 {
125 // we have already seen this net, check all childs if MAC exists 130 // we have already seen this net, check all childs if MAC exists
126 131
127 network = item; 132 network = item;
128 133
129 item = static_cast<MScanListItem*> ( item->firstChild() ); 134 item = static_cast<MScanListItem*> ( item->firstChild() );
130 assert( item ); // this shouldn't fail 135 assert( item ); // this shouldn't fail
131 136
132 while ( item && ( item->text( col_ap ) != macaddr ) ) 137 while ( item && ( item->text( col_ap ) != macaddr ) )
133 { 138 {
139 #ifdef DEBUG
134 qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) ); 140 qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) );
141 #endif
135 item = static_cast<MScanListItem*> ( item->nextSibling() ); 142 item = static_cast<MScanListItem*> ( item->nextSibling() );
136 } 143 }
137 144
138 if ( item ) 145 if ( item )
139 { 146 {
140 // we have already seen this item, it's a dupe 147 // we have already seen this item, it's a dupe
141 #ifdef DEBUG 148 #ifdef DEBUG
142 qDebug( "%s is a dupe - ignoring...", (const char*) macaddr ); 149 qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
143 #endif 150 #endif
144 item->receivedBeacon(); 151 item->receivedBeacon();
145 return; 152 return;
146 } 153 }
147 } 154 }
148 else 155 else
149 { 156 {
150 s.sprintf( "(i) new network: '%s'", (const char*) essid ); 157 s.sprintf( "(i) New network: ESSID '%s'", (const char*) essid );
151 //TODO send s to logwindow 158 MLogWindow::logwindow()->log( s );
152 network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); 159 network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 );
153 } 160 }
154 161
155 162
156 // insert new station as child from network 163 // insert new station as child from network
157 // no essid to reduce clutter, maybe later we have a nick or stationname to display!? 164 // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
158 165
166 #ifdef DEBUG
159 qDebug( "inserting new station %s", (const char*) macaddr ); 167 qDebug( "inserting new station %s", (const char*) macaddr );
168 #endif
160 169
161 MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); 170 MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
162 if ( _manufacturerdb ) 171 if ( _manufacturerdb )
163 station->setManufacturer( _manufacturerdb->lookup( macaddr ) ); 172 station->setManufacturer( _manufacturerdb->lookup( macaddr ) );
164 173
165 if ( type == "managed" ) 174 if ( type == "managed" )
166 { 175 {
167 s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); 176 s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel );
168 } 177 }
169 else 178 else
170 { 179 {
171 s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); 180 s.sprintf( "(i) New AdHoc station in '%s' [%d]", (const char*) essid, channel );
172 } 181 }
173 //TODO send s to logwindow 182 MLogWindow::logwindow()->log( s );
174 183
175} 184}
176 185
177 186
178void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type ) 187void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type )
179{ 188{
180 MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() ); 189 MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
181 190
182 while ( subitem && ( subitem->text( col_ap ) != addr ) ) 191 while ( subitem && ( subitem->text( col_ap ) != addr ) )
183 { 192 {
193 #ifdef DEBUG
184 qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) ); 194 qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) );
195 #endif
185 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); 196 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
186 } 197 }
187 198
188 if ( subitem ) 199 if ( subitem )
189 { 200 {
190 // we have already seen this item, it's a dupe 201 // we have already seen this item, it's a dupe
191 #ifdef DEBUG 202 #ifdef DEBUG
192 qDebug( "%s is a dupe - ignoring...", (const char*) addr ); 203 qDebug( "%s is a dupe - ignoring...", (const char*) addr );
193 #endif 204 #endif
194 subitem->receivedBeacon(); //FIXME: sent data bit 205 subitem->receivedBeacon(); //FIXME: sent data bit
195 return; 206 return;
196 } 207 }
197 208
198 // Hey, it seems to be a new item :-D 209 // Hey, it seems to be a new item :-D
199 MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 ); 210 MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 );
200 if ( _manufacturerdb ) 211 if ( _manufacturerdb )
201 station->setManufacturer( _manufacturerdb->lookup( addr ) ); 212 station->setManufacturer( _manufacturerdb->lookup( addr ) );
202 213
203 QString s; 214 QString s;
204 if ( type == "station" ) 215 if ( type == "station" )
205 { 216 {
206 s.sprintf( "(i) new station in '%s' [??]", (const char*) network->text( col_essid ) ); 217 s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) );
207 } 218 }
208 else 219 else
209 { 220 {
210 s.sprintf( "(i) new wireless station in '%s' [??]", (const char*) network->text( col_essid ) ); 221 s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) );
211 } 222 }
212 //TODO send s to logwindow 223 MLogWindow::logwindow()->log( s );
213} 224}
214 225
215 226
216void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ) 227void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo )
217{ 228{
218 QString s; 229 QString s;
219 MScanListItem* network; 230 MScanListItem* network;
220 231
221 QListViewItemIterator it( this ); 232 QListViewItemIterator it( this );
222 while ( it.current() && 233 while ( it.current() &&
223 it.current()->text( col_ap ) != viaFrom && 234 it.current()->text( col_ap ) != viaFrom &&
224 it.current()->text( col_ap ) != viaTo ) ++it; 235 it.current()->text( col_ap ) != viaTo ) ++it;
225 236
226 MScanListItem* item = static_cast<MScanListItem*>( it.current() ); 237 MScanListItem* item = static_cast<MScanListItem*>( it.current() );
227 238
228 if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations 239 if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations
229 { 240 {
230 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from ); 241 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from );
231 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to ); 242 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to );
232 } 243 }
233 else 244 else
234 { 245 {
235 qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" ); 246 qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" );
247 MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" );
236 } 248 }
237} 249}
238 250
239 251
240void MScanListView::toDStraffic( QString from, QString to, QString via ) 252void MScanListView::toDStraffic( QString from, QString to, QString via )
241{ 253{
242 QString s; 254 QString s;
243 MScanListItem* network; 255 MScanListItem* network;
244 256
245 QListViewItemIterator it( this ); 257 QListViewItemIterator it( this );
246 while ( it.current() && it.current()->text( col_ap ) != via ) ++it; 258 while ( it.current() && it.current()->text( col_ap ) != via ) ++it;
247 259
248 MScanListItem* item = static_cast<MScanListItem*>( it.current() ); 260 MScanListItem* item = static_cast<MScanListItem*>( it.current() );
249 261
250 if ( item ) // AP has shown up yet, so just add our new "from" - station 262 if ( item ) // AP has shown up yet, so just add our new "from" - station
251 { 263 {
252 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" ); 264 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" );
253 } 265 }
254 else 266 else
255 { 267 {
256 qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); 268 qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
269 MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" );
270
257 } 271 }
258} 272}
259 273
274
260void MScanListView::fromDStraffic( QString from, QString to, QString via ) 275void MScanListView::fromDStraffic( QString from, QString to, QString via )
261{ 276{
262 QString s; 277 QString s;
263 MScanListItem* network; 278 MScanListItem* network;
264 279
265 QListViewItemIterator it( this ); 280 QListViewItemIterator it( this );
266 while ( it.current() && it.current()->text( col_ap ) != via ) ++it; 281 while ( it.current() && it.current()->text( col_ap ) != via ) ++it;
267 282
268 MScanListItem* item = static_cast<MScanListItem*>( it.current() ); 283 MScanListItem* item = static_cast<MScanListItem*>( it.current() );
269 284
270 if ( item ) // AP has shown up yet, so just add our new "from" - station 285 if ( item ) // AP has shown up yet, so just add our new "from" - station
271 { 286 {
272 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" ); 287 addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" );
273 } 288 }
274 else 289 else
275 { 290 {
276 qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); 291 qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
292 MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
277 } 293 }
278} 294}
279 295
296
280void MScanListView::IBSStraffic( QString from, QString to, QString via ) 297void MScanListView::IBSStraffic( QString from, QString to, QString via )
281{ 298{
282 qWarning( "D'oh! Not yet implemented..." ); 299 qWarning( "D'oh! Not yet implemented..." );
300 MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
283} 301}
284 302
303
304void MScanListView::identify( const QString& macaddr, const QString& ip )
305{
306 qDebug( "identify %s = %s", (const char*) macaddr, (const char*) ip );
307
308 QListViewItemIterator it( this );
309 for ( ; it.current(); ++it )
310 {
311 if ( it.current()->text( col_ap ) == macaddr )
312 {
313 it.current()->setText( col_ip, ip );
314 return;
315 }
316 }
317 qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" );
318 MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!",
319 (const char*) macaddr, (const char*) ip ) );
320}
321
322
285//============================================================ 323//============================================================
286// MScanListItem 324// MScanListItem
287//============================================================ 325//============================================================
288 326
289MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr, 327MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr,
290 bool wep, int channel, int signal ) 328 bool wep, int channel, int signal )
291 :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), 329 :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
292 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), 330 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
293 _channel( channel ), _signal( signal ), _beacons( 1 ) 331 _channel( channel ), _signal( signal ), _beacons( 1 )
294{ 332{
333 #ifdef DEBUG
295 qDebug( "creating scanlist item" ); 334 qDebug( "creating scanlist item" );
335 #endif
296 if ( WellenreiterConfigWindow::instance() && type == "network" ) 336 if ( WellenreiterConfigWindow::instance() && type == "network" )
297 playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() ); 337 playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() );
298 decorateItem( type, essid, macaddr, wep, channel, signal ); 338 decorateItem( type, essid, macaddr, wep, channel, signal );
299} 339}
300 340
301MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr, 341MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr,
302 bool wep, int channel, int signal ) 342 bool wep, int channel, int signal )
303 :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) 343 :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
304{ 344{
345 #ifdef DEBUG
305 qDebug( "creating scanlist item" ); 346 qDebug( "creating scanlist item" );
347 #endif
306 decorateItem( type, essid, macaddr, wep, channel, signal ); 348 decorateItem( type, essid, macaddr, wep, channel, signal );
307} 349}
308 350
309OListViewItem* MScanListItem::childFactory() 351OListViewItem* MScanListItem::childFactory()
310{ 352{
311 return new MScanListItem( this ); 353 return new MScanListItem( this );
312} 354}
313 355
314void MScanListItem::serializeTo( QDataStream& s ) const 356void MScanListItem::serializeTo( QDataStream& s ) const
315{ 357{
358 #ifdef DEBUG
316 qDebug( "serializing MScanListItem" ); 359 qDebug( "serializing MScanListItem" );
360 #endif
317 OListViewItem::serializeTo( s ); 361 OListViewItem::serializeTo( s );
318 362
319 s << _type; 363 s << _type;
320 s << (Q_UINT8) ( _wep ? 'y' : 'n' ); 364 s << (Q_UINT8) ( _wep ? 'y' : 'n' );
321} 365}
322 366
323void MScanListItem::serializeFrom( QDataStream& s ) 367void MScanListItem::serializeFrom( QDataStream& s )
324{ 368{
369 #ifdef DEBUG
325 qDebug( "serializing MScanListItem" ); 370 qDebug( "serializing MScanListItem" );
371 #endif
326 OListViewItem::serializeFrom( s ); 372 OListViewItem::serializeFrom( s );
327 373
328 char wep; 374 char wep;
329 s >> _type; 375 s >> _type;
330 s >> (Q_UINT8) wep; 376 s >> (Q_UINT8) wep;
331 _wep = (wep == 'y'); 377 _wep = (wep == 'y');
332 378
333 QString name; 379 QString name;
334 name.sprintf( "wellenreiter/%s", (const char*) _type ); 380 name.sprintf( "wellenreiter/%s", (const char*) _type );
335 setPixmap( col_type, Resource::loadPixmap( name ) ); 381 setPixmap( col_type, Resource::loadPixmap( name ) );
336 if ( _wep ) 382 if ( _wep )
337 setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! 383 setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
338 listView()->triggerUpdate(); 384 listView()->triggerUpdate();
339} 385}
340 386
341void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) 387void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
342{ 388{
389 #ifdef DEBUG
343 qDebug( "decorating scanlist item %s / %s / %s [%d]", 390 qDebug( "decorating scanlist item %s / %s / %s [%d]",
344 (const char*) type, 391 (const char*) type,
345 (const char*) essid, 392 (const char*) essid,
346 (const char*) macaddr, 393 (const char*) macaddr,
347 channel ); 394 channel );
395 #endif
348 396
349 // set icon for managed or adhoc mode 397 // set icon for managed or adhoc mode
350 QString name; 398 QString name;
351 name.sprintf( "wellenreiter/%s", (const char*) type ); 399 name.sprintf( "wellenreiter/%s", (const char*) type );
352 setPixmap( col_type, Resource::loadPixmap( name ) ); 400 setPixmap( col_type, Resource::loadPixmap( name ) );
353 401
354 // set icon for wep (wireless encryption protocol) 402 // set icon for wep (wireless encryption protocol)
355 if ( wep ) 403 if ( wep )
356 setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! 404 setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
357 405
358 // set channel and signal text 406 // set channel and signal text
359 407
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 56bf837..4cb9216 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -37,24 +37,26 @@ class MScanListView: public OListView
37 37
38 virtual OListViewItem* childFactory(); 38 virtual OListViewItem* childFactory();
39 virtual void serializeTo( QDataStream& s ) const; 39 virtual void serializeTo( QDataStream& s ) const;
40 virtual void serializeFrom( QDataStream& s ); 40 virtual void serializeFrom( QDataStream& s );
41 41
42 public slots: 42 public slots:
43 void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ); 43 void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
44 void fromDStraffic( QString from, QString to, QString via ); // NYI 44 void fromDStraffic( QString from, QString to, QString via ); // NYI
45 void toDStraffic( QString from, QString to, QString via ); 45 void toDStraffic( QString from, QString to, QString via );
46 void WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ); 46 void WDStraffic( QString from, QString to, QString viaFrom, QString viaTo );
47 void IBSStraffic( QString from, QString to, QString via ); // NYI 47 void IBSStraffic( QString from, QString to, QString via ); // NYI
48 48
49 void identify( const QString& macaddr, const QString& ipaddr );
50
49 protected: 51 protected:
50 void addIfNotExisting( MScanListItem* parent, QString addr, const QString& type = "station" ); 52 void addIfNotExisting( MScanListItem* parent, QString addr, const QString& type = "station" );
51 53
52 private: 54 private:
53 ManufacturerDB* _manufacturerdb; 55 ManufacturerDB* _manufacturerdb;
54 56
55}; 57};
56 58
57//****************************** MScanListItem **************************************************************** 59//****************************** MScanListItem ****************************************************************
58 60
59class MScanListItem: public OListViewItem 61class MScanListItem: public OListViewItem
60{ 62{
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 62bda91..9e1010b 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -128,117 +128,151 @@ void Wellenreiter::channelHopped(int c)
128 { 128 {
129 QString right; 129 QString right;
130 right.fill( '.', iface->channels()-c ); 130 right.fill( '.', iface->channels()-c );
131 title.append( right ); 131 title.append( right );
132 } 132 }
133 title.append( "]" ); 133 title.append( "]" );
134 //title.append( QString().sprintf( " %02d", c ) ); 134 //title.append( QString().sprintf( " %02d", c ) );
135 assert( parent() ); 135 assert( parent() );
136 ( (QMainWindow*) parent() )->setCaption( title ); 136 ( (QMainWindow*) parent() )->setCaption( title );
137} 137}
138 138
139 139
140void Wellenreiter::receivePacket(OPacket* p) 140void Wellenreiter::handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon )
141{ 141{
142 hexWindow()->log( p->dump( 8 ) ); 142 QString type;
143 if ( beacon->canIBSS() )
144 {
145 type = "adhoc";
146 }
147 else if ( beacon->canESS() )
148 {
149 type = "managed";
150 }
151 else
152 {
153 qWarning( "Wellenreiter::invalid frame [possibly noise] detected!" );
154 return;
155 }
143 156
144 // check if we received a beacon frame 157 OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
145 OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); 158 QString essid = ssid ? ssid->ID() : QString("<unknown>");
146 if ( beacon && beacon->managementType() == "Beacon" ) 159 OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
160 int channel = ds ? ds->channel() : -1;
161
162 OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
163 netView()->addNewItem( type, essid, header->macAddress2().toString(), beacon->canPrivacy(), channel, 0 );
164
165 // update graph window
166 if ( ds )
147 { 167 {
148 QString type; 168 OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
149 if ( beacon->canIBSS() ) 169 if ( prism )
150 { 170 graphwindow->traffic( ds->channel(), prism->signalStrength() );
151 type = "adhoc"; 171 else
152 } 172 graphwindow->traffic( ds->channel(), 95 );
153 else if ( beacon->canESS() ) 173 }
174}
175
176
177void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data )
178{
179 OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
180 if ( wlan->fromDS() && !wlan->toDS() )
181 {
182 qDebug( "FromDS traffic: '%s' -> '%s' via '%s'",
183 (const char*) wlan->macAddress3().toString(true),
184 (const char*) wlan->macAddress1().toString(true),
185 (const char*) wlan->macAddress2().toString(true) );
186 netView()->fromDStraffic( wlan->macAddress3().toString(),
187 wlan->macAddress1().toString(),
188 wlan->macAddress2().toString() );
189 }
190 else
191 if ( !wlan->fromDS() && wlan->toDS() )
192 {
193 qDebug( "ToDS traffic: '%s' -> '%s' via '%s'",
194 (const char*) wlan->macAddress2().toString(true),
195 (const char*) wlan->macAddress3().toString(true),
196 (const char*) wlan->macAddress1().toString(true) );
197 netView()->toDStraffic( wlan->macAddress2().toString(),
198 wlan->macAddress3().toString(),
199 wlan->macAddress1().toString() );
200 }
201 else
202 if ( wlan->fromDS() && wlan->toDS() )
203 {
204 qDebug( "WDS(bridge) traffic: '%s' -> '%s' via '%s' and '%s'",
205 (const char*) wlan->macAddress4().toString(true),
206 (const char*) wlan->macAddress3().toString(true),
207 (const char*) wlan->macAddress1().toString(true),
208 (const char*) wlan->macAddress2().toString(true) );
209 netView()->WDStraffic( wlan->macAddress4().toString(),
210 wlan->macAddress3().toString(),
211 wlan->macAddress1().toString(),
212 wlan->macAddress2().toString() );
213 }
214 else
215 {
216 qDebug( "IBSS(AdHoc) traffic: '%s' -> '%s' (Cell: '%s')'",
217 (const char*) wlan->macAddress2().toString(true),
218 (const char*) wlan->macAddress1().toString(true),
219 (const char*) wlan->macAddress3().toString(true) );
220 netView()->IBSStraffic( wlan->macAddress2().toString(),
221 wlan->macAddress1().toString(),
222 wlan->macAddress3().toString() );
223 }
224
225 OARPPacket* arp = (OARPPacket*) p->child( "ARP" );
226 if ( arp )
227 {
228 qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() );
229 if ( arp->type() == "REQUEST" )
154 { 230 {
155 type = "managed"; 231 netView()->identify( arp->senderMacAddress().toString(), arp->senderIPV4Address().toString() );
156 } 232 }
157 else 233 else if ( arp->type() == "REPLY" )
158 { 234 {
159 qDebug( "Wellenreiter::invalid frame detected: '%s'", (const char*) p->dump( 16 ) ); 235 netView()->identify( arp->senderMacAddress().toString(), arp->senderIPV4Address().toString() );
160 return; 236 netView()->identify( arp->targetMacAddress().toString(), arp->targetIPV4Address().toString() );
161 } 237 }
238 }
239
240 OIPPacket* ip = (OIPPacket*) p->child( "IP" );
241 if ( ip )
242 {
243 qDebug( "Received IP packet." );
244 }
245}
162 246
163 OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
164 QString essid = ssid ? ssid->ID() : QString("<unknown>");
165 OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
166 int channel = ds ? ds->channel() : -1;
167 247
168 OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); 248void Wellenreiter::receivePacket( OPacket* p )
169 netView()->addNewItem( type, essid, header->macAddress2().toString(), beacon->canPrivacy(), channel, 0 ); 249{
250 hexWindow()->log( p->dump( 8 ) );
170 251
171 // update graph window 252 // check if we received a beacon frame
172 if ( ds ) 253 OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) );
173 { 254 if ( beacon && beacon->managementType() == "Beacon" )
174 OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) ); 255 {
175 if ( prism ) 256 handleBeacon( p, beacon );
176 graphwindow->traffic( ds->channel(), prism->signalStrength() );
177 else
178 graphwindow->traffic( ds->channel(), 95 );
179 }
180 return; 257 return;
181 } 258 }
182 259
260 //TODO: WEP check here
261
183 // check for a data frame 262 // check for a data frame
184 OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) ); 263 OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) );
185 if ( data ) 264 if ( data )
186 { 265 {
187 OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" ); 266 handleData( p, data );
188 if ( wlan->fromDS() && !wlan->toDS() )
189 {
190 qDebug( "FromDS traffic: '%s' -> '%s' via '%s'",
191 (const char*) wlan->macAddress3().toString(true),
192 (const char*) wlan->macAddress1().toString(true),
193 (const char*) wlan->macAddress2().toString(true) );
194 netView()->fromDStraffic( wlan->macAddress3().toString(),
195 wlan->macAddress1().toString(),
196 wlan->macAddress2().toString() );
197 }
198 else
199 if ( !wlan->fromDS() && wlan->toDS() )
200 {
201 qDebug( "ToDS traffic: '%s' -> '%s' via '%s'",
202 (const char*) wlan->macAddress2().toString(true),
203 (const char*) wlan->macAddress3().toString(true),
204 (const char*) wlan->macAddress1().toString(true) );
205 netView()->toDStraffic( wlan->macAddress2().toString(),
206 wlan->macAddress3().toString(),
207 wlan->macAddress1().toString() );
208 }
209 else
210 if ( wlan->fromDS() && wlan->toDS() )
211 {
212 qDebug( "WDS(bridge) traffic: '%s' -> '%s' via '%s' and '%s'",
213 (const char*) wlan->macAddress4().toString(true),
214 (const char*) wlan->macAddress3().toString(true),
215 (const char*) wlan->macAddress1().toString(true),
216 (const char*) wlan->macAddress2().toString(true) );
217 netView()->WDStraffic( wlan->macAddress4().toString(),
218 wlan->macAddress3().toString(),
219 wlan->macAddress1().toString(),
220 wlan->macAddress2().toString() );
221 }
222 else
223 {
224 qDebug( "IBSS(AdHoc) traffic: '%s' -> '%s' (Cell: '%s')'",
225 (const char*) wlan->macAddress2().toString(true),
226 (const char*) wlan->macAddress1().toString(true),
227 (const char*) wlan->macAddress3().toString(true) );
228 netView()->IBSStraffic( wlan->macAddress2().toString(),
229 wlan->macAddress1().toString(),
230 wlan->macAddress3().toString() );
231 }
232 return;
233 } 267 }
234} 268}
235 269
236 270
237void Wellenreiter::stopClicked() 271void Wellenreiter::stopClicked()
238{ 272{
239 if ( iface ) 273 if ( iface )
240 { 274 {
241 disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); 275 disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
242 disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); 276 disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
243 iface->setChannelHopping(); // stop hopping channels 277 iface->setChannelHopping(); // stop hopping channels
244 } 278 }
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index c37a9f2..ea8a692 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -17,27 +17,28 @@
17#define WELLENREITER_H 17#define WELLENREITER_H
18 18
19#include "wellenreiterbase.h" 19#include "wellenreiterbase.h"
20 20
21#ifdef QWS 21#ifdef QWS
22#include <opie/odevice.h> 22#include <opie/odevice.h>
23using namespace Opie; 23using namespace Opie;
24#endif 24#endif
25 25
26class QTimerEvent; 26class QTimerEvent;
27class QPixmap; 27class QPixmap;
28class OPacket; 28class OPacket;
29class OWaveLanManagementPacket;
30class OWaveLanDataPacket;
29class OPacketCapturer; 31class OPacketCapturer;
30class OWirelessNetworkInterface; 32class OWirelessNetworkInterface;
31
32class ManufacturerDB; 33class ManufacturerDB;
33class WellenreiterConfigWindow; 34class WellenreiterConfigWindow;
34class MLogWindow; 35class MLogWindow;
35class MHexWindow; 36class MHexWindow;
36 37
37class Wellenreiter : public WellenreiterBase { 38class Wellenreiter : public WellenreiterBase {
38 Q_OBJECT 39 Q_OBJECT
39 40
40 public: 41 public:
41 Wellenreiter( QWidget* parent = 0 ); 42 Wellenreiter( QWidget* parent = 0 );
42 ~Wellenreiter(); 43 ~Wellenreiter();
43 44
@@ -54,24 +55,28 @@ class Wellenreiter : public WellenreiterBase {
54 55
55 public slots: 56 public slots:
56 void channelHopped(int); 57 void channelHopped(int);
57 void receivePacket(OPacket*); 58 void receivePacket(OPacket*);
58 void startClicked(); 59 void startClicked();
59 void stopClicked(); 60 void stopClicked();
60 61
61 signals: 62 signals:
62 void startedSniffing(); 63 void startedSniffing();
63 void stoppedSniffing(); 64 void stoppedSniffing();
64 65
65 private: 66 private:
67 void handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon );
68 void handleData( OPacket* p, OWaveLanDataPacket* data );
69
70 private:
66 #ifdef QWS 71 #ifdef QWS
67 OSystem _system; // Opie Operating System identifier 72 OSystem _system; // Opie Operating System identifier
68 #endif 73 #endif
69 74
70 OWirelessNetworkInterface* iface; 75 OWirelessNetworkInterface* iface;
71 OPacketCapturer* pcap; 76 OPacketCapturer* pcap;
72 ManufacturerDB* manufacturerdb; 77 ManufacturerDB* manufacturerdb;
73 WellenreiterConfigWindow* configwindow; 78 WellenreiterConfigWindow* configwindow;
74 79
75 //void readConfig(); 80 //void readConfig();
76 //void writeConfig(); 81 //void writeConfig();
77}; 82};