author | mickeyl <mickeyl> | 2003-04-07 22:06:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-07 22:06:01 (UTC) |
commit | eee5531d24fdb17011debaa7acd42683330e55b6 (patch) (unidiff) | |
tree | 5e82bb5e7c39b1bdb1240eff47dbbe13adcf18cb /noncore/net/wellenreiter/gui/wellenreiter.cpp | |
parent | c32ffdaa4cac3cbe60d4bb6f72e0444a6f9e323f (diff) | |
download | opie-eee5531d24fdb17011debaa7acd42683330e55b6.zip opie-eee5531d24fdb17011debaa7acd42683330e55b6.tar.gz opie-eee5531d24fdb17011debaa7acd42683330e55b6.tar.bz2 |
New feature! Finally, non-AP stations in an infrastructure network show up.
Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 64 |
1 files changed, 56 insertions, 8 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index aa33158..8d18f73 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -113,16 +113,10 @@ void Wellenreiter::receivePacket(OPacket* p) | |||
113 | hexWindow()->log( p->dump( 8 ) ); | 113 | hexWindow()->log( p->dump( 8 ) ); |
114 | 114 | ||
115 | // check if we received a beacon frame | 115 | // check if we received a beacon frame |
116 | // static_cast is justified here | ||
117 | OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); | 116 | OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); |
118 | if ( !beacon ) return; | 117 | if ( beacon ) |
118 | { | ||
119 | QString type; | 119 | QString type; |
120 | |||
121 | //FIXME: Can stations in ESS mode can be distinguished from APs? | ||
122 | //FIXME: Apparently yes, but not by listening to beacons, because | ||
123 | //FIXME: they simply don't send beacons in infrastructure mode. | ||
124 | //FIXME: so we also have to listen to data packets | ||
125 | |||
126 | if ( beacon->canIBSS() ) | 120 | if ( beacon->canIBSS() ) |
127 | type = "adhoc"; | 121 | type = "adhoc"; |
128 | else | 122 | else |
@@ -135,6 +129,60 @@ void Wellenreiter::receivePacket(OPacket* p) | |||
135 | 129 | ||
136 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); | 130 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); |
137 | netView()->addNewItem( type, essid, header->macAddress2().toString(), header->usesWep(), channel, 0 ); | 131 | netView()->addNewItem( type, essid, header->macAddress2().toString(), header->usesWep(), channel, 0 ); |
132 | return; | ||
133 | } | ||
134 | |||
135 | // check for a data frame | ||
136 | OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) ); | ||
137 | if ( data ) | ||
138 | { | ||
139 | OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" ); | ||
140 | if ( wlan->fromDS() && !wlan->toDS() ) | ||
141 | { | ||
142 | qDebug( "FromDS traffic: '%s' -> '%s' via '%s'", | ||
143 | (const char*) wlan->macAddress3().toString(true), | ||
144 | (const char*) wlan->macAddress1().toString(true), | ||
145 | (const char*) wlan->macAddress2().toString(true) ); | ||
146 | netView()->traffic( "fromDS", wlan->macAddress3().toString(), | ||
147 | wlan->macAddress1().toString(), | ||
148 | wlan->macAddress2().toString() ); | ||
149 | } | ||
150 | else | ||
151 | if ( !wlan->fromDS() && wlan->toDS() ) | ||
152 | { | ||
153 | qDebug( "ToDS traffic: '%s' -> '%s' via '%s'", | ||
154 | (const char*) wlan->macAddress2().toString(true), | ||
155 | (const char*) wlan->macAddress3().toString(true), | ||
156 | (const char*) wlan->macAddress1().toString(true) ); | ||
157 | netView()->traffic( "toDS", wlan->macAddress2().toString(), | ||
158 | wlan->macAddress3().toString(), | ||
159 | wlan->macAddress1().toString() ); | ||
160 | } | ||
161 | else | ||
162 | if ( wlan->fromDS() && wlan->toDS() ) | ||
163 | { | ||
164 | qDebug( "WSD(bridge) traffic: '%s' -> '%s' via '%s' and '%s'", | ||
165 | (const char*) wlan->macAddress4().toString(true), | ||
166 | (const char*) wlan->macAddress3().toString(true), | ||
167 | (const char*) wlan->macAddress1().toString(true), | ||
168 | (const char*) wlan->macAddress2().toString(true) ); | ||
169 | netView()->traffic( "WSD", wlan->macAddress4().toString(), | ||
170 | wlan->macAddress3().toString(), | ||
171 | wlan->macAddress1().toString(), | ||
172 | wlan->macAddress2().toString() ); | ||
173 | } | ||
174 | else | ||
175 | { | ||
176 | qDebug( "IBSS(AdHoc) traffic: '%s' -> '%s' (Cell: '%s')'", | ||
177 | (const char*) wlan->macAddress2().toString(true), | ||
178 | (const char*) wlan->macAddress1().toString(true), | ||
179 | (const char*) wlan->macAddress3().toString(true) ); | ||
180 | netView()->traffic( "fromDS", wlan->macAddress2().toString(), | ||
181 | wlan->macAddress1().toString(), | ||
182 | wlan->macAddress3().toString() ); | ||
183 | } | ||
184 | return; | ||
185 | } | ||
138 | } | 186 | } |
139 | 187 | ||
140 | void Wellenreiter::startStopClicked() | 188 | void Wellenreiter::startStopClicked() |