1 files changed, 26 insertions, 12 deletions

diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index e9b3b2c..012c0a3 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -240,4 +240,4 @@ OIPPacket::OIPPacket( const unsigned char* end, const struct iphdr* data, QObjec
 

-    odebug << "FromAddress = " << fromIPAddress().toString();

-    odebug << "  toAddress = " << toIPAddress().toString();

+    odebug << "FromAddress = " << fromIPAddress().toString() << oendl;
+    odebug << "  toAddress = " << toIPAddress().toString() << oendl;
 

@@ -341,3 +341,3 @@ QString OARPPacket::type() const
         case 10: return "NAK";

-        default: qWarning( "OARPPacket::type(): invalid ARP type!" ); return "<unknown>";

+        default: owarn << "OARPPacket::type(): invalid ARP type!" << oendl; return "<unknown>";
     }

@@ -495,3 +495,3 @@ QString ODHCPPacket::type() const
         case 8: return "INFORM";

-        default: qWarning( "ODHCPPacket::type(): invalid DHCP type (%d) !", _dhcphdr->op ); return "<unknown>";

+        default: owarn << "ODHCPPacket::type(): invalid DHCP type " << _dhcphdr->op << oendl; return "<unknown>";
     }

@@ -767,5 +767,3 @@ QString OWaveLanManagementPacket::managementType() const
         case ST_DEAUTH: return "Deathentication"; break;

-        default:

-            qWarning( "OWaveLanManagementPacket::managementType(): unhandled subtype %d", FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) );

-            return "Unknown";

+        default: owarn << "OWaveLanManagementPacket::managementType(): unhandled subtype " << FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) << oendl; return "Unknown";
     }

@@ -1013,3 +1011,3 @@ OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* end, const st
     odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl;

-    //TODO: Implement this

+    odebug << "Detected subtype is " << controlType() << oendl;
 }

@@ -1022,2 +1020,19 @@ OWaveLanControlPacket::~OWaveLanControlPacket()
 

+QString OWaveLanControlPacket::controlType() const
+{
+    switch ( FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) )
+    {
+        case CTRL_PS_POLL: return "PowerSavePoll"; break;
+        case CTRL_RTS: return "RequestToSend"; break;
+        case CTRL_CTS: return "ClearToSend"; break;
+        case CTRL_ACK: return "Acknowledge"; break;
+        case CTRL_CF_END: return "ContentionFreeEnd"; break;
+        case CTRL_END_ACK: return "AcknowledgeEnd"; break;
+        default:
+            owarn << "OWaveLanControlPacket::managementType(): unhandled subtype " << FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) << oendl;
+            return "Unknown";
+    }
+}
+
+
 /*======================================================================================

@@ -1027,4 +1042,3 @@ OWaveLanControlPacket::~OWaveLanControlPacket()
 OPacketCapturer::OPacketCapturer( QObject* parent, const char* name )

-                 :QObject( parent, name ), _name( QString::null ), _open( false ),

-                 _pch( 0 ), _pcd( 0 ), _sn( 0 )

+                :QObject( parent, name ), _name( QString::null ), _open( false ), _pch( 0 ), _pcd( 0 ), _sn( 0 )
 {

@@ -1111,3 +1125,3 @@ void OPacketCapturer::dump( OPacket* p )
     {

-        qWarning( "OPacketCapturer::dump() - cannot dump without open capture file!" );

+        owarn << "OPacketCapturer::dump() - cannot dump without open capture file!" << oendl;
         return;

@@ -1170,3 +1184,3 @@ OPacket* OPacketCapturer::next()
     {

-        qWarning( "OPacketCapturer::next() - no packet received!" );

+        owarn << "OPacketCapturer::next() - no packet received!" << oendl;
         return 0;