start parsing 802.11 control frames

3 files changed, 30 insertions, 14 deletions

diff --git a/libopie2/opienet/802_11_user.h b/libopie2/opienet/802_11_user.h
index ad84514..7ae27c5 100644
--- a/libopie2/opienet/802_11_user.h
+++ b/libopie2/opienet/802_11_user.h
@@ -242,25 +242,25 @@ struct ieee_802_11_mgmt_header {
   u_int8_t  bssid[6];
   u_int16_t seq_ctrl;
 };
 
 
 struct ieee_802_11_data_header {
-	u_int16_t	frame_control;
+	u_int16_t	fc;
 	u_int16_t	duration;
 	u_int8_t	mac1[6];
 	u_int8_t	mac2[6];
 	u_int8_t	mac3[6];
 	u_int16_t	SeqCtl;
 	u_int8_t	mac4[6];
 //	u_int16_t	gapLen;
 //	u_int8_t	gap[8];
 };
 
 struct ieee_802_11_control_header {
-	u_int16_t	frame_control;
+	u_int16_t	fc;
 	u_int16_t	duration;
 	u_int8_t	mac1[6];
 	u_int8_t	mac2[6];
 	u_int8_t	mac3[6];
 	u_int16_t	SeqCtl;
 	u_int8_t	mac4[6];
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
@@ -235,14 +235,14 @@ int OEthernetPacket::type() const
 

 OIPPacket::OIPPacket( const unsigned char* end, const struct iphdr* data, QObject* parent )

           :QObject( parent, "IP" ), _iphdr( data )

 {

     odebug << "OIPPacket::OIPPacket(): decoding IP header..." << oendl;

 

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

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

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

     switch ( protocol() )

     {

         case IPPROTO_UDP: new OUDPPacket( end, (const struct udphdr*) (data+1), this ); break;

         case IPPROTO_TCP: new OTCPPacket( end, (const struct tcphdr*) (data+1), this ); break;

         default: odebug << "OIPPacket::OIPPacket(): unknown IP protocol, type = " << protocol() << oendl;

@@ -336,13 +336,13 @@ QString OARPPacket::type() const
         case 2: return "REPLY";

         case 3: return "RREQUEST";

         case 4: return "RREPLY";

         case 8: return "InREQUEST";

         case 9: return "InREPLY";

         case 10: return "NAK";

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

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

 }

 

 

 QHostAddress OARPPacket::senderIPV4Address() const

 {

@@ -490,13 +490,13 @@ QString ODHCPPacket::type() const
         case 3: return "REQUEST";

         case 4: return "DECLINE";

         case 5: return "ACK";

         case 6: return "NAK";

         case 7: return "RELEASE";

         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>";
     }

 }

 

 

 QHostAddress ODHCPPacket::clientAddress() const

 {

@@ -762,15 +762,13 @@ QString OWaveLanManagementPacket::managementType() const
         case ST_PROBE_RESPONSE: return "ProbeResponse"; break;

         case ST_BEACON: return "Beacon"; break;

         case ST_ATIM: return "Atim"; break;

         case ST_DISASSOC: return "Disassociation"; break;

         case ST_AUTH: return "Authentication"; break;

         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";
     }

 }

 

 

 int OWaveLanManagementPacket::beaconInterval() const

 {

@@ -1008,28 +1006,44 @@ OLLCPacket::~OLLCPacket()
  *======================================================================================*/

 

 OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* end, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent )

                 :QObject( parent, "802.11 Control" ), _header( data )

 {

     odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl;

-    //TODO: Implement this

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

 

 

 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";
+    }
+}
+
+
 /*======================================================================================

  * OPacketCapturer

  *======================================================================================*/

 

 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 )
 {

 }

 

 

 OPacketCapturer::~OPacketCapturer()

 {

@@ -1106,13 +1120,13 @@ int OPacketCapturer::dataLink() const
 

 

 void OPacketCapturer::dump( OPacket* p )

 {

     if ( !_pcd )

     {

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

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

     }

     pcap_dump( (u_char*) _pcd, &p->_hdr, p->_data );

 }

 

 

@@ -1165,13 +1179,13 @@ OPacket* OPacketCapturer::next()
         p->dumpStructure( const_cast<QObjectList*>( p->children() ) );

         #endif

         return p;

     }

     else

     {

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

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

     }

 }

 

 

 bool OPacketCapturer::open( const QString& name )

diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index 497fd6b..b373c56 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -394,12 +394,14 @@ class OWaveLanControlPacket : public QObject
   Q_OBJECT
 
   public:
     OWaveLanControlPacket( const unsigned char*, const struct ieee_802_11_control_header*, OWaveLanPacket* parent = 0 );
     virtual ~OWaveLanControlPacket();
 
+    QString controlType() const;
+
   private:
     const struct ieee_802_11_control_header* _header;
 };
 
 /*======================================================================================
  * OLLCPacket - IEEE 802.2 Link Level Control