author | mickeyl <mickeyl> | 2003-10-06 18:08:05 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-06 18:08:05 (UTC) |
commit | b8ac6724a0aaed78a1df712d87110fe39b16955f (patch) (unidiff) | |
tree | f8607b34284882bd4ce99281d0377f83b6b2c086 | |
parent | 42aefe8bc6a8089b771d6f109fed22a770295cc8 (diff) | |
download | opie-b8ac6724a0aaed78a1df712d87110fe39b16955f.zip opie-b8ac6724a0aaed78a1df712d87110fe39b16955f.tar.gz opie-b8ac6724a0aaed78a1df712d87110fe39b16955f.tar.bz2 |
fix ARP decoding for wired networks. Interestingly, 802.11 encapsulates
these in IP packets, while wired ethernet just tags the type_of_protocol.
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 16 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 9460f56..60bf231 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -224,40 +224,46 @@ void Wellenreiter::handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAdd | |||
224 | } | 224 | } |
225 | 225 | ||
226 | 226 | ||
227 | void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ) | 227 | void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ) |
228 | { | 228 | { |
229 | from = data->sourceAddress(); | 229 | from = data->sourceAddress(); |
230 | to = data->destinationAddress(); | 230 | to = data->destinationAddress(); |
231 | 231 | ||
232 | netView()->addNewItem( "station", "<wired>", from, false, -1, 0, GpsLocation( 0, 0 ) ); | 232 | netView()->addNewItem( "station", "<wired>", from, false, -1, 0, GpsLocation( 0, 0 ) ); |
233 | } | 233 | } |
234 | 234 | ||
235 | 235 | ||
236 | void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, OMacAddress& dest ) | 236 | void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, OMacAddress& dest ) |
237 | { | 237 | { |
238 | OARPPacket* arp = (OARPPacket*) p->child( "ARP" ); | 238 | OARPPacket* arp = (OARPPacket*) p->child( "ARP" ); |
239 | if ( arp ) | 239 | if ( arp ) |
240 | { | 240 | { |
241 | qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() ); | 241 | qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() ); |
242 | if ( arp->type() == "REQUEST" ) | 242 | if ( arp->type() == "REQUEST" ) |
243 | { | 243 | { |
244 | netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() ); | 244 | netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() ); |
245 | } | 245 | } |
246 | else if ( arp->type() == "REPLY" ) | 246 | else if ( arp->type() == "REPLY" ) |
247 | { | 247 | { |
248 | netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() ); | 248 | netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() ); |
249 | netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() ); | 249 | netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() ); |
250 | } | 250 | } |
251 | } | 251 | } |
252 | } | ||
253 | |||
254 | |||
255 | void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, OMacAddress& dest ) | ||
256 | { | ||
257 | //TODO: Implement more IP based protocols | ||
252 | 258 | ||
253 | ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" ); | 259 | ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" ); |
254 | if ( dhcp ) | 260 | if ( dhcp ) |
255 | { | 261 | { |
256 | qDebug( "Received DHCP '%s' packet", (const char*) dhcp->type() ); | 262 | qDebug( "Received DHCP '%s' packet", (const char*) dhcp->type() ); |
257 | if ( dhcp->type() == "OFFER" ) | 263 | if ( dhcp->type() == "OFFER" ) |
258 | { | 264 | { |
259 | qDebug( "DHCP: '%s' ('%s') seems to be a DHCP server.", (const char*) source.toString(), (const char*) dhcp->serverAddress().toString() ); | 265 | qDebug( "DHCP: '%s' ('%s') seems to be a DHCP server.", (const char*) source.toString(), (const char*) dhcp->serverAddress().toString() ); |
260 | netView()->identify( source, dhcp->serverAddress().toString() ); | 266 | netView()->identify( source, dhcp->serverAddress().toString() ); |
261 | netView()->addService( "DHCP", source, dhcp->serverAddress().toString() ); | 267 | netView()->addService( "DHCP", source, dhcp->serverAddress().toString() ); |
262 | } | 268 | } |
263 | else if ( dhcp->type() == "ACK" ) | 269 | else if ( dhcp->type() == "ACK" ) |
@@ -340,24 +346,32 @@ void Wellenreiter::receivePacket( OPacket* p ) | |||
340 | if ( wlan ) | 346 | if ( wlan ) |
341 | { | 347 | { |
342 | handleWlanData( p, wlan, source, dest ); | 348 | handleWlanData( p, wlan, source, dest ); |
343 | } | 349 | } |
344 | 350 | ||
345 | // check for a wired data frame | 351 | // check for a wired data frame |
346 | OEthernetPacket* eth = static_cast<OEthernetPacket*>( childIfToParse( p, "Ethernet" ) ); | 352 | OEthernetPacket* eth = static_cast<OEthernetPacket*>( childIfToParse( p, "Ethernet" ) ); |
347 | if ( eth ) | 353 | if ( eth ) |
348 | { | 354 | { |
349 | handleEthernetData( p, eth, source, dest ); | 355 | handleEthernetData( p, eth, source, dest ); |
350 | } | 356 | } |
351 | 357 | ||
358 | // check for an arp frame since arp frames come in two flavours: | ||
359 | // 802.11 encapsulates ARP data within IP packets while wired ethernet doesn't. | ||
360 | OARPPacket* arp = static_cast<OARPPacket*>( childIfToParse( p, "ARP" ) ); | ||
361 | if ( arp ) | ||
362 | { | ||
363 | handleARPData( p, arp, source, dest ); | ||
364 | } | ||
365 | |||
352 | // check for a ip frame | 366 | // check for a ip frame |
353 | OIPPacket* ip = static_cast<OIPPacket*>( childIfToParse( p, "IP" ) ); | 367 | OIPPacket* ip = static_cast<OIPPacket*>( childIfToParse( p, "IP" ) ); |
354 | if ( ip ) | 368 | if ( ip ) |
355 | { | 369 | { |
356 | handleIPData( p, ip, source, dest ); | 370 | handleIPData( p, ip, source, dest ); |
357 | } | 371 | } |
358 | 372 | ||
359 | //handleNotification( p ); | 373 | //handleNotification( p ); |
360 | 374 | ||
361 | } | 375 | } |
362 | 376 | ||
363 | 377 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index ed96375..25a5e8d 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -20,24 +20,25 @@ | |||
20 | 20 | ||
21 | #ifdef QWS | 21 | #ifdef QWS |
22 | #include <opie/odevice.h> | 22 | #include <opie/odevice.h> |
23 | using namespace Opie; | 23 | using namespace Opie; |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | class QTimerEvent; | 26 | class QTimerEvent; |
27 | class QPixmap; | 27 | class QPixmap; |
28 | class OPacket; | 28 | class OPacket; |
29 | class OWaveLanManagementPacket; | 29 | class OWaveLanManagementPacket; |
30 | class OWaveLanDataPacket; | 30 | class OWaveLanDataPacket; |
31 | class OEthernetPacket; | 31 | class OEthernetPacket; |
32 | class OARPPacket; | ||
32 | class OMacAddress; | 33 | class OMacAddress; |
33 | class OIPPacket; | 34 | class OIPPacket; |
34 | class OPacketCapturer; | 35 | class OPacketCapturer; |
35 | class OWirelessNetworkInterface; | 36 | class OWirelessNetworkInterface; |
36 | class WellenreiterConfigWindow; | 37 | class WellenreiterConfigWindow; |
37 | class MLogWindow; | 38 | class MLogWindow; |
38 | class MHexWindow; | 39 | class MHexWindow; |
39 | class GPS; | 40 | class GPS; |
40 | 41 | ||
41 | class Wellenreiter : public WellenreiterBase { | 42 | class Wellenreiter : public WellenreiterBase { |
42 | Q_OBJECT | 43 | Q_OBJECT |
43 | 44 | ||
@@ -64,24 +65,25 @@ class Wellenreiter : public WellenreiterBase { | |||
64 | void stopClicked(); | 65 | void stopClicked(); |
65 | 66 | ||
66 | void joinNetwork(const QString&,const QString&,int,const QString&); | 67 | void joinNetwork(const QString&,const QString&,int,const QString&); |
67 | 68 | ||
68 | signals: | 69 | signals: |
69 | void startedSniffing(); | 70 | void startedSniffing(); |
70 | void stoppedSniffing(); | 71 | void stoppedSniffing(); |
71 | 72 | ||
72 | private: | 73 | private: |
73 | void handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon ); | 74 | void handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon ); |
74 | void handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to ); | 75 | void handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to ); |
75 | void handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ); | 76 | void handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ); |
77 | void handleARPData( OPacket* p, OARPPacket* arp, OMacAddress& from, OMacAddress& to ); | ||
76 | void handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& from, OMacAddress& to ); | 78 | void handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& from, OMacAddress& to ); |
77 | void handleNotification( OPacket* p ); | 79 | void handleNotification( OPacket* p ); |
78 | void doAction( const QString& action, const QString& protocol, OPacket* p ); | 80 | void doAction( const QString& action, const QString& protocol, OPacket* p ); |
79 | QObject* childIfToParse( OPacket* p, const QString& protocol ); | 81 | QObject* childIfToParse( OPacket* p, const QString& protocol ); |
80 | bool checkDumpPacket( OPacket* p ); | 82 | bool checkDumpPacket( OPacket* p ); |
81 | 83 | ||
82 | private: | 84 | private: |
83 | #ifdef QWS | 85 | #ifdef QWS |
84 | OSystem _system; // Opie Operating System identifier | 86 | OSystem _system; // Opie Operating System identifier |
85 | #endif | 87 | #endif |
86 | 88 | ||
87 | OWirelessNetworkInterface* iface; | 89 | OWirelessNetworkInterface* iface; |