improve output of OPacket::dump()

1 files changed, 34 insertions, 8 deletions

diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 913d42e..6ddd457 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -27,139 +27,165 @@
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 /* OPIE */
 
 #include <opie2/opcap.h>
 
 /* QT */
 
 #include <qapplication.h> // don't use oapplication here (will decrease reusability in other projects)
 #include <qsocketnotifier.h>
 
 /*======================================================================================
  * OPacket
  *======================================================================================*/
 
 OPacket::OPacket( packetheaderstruct header, const unsigned char* data, QObject* parent )
         :QObject( parent, "Generic" ), _hdr( header ), _data( data )
 {
     qDebug( "OPacket::OPacket(): (Len %d, CapLen %d)" /*, ctime((const time_t*) header.ts.tv_sec)*/, header.len, header.caplen );
 
     _end = (unsigned char*) data + header.len;
     qDebug( "OPacket::data @ %0x, end @ %0x", data, _end );
 
     if ( packetCapturer()->dataLink() == DLT_EN10MB )
     {
         qDebug( "OPacket::OPacket(): Received Packet. Datalink = ETHERNET" );
         new OEthernetPacket( _end, (const struct ether_header*) data, this );
     }
     else
     {
         qDebug( "OPacket::OPacket(): Received Packet. Datalink = IEEE802.11" );
         new OWaveLanPacket( _end, (const struct ieee_802_11_header*) data, this );
     }
 }
 
 
 OPacket::~OPacket()
 {
 }
 
 
 OPacketCapturer* OPacket::packetCapturer() const
 {
     return parent()->inherits( "OPacketCapturer" ) ? static_cast<OPacketCapturer*>( parent() ) : 0;
 }
 
 
 timevalstruct OPacket::timeval() const
 {
     return _hdr.ts;
 }
 
 
 int OPacket::caplen() const
 {
     return _hdr.caplen;
 }
 
 
-void OPacket::dump() const
-{
-    printf( "OPacket::dump()\n" );
-    printf( "----------------\n" );
+QString OPacket::dump( int bpl ) const
+{
+    static int index = 0;
+    index++;
+    int len = _hdr.caplen;
+    QString str;
+    str.sprintf( "\n<----- Packet #%04d Len = 0x%X (%d) ----->\n\n", index, len, len );
+    str.append( "0000: " );
+    QString tmp;
+    QString bytes;
+    QString chars;
+
+    for ( int i = 0; i < len; ++i )
+    {
+        tmp.sprintf( "%02X ", _data[i] ); bytes.append( tmp );
+        if ( (_data[i] > 31) && (_data[i]<128) ) chars.append( _data[i] );
+        else chars.append( '.' );
+
+        if ( !((i+1) % bpl) )
+        {
+            str.append( bytes );
+            str.append( ' ' );
+            str.append( chars );
+            str.append( '\n' );
+            tmp.sprintf( "%04X: ", i+1 ); str.append( tmp );
+            bytes = "";
+            chars = "";
+        }
 
-    for ( int i = 0; i < _hdr.caplen; ++i )
+    }
+    if ( (len % bpl) )
     {
-        printf( "%02x ", _data[i] );
-        if ( !((i+1) % 32) ) printf( "\n" );
+        str.append( bytes.leftJustify( 1 + 3*bpl ) );
+        str.append( chars );
     }
-    printf( "\n\n" );
+    str.append( '\n' );
+    return str;
 }
 
 
 
 int OPacket::len() const
 {
     return _hdr.len;
 }
 
 /*======================================================================================
  * OEthernetPacket
  *======================================================================================*/
 
 OEthernetPacket::OEthernetPacket( const unsigned char* end, const struct ether_header* data, QObject* parent )
                 :QObject( parent, "Ethernet" ), _ether( data )
 
 {
 
     qDebug( "Source = %s", (const char*) sourceAddress().toString() );
     qDebug( "Destination = %s", (const char*) destinationAddress().toString() );
 
     if ( sourceAddress() == OMacAddress::broadcast )
         qDebug( "Source is broadcast address" );
     if ( destinationAddress() == OMacAddress::broadcast )
         qDebug( "Destination is broadcast address" );
 
     switch ( type() )
     {
         case ETHERTYPE_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break;
         case ETHERTYPE_ARP: { qDebug( "OPacket::OPacket(): Received Ethernet Packet : Type = ARP" ); break; }
         case ETHERTYPE_REVARP: { qDebug( "OPacket::OPacket(): Received Ethernet Packet : Type = RARP" ); break; }
         default: qDebug( "OPacket::OPacket(): Received Ethernet Packet : Type = UNKNOWN" );
     }
 
 }
 
 
 OEthernetPacket::~OEthernetPacket()
 {
 }
 
 
 OMacAddress OEthernetPacket::sourceAddress() const
 {
     return OMacAddress( _ether->ether_shost );
 }
 
 
 OMacAddress OEthernetPacket::destinationAddress() const
 {
     return OMacAddress( _ether->ether_dhost );
 }
 
 int OEthernetPacket::type() const
 {
     return ntohs( _ether->ether_type );
 }
 
 
 /*======================================================================================
  * OIPPacket
  *======================================================================================*/