fix ARP decoding for wired networks. Interestingly, 802.11 encapsulates

these in IP packets, while wired ethernet just tags the type_of_protocol.

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
@@ -230,13 +230,13 @@ void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAd
     to = data->destinationAddress();
 
     netView()->addNewItem( "station", "<wired>", from, false, -1, 0, GpsLocation( 0, 0 ) );
 }
 
 
-void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, OMacAddress& dest )
+void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, OMacAddress& dest )
 {
     OARPPacket* arp = (OARPPacket*) p->child( "ARP" );
     if ( arp )
     {
         qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() );
         if ( arp->type() == "REQUEST" )
@@ -246,12 +246,18 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source,
         else if ( arp->type() == "REPLY" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
             netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() );
         }
     }
+}
+
+
+void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, OMacAddress& dest )
+{
+    //TODO: Implement more IP based protocols
 
     ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" );
     if ( dhcp )
     {
         qDebug( "Received DHCP '%s' packet", (const char*) dhcp->type() );
         if ( dhcp->type() == "OFFER" )
@@ -346,12 +352,20 @@ void Wellenreiter::receivePacket( OPacket* p )
     OEthernetPacket* eth = static_cast<OEthernetPacket*>( childIfToParse( p, "Ethernet" ) );
     if ( eth )
     {
         handleEthernetData( p, eth, source, dest );
     }
 
+    // check for an arp frame since arp frames come in two flavours:
+    // 802.11 encapsulates ARP data within IP packets while wired ethernet doesn't.
+    OARPPacket* arp = static_cast<OARPPacket*>( childIfToParse( p, "ARP" ) );
+    if ( arp )
+    {
+        handleARPData( p, arp, source, dest );
+    }
+
     // check for a ip frame
     OIPPacket* ip = static_cast<OIPPacket*>( childIfToParse( p, "IP" ) );
     if ( ip )
     {
         handleIPData( p, ip, source, dest );
     }
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
@@ -26,12 +26,13 @@ using namespace Opie;
 class QTimerEvent;
 class QPixmap;
 class OPacket;
 class OWaveLanManagementPacket;
 class OWaveLanDataPacket;
 class OEthernetPacket;
+class OARPPacket;
 class OMacAddress;
 class OIPPacket;
 class OPacketCapturer;
 class OWirelessNetworkInterface;
 class WellenreiterConfigWindow;
 class MLogWindow;
@@ -70,12 +71,13 @@ class Wellenreiter : public WellenreiterBase {
     void stoppedSniffing();
 
   private:
     void handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon );
     void handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to );
     void handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to );
+    void handleARPData( OPacket* p, OARPPacket* arp, OMacAddress& from, OMacAddress& to );
     void handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& from, OMacAddress& to );
     void handleNotification( OPacket* p );
     void doAction( const QString& action, const QString& protocol, OPacket* p );
     QObject* childIfToParse( OPacket* p, const QString& protocol );
     bool checkDumpPacket( OPacket* p );