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
@@ -152,205 +152,205 @@ struct myarphdr
 	{ 0,0,NULL}\
 }
 struct ieee_802_11_frame_subtype_class {
 	u_int8_t	subtype;
 	u_int8_t	mask;
 	u_int8_t	klass;
 	u_int8_t	type;
 };
 #define ieee_802_11_frame_subtype_classes {\
 	{ ieee_802_11_frame_subtype_Association_Req,	0xF,2,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Association_Resp,	0xF,2,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Reassociation_Req,	0xF,2,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Reassociation_Resp,	0xF,2,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Probe_Req	,	0xF,1,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Probe_Resp	,	0xF,1,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Beacon 	,	0xF,1,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_ATIM 	,	0xF,1,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Disassociation,	0xF,2,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Authentication,	0xF,1,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_Deauthentication,	0xF,3,ieee_802_11_frame_type_Management},\
 	{ ieee_802_11_frame_subtype_PS-Poll 	,	0xF,3,ieee_802_11_frame_type_Control},\
 	{ ieee_802_11_frame_subtype_RTS 	,	0xF,1,ieee_802_11_frame_type_Control},\
 	{ ieee_802_11_frame_subtype_CTS 	,	0xF,1,ieee_802_11_frame_type_Control},\
 	{ ieee_802_11_frame_subtype_ACK 	,	0xF,1,ieee_802_11_frame_type_Control},\
 	{ ieee_802_11_frame_subtype_CFEnd	,	0xF,1,ieee_802_11_frame_type_Control},\
 	{ ieee_802_11_frame_subtype_CFEnd_CFAck ,	0xF,1,ieee_802_11_frame_type_Control},\
 	{ ieee_802_11_frame_subtype_Data 	,	0xF,3,ieee_802_11_frame_type_Data},\
 	{ ieee_802_11_frame_subtype_Data_CFAck 	,	0xF,3,ieee_802_11_frame_type_Data},\
 	{ ieee_802_11_frame_subtype_Data_CF_Poll 	0xF,3,ieee_802_11_frame_type_Data},\
 	{ ieee_802_11_frame_subtype_Data_CF_AckCF_Poll,	0xF,3,ieee_802_11_frame_type_Data},\
 	{ ieee_802_11_frame_subtype_NullFunction 	0xF,1,ieee_802_11_frame_type_Data},\
 	{ ieee_802_11_frame_subtype_CF_Ack ,		0xF,1,ieee_802_11_frame_type_Data},\
 	{ ieee_802_11_frame_subtype_CF_Poll ,		0xF,1,ieee_802_11_frame_type_Data},\
 	{ ieee_802_11_frame_subtype_CF_AckCF_Poll,	0xF,1,ieee_802_11_frame_type_Data},\
 	{ 0,0,NULL}\
 }
 
 #define IEEE802_11_FC_LEN	2
 
 #define T_MGMT 0x0  /* management */
 #define T_CTRL 0x1  /* control */
 #define T_DATA 0x2 /* data */
 #define T_RESV 0x3  /* reserved */
 
 #define ST_ASSOC_REQUEST   	0x0
 #define ST_ASSOC_RESPONSE 	0x1
 #define ST_REASSOC_REQUEST   	0x2
 #define ST_REASSOC_RESPONSE  	0x3
 #define ST_PROBE_REQUEST   	0x4
 #define ST_PROBE_RESPONSE   	0x5
 /* RESERVED 			0x6  */
 /* RESERVED 			0x7  */
 #define ST_BEACON   		0x8
 #define ST_ATIM			0x9
 #define ST_DISASSOC		0xA
 #define ST_AUTH			0xB
 #define ST_DEAUTH		0xC
 /* RESERVED 			0xD  */
 /* RESERVED 			0xE  */
 /* RESERVED 			0xF  */
 
 
 #define CTRL_PS_POLL	0xA
 #define CTRL_RTS	0xB
 #define CTRL_CTS	0xC
 #define CTRL_ACK	0xD
 #define CTRL_CF_END	0xE
 #define CTRL_END_ACK	0xF
 
 /*
  * Bits in the frame control field.
  */
 #define FC_VERSION(fc)		((fc) & 0x3)
 #define FC_TYPE(fc)		(((fc) >> 2) & 0x3)
 #define FC_SUBTYPE(fc)		(((fc) >> 4) & 0xF)
 #define FC_TO_DS(fc)		((fc) & 0x0100)
 #define FC_FROM_DS(fc)		((fc) & 0x0200)
 #define FC_MORE_FLAG(fc)	((fc) & 0x0400)
 #define FC_RETRY(fc)		((fc) & 0x0800)
 #define FC_POWER_MGMT(fc)	((fc) & 0x1000)
 #define FC_MORE_DATA(fc)	((fc) & 0x2000)
 #define FC_WEP(fc)		((fc) & 0x4000)
 #define FC_ORDER(fc)		((fc) & 0x8000)
 
 
 struct ieee_802_11_mgmt_header {
   u_int16_t fc;
   u_int16_t duration;
   u_int8_t  da[6];
   u_int8_t  sa[6];
   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];
 //	u_int16_t	gapLen;
 //	u_int8_t	gap[8];
 };
 
 #define CAPABILITY_ESS(cap)     ((cap) & 0x0001)
 #define CAPABILITY_IBSS(cap)    ((cap) & 0x0002)
 #define CAPABILITY_CFP(cap)     ((cap) & 0x0004)
 #define CAPABILITY_CFP_REQ(cap) ((cap) & 0x0008)
 #define CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
 
 struct ssid_t {
   u_int8_t	element_id;
   u_int8_t	length;
   u_char		ssid[33];  /* 32 + 1 for null */
 };
 
 
 struct rates_t {
   u_int8_t	element_id;
   u_int8_t	length;
   u_int8_t	rate[8];
 };
 
 
 struct challenge_t {
   u_int8_t	element_id;
   u_int8_t	length;
   u_int8_t	text[254]; /* 1-253 + 1 for null */
 };
 
 
 struct fh_t {
   u_int8_t	element_id;
   u_int8_t	length;
   u_int16_t	dwell_time;
   u_int8_t	hop_set;
   u_int8_t 	hop_pattern;
   u_int8_t	hop_index;
 };
 
 
 struct ds_t {
   u_int8_t	element_id;
   u_int8_t	length;
   u_int8_t	channel;
 };
 
 
 struct cf_t {
   u_int8_t	element_id;
   u_int8_t	length;
   u_int8_t	count;
   u_int8_t	period;
   u_int16_t	max_duration;
   u_int16_t	dur_remaing;
 };
 
 
 struct tim_t {
   u_int8_t	element_id;
   u_int8_t	length;
   u_int8_t	count;
   u_int8_t	period;
   u_int8_t	bitmap_control;
   u_int8_t	bitmap[251];
 };
 
 
 struct ibss_t {
   u_int8_t	element_id;
   u_int8_t	length;
   u_int16_t	atim_window;
 };
 
 
 #define E_SSID      0
 #define E_RATES     1
 #define E_FH        2
 #define E_DS        3
 #define E_CF        4
 #define E_TIM       5
 #define E_IBSS      6
 #define E_CHALLENGE 16
 #define E_CISCO     133
 
 
 struct ieee_802_11_mgmt_body {
   u_int8_t  timestamp[8];
   u_int16_t beacon_interval;
 //  u_int16_t 	listen_interval;
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
@@ -145,448 +145,448 @@ QString OPacket::dump( int bpl ) const
     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 = "";

         }

 

     }

     if ( (len % bpl) )

     {

         str.append( bytes.leftJustify( 1 + 3*bpl ) );

         str.append( chars );

     }

     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 )

 {

 

     odebug << "Source = " << sourceAddress().toString();

     odebug << "Destination = " << destinationAddress().toString();

 

     if ( sourceAddress() == OMacAddress::broadcast )

         odebug << "Source is broadcast address" << oendl;

     if ( destinationAddress() == OMacAddress::broadcast )

         odebug << "Destination is broadcast address" << oendl;

 

     switch ( type() )

     {

         case ETHERTYPE_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break;

         case ETHERTYPE_ARP: new OARPPacket( end, (const struct myarphdr*) (data+1), this ); break;

         case ETHERTYPE_REVARP: { odebug << "OPacket::OPacket(): Received Ethernet Packet : Type = RARP" << oendl; break; }

         default: odebug << "OPacket::OPacket(): Received Ethernet Packet : Type = UNKNOWN" << oendl;

     }

 

 }

 

 

 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

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

 

 

 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;

     }

 

 }

 

 OIPPacket::~OIPPacket()

 {

 }

 

 

 QHostAddress OIPPacket::fromIPAddress() const

 {

     return EXTRACT_32BITS( &_iphdr->saddr );

 }

 

 

 QHostAddress OIPPacket::toIPAddress() const

 {

     return EXTRACT_32BITS( &_iphdr->saddr );

 }

 

 

 int OIPPacket::tos() const

 {

     return _iphdr->tos;

 }

 

 

 int OIPPacket::len() const

 {

     return EXTRACT_16BITS( &_iphdr->tot_len );

 }

 

 

 int OIPPacket::id() const

 {

     return EXTRACT_16BITS( &_iphdr->id );

 }

 

 

 int OIPPacket::offset() const

 {

     return EXTRACT_16BITS( &_iphdr->frag_off );

 }

 

 

 int OIPPacket::ttl() const

 {

     return _iphdr->ttl;

 }

 

 

 int OIPPacket::protocol() const

 {

     return _iphdr->protocol;

 }

 

 

 int OIPPacket::checksum() const

 {

     return EXTRACT_16BITS( &_iphdr->check );

 }

 

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

  * OARPPacket

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

 

 

 OARPPacket::OARPPacket( const unsigned char* end, const struct myarphdr* data, QObject* parent )

            :QObject( parent, "ARP" ), _arphdr( data )

 {

     odebug << "OARPPacket::OARPPacket(): decoding ARP header..." << oendl;

     odebug << "ARP type seems to be " << EXTRACT_16BITS( &_arphdr->ar_op ) << " = " << type() << oendl;

     odebug << "Sender: MAC " << senderMacAddress().toString() << " = IP " << senderIPV4Address().toString() << oendl;

     odebug << "Target: MAC " << targetMacAddress().toString() << " = IP " << targetIPV4Address().toString() << oendl;

 }

 

 

 OARPPacket::~OARPPacket()

 {

 }

 

 

 QString OARPPacket::type() const

 {

     switch ( EXTRACT_16BITS( &_arphdr->ar_op ) )

     {

         case 1: return "REQUEST";

         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

 {

     return EXTRACT_32BITS( &_arphdr->ar_sip );

 }

 

 

 QHostAddress OARPPacket::targetIPV4Address() const

 {

     return EXTRACT_32BITS( &_arphdr->ar_tip );

 }

 

 

 OMacAddress OARPPacket::senderMacAddress() const

 {

     return OMacAddress( _arphdr->ar_sha );

 }

 

 

 OMacAddress OARPPacket::targetMacAddress() const

 {

     return OMacAddress( _arphdr->ar_tha );

 }

 

 

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

  * OUDPPacket

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

 

 

 OUDPPacket::OUDPPacket( const unsigned char* end, const struct udphdr* data, QObject* parent )

            :QObject( parent, "UDP" ), _udphdr( data )

 

 {

     odebug << "OUDPPacket::OUDPPacket(): decoding UDP header..." << oendl;

     odebug << "fromPort = " << fromPort() << oendl;

     odebug << "  toPort = " << toPort() << oendl;

 

     // TODO: Make this a case or a hash if we know more udp protocols

 

     if ( fromPort() == UDP_PORT_BOOTPS || fromPort() == UDP_PORT_BOOTPC ||

          toPort() == UDP_PORT_BOOTPS || toPort() == UDP_PORT_BOOTPC )

     {

         odebug << "seems to be part of a DHCP conversation => creating DHCP packet." << oendl;

         new ODHCPPacket( end, (const struct dhcp_packet*) (data+1), this );

     }

 }

 

 

 OUDPPacket::~OUDPPacket()

 {

 }

 

 

 int OUDPPacket::fromPort() const

 {

     return EXTRACT_16BITS( &_udphdr->source );

 }

 

 

 int OUDPPacket::toPort() const

 {

     return EXTRACT_16BITS( &_udphdr->dest );

 }

 

 

 int OUDPPacket::length() const

 {

     return EXTRACT_16BITS( &_udphdr->len );

 }

 

 

 int OUDPPacket::checksum() const

 {

     return EXTRACT_16BITS( &_udphdr->check );

 }

 

 

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

  * ODHCPPacket

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

 

 

 ODHCPPacket::ODHCPPacket( const unsigned char* end, const struct dhcp_packet* data, QObject* parent )

            :QObject( parent, "DHCP" ), _dhcphdr( data )

 

 {

     odebug << "ODHCPPacket::ODHCPPacket(): decoding DHCP information..." << oendl;

     odebug << "DHCP opcode seems to be " << _dhcphdr->op << ": " << ( isRequest() ? "REQUEST" : "REPLY" ) << oendl;

     odebug << "clientAddress = " << clientAddress().toString() << oendl;

     odebug << "  yourAddress = " << yourAddress().toString() << oendl;

     odebug << "serverAddress = " << serverAddress().toString() << oendl;

     odebug << " relayAddress = " << relayAddress().toString() << oendl;

     odebug << "parsing DHCP options..." << oendl;

 

     _type = 0;

 

     const unsigned char* option = &_dhcphdr->options[4];

     char tag = -1;

     char len = -1;

 

     while ( ( tag = *option++ ) != -1 /* end of option field */ )

     {

         len = *option++;

         odebug << "recognized DHCP option #" << tag << ", length " << len << oendl;

 

         if ( tag == DHO_DHCP_MESSAGE_TYPE )

             _type = *option;

 

         option += len;

         if ( option >= end )

         {

             owarn << "DHCP parsing ERROR: sanity check says the packet is at its end!" << oendl;

             break;

         }

     }

 

     odebug << "DHCP type seems to be << " << type() << oendl;

 }

 

 

 ODHCPPacket::~ODHCPPacket()

 {

 }

 

 

 bool ODHCPPacket::isRequest() const

 {

     return ( _dhcphdr->op == 01 );

 }

 

 

 bool ODHCPPacket::isReply() const

 {

     return ( _dhcphdr->op == 02 );

 }

 

 

 QString ODHCPPacket::type() const

 {

     switch ( _type )

     {

         case 1: return "DISCOVER";

         case 2: return "OFFER";

         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

 {

     return EXTRACT_32BITS( &_dhcphdr->ciaddr );

 }

 

 

 QHostAddress ODHCPPacket::yourAddress() const

 {

     return EXTRACT_32BITS( &_dhcphdr->yiaddr );

 }

 

 

 QHostAddress ODHCPPacket::serverAddress() const

 {

     return EXTRACT_32BITS( &_dhcphdr->siaddr );

 }

 

 

 QHostAddress ODHCPPacket::relayAddress() const

 {

     return EXTRACT_32BITS( &_dhcphdr->giaddr );

 }

 

 

 OMacAddress ODHCPPacket::clientMacAddress() const

 {

     return OMacAddress( _dhcphdr->chaddr );

 }

 

 

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

  * OTCPPacket

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

 

 

 OTCPPacket::OTCPPacket( const unsigned char* end, const struct tcphdr* data, QObject* parent )

            :QObject( parent, "TCP" ), _tcphdr( data )

 

 {

     odebug << "OTCPPacket::OTCPPacket(): decoding TCP header..." << oendl;

 }

 

 

 OTCPPacket::~OTCPPacket()

 {

 }

 

 

 int OTCPPacket::fromPort() const

 {

     return EXTRACT_16BITS( &_tcphdr->source );

 }

 

 

 int OTCPPacket::toPort() const

 {

     return EXTRACT_16BITS( &_tcphdr->dest );

 }

 

 

 int OTCPPacket::seq() const

 {

     return EXTRACT_16BITS( &_tcphdr->seq );

 }

 

 

 int OTCPPacket::ack() const

 {

     return EXTRACT_16BITS( &_tcphdr->ack_seq );

 }

 

 

 int OTCPPacket::window() const

 {

     return EXTRACT_16BITS( &_tcphdr->window );

 }

 

 

 int OTCPPacket::checksum() const

 {

     return EXTRACT_16BITS( &_tcphdr->check );

 }

 

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

  * OPrismHeaderPacket

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

 

 

 OPrismHeaderPacket::OPrismHeaderPacket( const unsigned char* end, const struct prism_hdr* data, QObject* parent )

                 :QObject( parent, "Prism" ), _header( data )

 

 {

@@ -672,195 +672,193 @@ OMacAddress OWaveLanPacket::macAddress4() const
 

 

 int OWaveLanPacket::subType() const

 {

     return FC_SUBTYPE( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) );

 }

 

 

 int OWaveLanPacket::type() const

 {

     return FC_TYPE( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) );

 }

 

 

 int OWaveLanPacket::version() const

 {

     return FC_VERSION( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) );

 }

 

 

 bool OWaveLanPacket::fromDS() const

 {

     return FC_FROM_DS( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) );

 }

 

 

 bool OWaveLanPacket::toDS() const

 {

     return FC_TO_DS( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) );

 }

 

 

 bool OWaveLanPacket::usesPowerManagement() const

 {

     return FC_POWER_MGMT( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) );

 }

 

 

 bool OWaveLanPacket::usesWep() const

 {

     return FC_WEP( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) );

 }

 

 

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

  * OWaveLanManagementPacket

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

 

 OWaveLanManagementPacket::OWaveLanManagementPacket( const unsigned char* end, const struct ieee_802_11_mgmt_header* data, OWaveLanPacket* parent )

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

                 _body( (const struct ieee_802_11_mgmt_body*) (data+1) )

 {

     odebug << "OWaveLanManagementPacket::OWaveLanManagementPacket(): decoding frame..." << oendl;

     odebug << "Detected subtype is " << managementType() << oendl;

 

     // grab tagged values

     const unsigned char* ptr = (const unsigned char*) (_body+1);

     while (ptr < end)

     {

         switch ( *ptr )

         {

             case E_SSID: new OWaveLanManagementSSID( end, (struct ssid_t*) ptr, this ); break;

             case E_FH: new OWaveLanManagementFH( end, (struct fh_t*) ptr, this ); break;

             case E_DS: new OWaveLanManagementDS( end, (struct ds_t*) ptr, this ); break;

             case E_RATES: new OWaveLanManagementRates( end, (struct rates_t*) ptr, this ); break;

             case E_CF: new OWaveLanManagementCF( end, (struct cf_t*) ptr, this ); break;

             case E_TIM: new OWaveLanManagementTim( end, (struct tim_t*) ptr, this ); break;

             case E_IBSS: new OWaveLanManagementIBSS( end, (struct ibss_t*) ptr, this ); break;

             case E_CHALLENGE: new OWaveLanManagementChallenge( end, (struct challenge_t*) ptr, this ); break;

         }

         ptr+= ( ( struct ssid_t* ) ptr )->length; // skip length of tagged value

         ptr+= 2; // skip tag ID and length

     }

 }

 

 

 OWaveLanManagementPacket::~OWaveLanManagementPacket()

 {

 }

 

 

 QString OWaveLanManagementPacket::managementType() const

 {

     switch ( FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) )

     {

         case ST_ASSOC_REQUEST: return "AssociationRequest"; break;

         case ST_ASSOC_RESPONSE: return "AssociationResponse"; break;

         case ST_REASSOC_REQUEST: return "ReassociationRequest"; break;

         case ST_REASSOC_RESPONSE: return "ReassociationResponse"; break;

         case ST_PROBE_REQUEST: return "ProbeRequest"; break;

         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

 {

     return EXTRACT_LE_16BITS( &_body->beacon_interval );

 }

 

 

 int OWaveLanManagementPacket::capabilities() const

 {

     return EXTRACT_LE_16BITS( &_body->capability_info );

 }

 

 

 bool OWaveLanManagementPacket::canESS() const

 {

     return CAPABILITY_ESS( EXTRACT_LE_16BITS( &_body->capability_info ) );

 }

 

 

 bool OWaveLanManagementPacket::canIBSS() const

 {

     return CAPABILITY_IBSS( EXTRACT_LE_16BITS( &_body->capability_info ) );

 }

 

 

 bool OWaveLanManagementPacket::canCFP() const

 {

     return CAPABILITY_CFP( EXTRACT_LE_16BITS( &_body->capability_info ) );

 }

 

 

 bool OWaveLanManagementPacket::canCFP_REQ() const

 {

     return CAPABILITY_CFP_REQ( EXTRACT_LE_16BITS( &_body->capability_info ) );

 }

 

 

 bool OWaveLanManagementPacket::canPrivacy() const

 {

     return CAPABILITY_PRIVACY( EXTRACT_LE_16BITS( &_body->capability_info ) );

 }

 

 

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

  * OWaveLanManagementSSID

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

 

 OWaveLanManagementSSID::OWaveLanManagementSSID( const unsigned char* end, const struct ssid_t* data, QObject* parent )

                 :QObject( parent, "802.11 SSID" ), _data( data )

 {

     odebug << "OWaveLanManagementSSID()" << oendl;

 }

 

 

 OWaveLanManagementSSID::~OWaveLanManagementSSID()

 {

 }

 

 

 QString OWaveLanManagementSSID::ID() const

 {

     int length = _data->length;

     if ( length > 32 ) length = 32;

     char essid[length+1];

     memcpy( &essid, &_data->ssid, length );

     essid[length] = 0x0;

     return essid;

 }

 

 

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

  * OWaveLanManagementRates

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

 

 OWaveLanManagementRates::OWaveLanManagementRates( const unsigned char* end, const struct rates_t* data, QObject* parent )

                 :QObject( parent, "802.11 Rates" ), _data( data )

 {

     odebug << "OWaveLanManagementRates()" << oendl;

 }

 

 

 OWaveLanManagementRates::~OWaveLanManagementRates()

 {

 }

 

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

  * OWaveLanManagementCF

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

 

 OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* end, const struct cf_t* data, QObject* parent )

                 :QObject( parent, "802.11 CF" ), _data( data )

 {

     odebug << "OWaveLanManagementCF()" << oendl;

@@ -918,350 +916,366 @@ OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* end, const st
 }

 

 

 OWaveLanManagementTim::~OWaveLanManagementTim()

 {

 }

 

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

  * OWaveLanManagementIBSS

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

 

 OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* end, const struct ibss_t* data, QObject* parent )

                 :QObject( parent, "802.11 IBSS" ), _data( data )

 {

     odebug << "OWaveLanManagementIBSS()" << oendl;

 }

 

 

 OWaveLanManagementIBSS::~OWaveLanManagementIBSS()

 {

 }

 

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

  * OWaveLanManagementChallenge

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

 

 OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* end, const struct challenge_t* data, QObject* parent )

                 :QObject( parent, "802.11 Challenge" ), _data( data )

 {

     odebug << "OWaveLanManagementChallenge()" << oendl;

 }

 

 

 OWaveLanManagementChallenge::~OWaveLanManagementChallenge()

 {

 }

 

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

  * OWaveLanDataPacket

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

 

 OWaveLanDataPacket::OWaveLanDataPacket( const unsigned char* end, const struct ieee_802_11_data_header* data, OWaveLanPacket* parent )

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

 {

     odebug << "OWaveLanDataPacket::OWaveLanDataPacket(): decoding frame..." << oendl;

 

     const unsigned char* payload = (const unsigned char*) data + sizeof( struct ieee_802_11_data_header );

 

     #warning The next line works for most cases, but can not be correct generally!

     if (!( ( (OWaveLanPacket*) this->parent())->duration() )) payload -= 6; // compensation for missing last address

 

     new OLLCPacket( end, (const struct ieee_802_11_802_2_header*) payload, this );

 }

 

 

 OWaveLanDataPacket::~OWaveLanDataPacket()

 {

 }

 

 

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

  * OLLCPacket

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

 

 OLLCPacket::OLLCPacket( const unsigned char* end, const struct ieee_802_11_802_2_header* data, QObject* parent )

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

 {

     odebug << "OLLCPacket::OLLCPacket(): decoding frame..." << oendl;

 

     if ( !(_header->oui[0] || _header->oui[1] || _header->oui[2]) )

     {

         owarn << "OLLCPacket::OLLCPacket(): contains an encapsulated Ethernet frame (type = " << EXTRACT_16BITS( &_header->type ) << ")" << oendl;

 

         switch ( EXTRACT_16BITS( &_header->type ) ) // defined in linux/if_ether.h

         {

             case ETH_P_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break;

             case ETH_P_ARP: new OARPPacket( end, (const struct myarphdr*) (data+1), this ); break;

             default: owarn << "OLLCPacket::OLLCPacket(): Unknown Encapsulation type = " << EXTRACT_16BITS( &_header->type ) << oendl;

         }

     }

 }

 

 

 OLLCPacket::~OLLCPacket()

 {

 }

 

 

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

  * OWaveLanControlPacket

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

 

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

 {

     if ( _open )

     {

         odebug << "OPacketCapturer::~OPacketCapturer(): pcap still open, autoclosing." << oendl;

         close();

     }

 }

 

 

 void OPacketCapturer::setBlocking( bool b )

 {

     if ( pcap_setnonblock( _pch, 1-b, _errbuf ) != -1 )

     {

         odebug << "OPacketCapturer::setBlocking(): blocking mode changed successfully." << oendl;

     }

     else

     {

         odebug << "OPacketCapturer::setBlocking(): can't change blocking mode: " << _errbuf << oendl;

     }

 }

 

 

 bool OPacketCapturer::blocking() const

 {

     int b = pcap_getnonblock( _pch, _errbuf );

     if ( b == -1 )

     {

         odebug << "OPacketCapturer::blocking(): can't get blocking mode: " << _errbuf << oendl;

         return -1;

     }

     return !b;

 }

 

 

 void OPacketCapturer::closeDumpFile()

 {

     if ( _pcd )

     {

         pcap_dump_close( _pcd );

         _pcd = 0;

     }

     pcap_close( _pch );

 }

 

 

 void OPacketCapturer::close()

 {

     if ( _open )

     {

         if ( _sn )

         {

             _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );

             delete _sn;

         }

         closeDumpFile();

     _open = false;

     }

 

     odebug << "OPacketCapturer::close() --- dumping capturing statistics..." << oendl;

     odebug << "--------------------------------------------------" << oendl;

     for( QMap<QString,int>::Iterator it = _stats.begin(); it != _stats.end(); ++it )

         odebug << it.key() << " = " << it.data() << oendl;

     odebug << "--------------------------------------------------" << oendl;

 

 }

 

 

 int OPacketCapturer::dataLink() const

 {

     return pcap_datalink( _pch );

 }

 

 

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

 }

 

 

 int OPacketCapturer::fileno() const

 {

     if ( _open )

     {

         return pcap_fileno( _pch );

     }

     else

     {

         return -1;

     }

 }

 

 

 OPacket* OPacketCapturer::next( int time )

 {

     fd_set fds;

     struct timeval tv;

     FD_ZERO( &fds );

     FD_SET( pcap_fileno( _pch ), &fds );

     tv.tv_sec = time / 1000;

     tv.tv_usec = time % 1000;

     int retval = select( pcap_fileno( _pch )+1, &fds, NULL, NULL, &tv);

     if ( retval > 0 ) // clear to read!

         return next();

     else

         return 0;

 }

 

 

 OPacket* OPacketCapturer::next()

 {

     packetheaderstruct header;

     odebug << "==> OPacketCapturer::next()" << oendl;

     const unsigned char* pdata = pcap_next( _pch, &header );

     odebug << "<== OPacketCapturer::next()" << oendl;

 

     if ( pdata && header.len )

     {

         OPacket* p = new OPacket( dataLink(), header, pdata, 0 );

         // packets shouldn't be inserted in the QObject child-parent hierarchy,

         // because due to memory constraints they will be deleted as soon

         // as possible - that is right after they have been processed

         // by emit() [ see below ]

         //TODO: make gathering statistics optional, because it takes time

         p->updateStats( _stats, const_cast<QObjectList*>( p->children() ) );

         #ifndef NODEBUG

         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 )

 {

     if ( _open )

     {

         if ( name == _name )    // ignore opening an already openend device

         {

             return true;

         }

         else                    // close the last opened device

         {

             close();

         }

     }

 

     _name = name;

 

     // open libpcap

     pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] );

 

     if ( !handle )

     {

         owarn << "OPacketCapturer::open(): can't open libpcap with '" << name << "': " << _errbuf << oendl;

         return false;

     }

 

     odebug << "OPacketCapturer::open(): libpcap [" << name << "] opened successfully." << oendl;

     _pch = handle;

     _open = true;

     _stats.clear();

 

     // in case we have an application object, create a socket notifier

     if ( qApp ) //TODO: I don't like this here...

     {

         _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read );

         connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );

     }

 

     return true;

 }

 

 

 bool OPacketCapturer::openDumpFile( const QString& filename )

 {

     pcap_dumper_t* dump = pcap_dump_open( _pch, const_cast<char*>( (const char*) filename ) );

     if ( !dump )

     {

         owarn << "OPacketCapturer::open(): can't open dump with '" << filename << "': " << _errbuf << oendl;

         return false;

     }

     odebug << "OPacketCapturer::open(): dump [" << filename << "] opened successfully." << oendl;

     _pcd = dump;

 

     return true;

 }

 

 

 bool OPacketCapturer::open( const QFile& file )

 {

     QString name = file.name();

 

     if ( _open )

     {

         close();

         if ( name == _name )    // ignore opening an already openend device

         {

             return true;

         }

         else                    // close the last opened device

         {

             close();

         }

     }

 

     _name = name;

 

     pcap_t* handle = pcap_open_offline( const_cast<char*>( (const char*) name ), &_errbuf[0] );

 

     if ( handle )

     {

         odebug << "OPacketCapturer::open(): libpcap opened successfully." << oendl;

         _pch = handle;

         _open = true;

 

         // in case we have an application object, create a socket notifier

         if ( qApp )

         {

             _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read );

             connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );

         }

 

         return true;

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
@@ -304,192 +304,194 @@ class OWaveLanManagementFH : public QObject
 };
 
 /*======================================================================================
  * OWaveLanManagementDS
  *======================================================================================*/
 
 class OWaveLanManagementDS : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementDS( const unsigned char*, const struct ds_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementDS();
 
     int channel() const;
 
   private:
     const struct ds_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementTim
  *======================================================================================*/
 
 class OWaveLanManagementTim : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementTim( const unsigned char*, const struct tim_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementTim();
 
   private:
     const struct tim_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementIBSS
  *======================================================================================*/
 
 class OWaveLanManagementIBSS : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementIBSS( const unsigned char*, const struct ibss_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementIBSS();
 
   private:
     const struct ibss_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementChallenge
  *======================================================================================*/
 
 class OWaveLanManagementChallenge : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementChallenge( const unsigned char*, const struct challenge_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementChallenge();
 
   private:
     const struct challenge_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanDataPacket - type: data (T_DATA)
  *======================================================================================*/
 
 class OWaveLanDataPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanDataPacket( const unsigned char*, const struct ieee_802_11_data_header*, OWaveLanPacket* parent = 0 );
     virtual ~OWaveLanDataPacket();
 
   private:
     const struct ieee_802_11_data_header* _header;
 };
 
 /*======================================================================================
  * OWaveLanControlPacket - type: control (T_CTRL)
  *======================================================================================*/
 
 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
  *======================================================================================*/
 
 class OLLCPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OLLCPacket( const unsigned char*, const struct ieee_802_11_802_2_header* data, QObject* parent = 0 );
     virtual ~OLLCPacket();
 
   private:
     const struct ieee_802_11_802_2_header* _header;
 };
 
 /*======================================================================================
  * OIPPacket
  *======================================================================================*/
 
 class OIPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OIPPacket( const unsigned char*, const struct iphdr*, QObject* parent = 0 );
     virtual ~OIPPacket();
 
     QHostAddress fromIPAddress() const;
     QHostAddress toIPAddress() const;
 
     int tos() const;
     int len() const;
     int id() const;
     int offset() const;
     int ttl() const;
     int protocol() const;
     int checksum() const;
 
   private:
     const struct iphdr* _iphdr;
 };
 
 /*======================================================================================
  * OARPPacket
  *======================================================================================*/
 
 class OARPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OARPPacket( const unsigned char*, const struct myarphdr*, QObject* parent = 0 );
     virtual ~OARPPacket();
 
     QHostAddress senderIPV4Address() const;
     OMacAddress senderMacAddress() const;
     QHostAddress targetIPV4Address() const;
     OMacAddress targetMacAddress() const;
 
     //int type() const;
     QString type() const;
 
   private:
     const struct myarphdr* _arphdr;
 };
 
 /*======================================================================================
  * OUDPPacket
  *======================================================================================*/
 
 class OUDPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OUDPPacket( const unsigned char*, const struct udphdr*, QObject* parent = 0 );
     virtual ~OUDPPacket();
 
     int fromPort() const;
     int toPort() const;
     int length() const;
     int checksum() const;
 
   private:
     const struct udphdr* _udphdr;
 };
 
 /*======================================================================================
  * ODHCPPacket
  *======================================================================================*/