From 99899abc80a8aa05044eeecd8a061b0a8efaa713 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sun, 30 Mar 2003 01:41:56 +0000 Subject: - add classes for 802.11 tagged values - adjust miniwellenreiter accordingly --- (limited to 'libopie2') diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp index aec9cc7..7581888 100644 --- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp +++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp @@ -172,12 +172,15 @@ public slots: if ( beacon ) { - if ( stations.find( beacon->SSID() ) ) - stations[beacon->SSID()]->beacons++; + OWaveLanManagementSSID* ssid = static_cast( p->child( "802.11 SSID" ) ); + QString essid = ssid ? ssid->ID() : ""; + + if ( stations.find( essid ) ) + stations[essid]->beacons++; else { - printf( "found new network @ channel %d, SSID = '%s'\n", wiface->channel(), (const char*) beacon->SSID() ); - stations.insert( beacon->SSID(), new Station( "unknown", wiface->channel(), + printf( "found new network @ channel %d, SSID = '%s'\n", wiface->channel(), (const char*) essid ); + stations.insert( essid, new Station( "unknown", wiface->channel(), ((OWaveLanPacket*) beacon->parent())->usesWep() ) ); } } diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index a0abcc2..12418d5 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp @@ -92,11 +92,13 @@ void OApplication::init() } } + void OApplication::setMainWidget( QWidget* widget ) { showMainWidget( widget ); } + void OApplication::showMainWidget( QWidget* widget, bool nomax ) { #ifdef Q_WS_QWS @@ -106,5 +108,17 @@ void OApplication::showMainWidget( QWidget* widget, bool nomax ) widget->show(); #endif widget->setCaption( _appname ); +} + +void OApplication::setTitle( QString title ) const +{ + if ( mainWidget() ) + { + if ( !title.isNull() ) + mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title ); + else + mainWidget()->setCaption( _appname ); + } } + diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index 736e786..4d25202 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -69,6 +69,7 @@ class OApplication: public OApplicationBaseClass * more than one cannot be created in the same application. It * saves you the trouble of having to pass the pointer explicitly * to every function that may require it. + * * @return the current application object */ static const OApplication* oApplication() { return _instance; }; @@ -92,15 +93,30 @@ class OApplication: public OApplicationBaseClass /** * Sets the main widget - reimplemented to call showMainWidget() * on Qt/Embedded. + * + * @param mainWidget the widget to become the main widget + * @see QWidget object */ virtual void setMainWidget( QWidget *mainWidget ); /** * Shows the main widget - reimplemented to call setMainWidget() * on platforms other than Qt/Embedded. + * + * @param mainWidget the widget to become the main widget + * @see QWidget object */ virtual void showMainWidget( QWidget* widget, bool nomax = false ); + /** + * Set the application title. The application title will be concatenated + * to the application name given in the constructor. + * + * @param title the title. If not given, resets caption to appname + */ + virtual void setTitle( QString title = QString::null ) const; + //virtual void setTitle() const; + protected: void init(); diff --git a/libopie2/opienet/802_11_user.h b/libopie2/opienet/802_11_user.h index 0b3f198..ffdcb93 100644 --- a/libopie2/opienet/802_11_user.h +++ b/libopie2/opienet/802_11_user.h @@ -255,11 +255,11 @@ struct ieee_802_11_data_header { // 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) +#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; @@ -318,20 +318,28 @@ struct tim_t { u_int8_t bitmap[251]; }; -#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 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_int8_t timestamp[8]; + u_int16_t beacon_interval; // u_int16_t listen_interval; // u_int16_t status_code; // u_int16_t aid; @@ -340,13 +348,13 @@ struct ieee_802_11_mgmt_body { // u_int16_t auth_alg; // u_int16_t auth_trans_seq_num; // struct challenge_t challenge; - u_int16_t capability_info; - struct ssid_t ssid; - struct rates_t rates; - struct ds_t ds; - struct cf_t cf; - struct fh_t fh; - struct tim_t tim; + u_int16_t capability_info; +// struct ssid_t ssid; +// struct rates_t rates; +// struct ds_t ds; +// struct cf_t cf; +// struct fh_t fh; +// struct tim_t tim; }; diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 1d3b9fe..25c70e0 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp @@ -291,7 +291,8 @@ bool ONetworkInterface::isWireless() const OChannelHopper::OChannelHopper( OWirelessNetworkInterface* iface ) :QObject( 0, "Mickey's funky hopper" ), - _iface( iface ), _interval( 0 ), _channel( 0 ), _tid( 0 ) + _iface( iface ), _interval( 0 ), _channel( 1 ), _tid( 0 ), + _maxChannel( iface->channels()+1 ) { } @@ -301,10 +302,21 @@ OChannelHopper::~OChannelHopper() } +bool OChannelHopper::isActive() const +{ + return _tid; +} + + +int OChannelHopper::channel() const +{ + return _channel; +} + + void OChannelHopper::timerEvent( QTimerEvent* ) { - //FIXME: Get available channels from OWirelessNetworkInterface - if ( --_channel < 0 ) _channel = 13; + if ( !--_channel ) _channel = _maxChannel; _iface->setChannel( _channel ); qDebug( "OChannelHopper::timerEvent(): set channel %d on interface '%s'", _channel, (const char*) _iface->name() ); @@ -319,6 +331,7 @@ void OChannelHopper::setInterval( int interval ) if ( _interval ) killTimer( _tid ); + _tid = 0; _interval = interval; if ( _interval ) @@ -339,7 +352,7 @@ int OChannelHopper::interval() const *======================================================================================*/ OWirelessNetworkInterface::OWirelessNetworkInterface( const QString& name ) - :ONetworkInterface( name ), _hopper( this ) + :ONetworkInterface( name ), _hopper( 0 ) { qDebug( "OWirelessNetworkInterface::OWirelessNetworkInterface()" ); init(); @@ -376,13 +389,10 @@ void OWirelessNetworkInterface::init() return; } - //TODO: Find out what the difference between num_channel and - // num_frequency is about. - for ( int i = 0; i < range.num_frequency; ++i ) { int freq = (int) ( double( range.freq[i].m ) * pow( 10, range.freq[i].e ) / 1000000.0 ); - _channels.insert( freq, i ); + _channels.insert( freq, i+1 ); } } @@ -412,13 +422,18 @@ QString OWirelessNetworkInterface::associatedAP() const int OWirelessNetworkInterface::channel() const { + //FIXME: When monitoring enabled, then use it + //FIXME: to gather the current RF channel + //FIXME: Until then, get active channel from hopper. + if ( _hopper && _hopper->isActive() ) + return _hopper->channel(); + if ( !wioctl( SIOCGIWFREQ ) ) { return -1; } else { - //FIXME: This is off-by-one !? Why? return _channels[ static_cast(double( _iwr.u.freq.m ) * pow( 10, _iwr.u.freq.e ) / 1000000) ]; } } @@ -461,13 +476,15 @@ int OWirelessNetworkInterface::channels() const void OWirelessNetworkInterface::setChannelHopping( int interval ) { - _hopper.setInterval( interval ); + if ( !_hopper ) _hopper = new OChannelHopper( this ); + _hopper->setInterval( interval ); + //FIXME: When and by whom will the channel hopper be deleted? } int OWirelessNetworkInterface::channelHopping() const { - return _hopper.interval(); + return _hopper->interval(); } @@ -479,6 +496,7 @@ void OWirelessNetworkInterface::setMonitorMode( bool b ) qDebug( "ONetwork(): can't switch monitor mode without installed monitoring interface" ); } + bool OWirelessNetworkInterface::monitorMode() const { return _mon ? _mon->enabled() : false; diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index 9a68a74..936ac85 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h @@ -142,6 +142,8 @@ class OChannelHopper : public QObject public: OChannelHopper( OWirelessNetworkInterface* ); virtual ~OChannelHopper(); + bool isActive() const; + int channel() const; virtual void timerEvent( QTimerEvent* ); void setInterval( int ); int interval() const; @@ -151,6 +153,7 @@ class OChannelHopper : public QObject int _interval; int _channel; int _tid; + int _maxChannel; }; @@ -184,7 +187,7 @@ class OWirelessNetworkInterface : public ONetworkInterface virtual void setMonitorMode( bool ); virtual bool monitorMode() const; - virtual void setChannelHopping( int interval ); + virtual void setChannelHopping( int interval = 0 ); virtual int channelHopping() const; virtual void setNickName( const QString& ) {}; @@ -207,7 +210,7 @@ class OWirelessNetworkInterface : public ONetworkInterface bool wioctl( int call, iwreqstruct& ) const; private: - OChannelHopper _hopper; + OChannelHopper* _hopper; }; diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 48f874f..913d42e 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp @@ -49,15 +49,18 @@ OPacket::OPacket( packetheaderstruct header, const unsigned char* data, QObject* { 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( (const struct ether_header*) data, this ); + new OEthernetPacket( _end, (const struct ether_header*) data, this ); } else { qDebug( "OPacket::OPacket(): Received Packet. Datalink = IEEE802.11" ); - new OWaveLanPacket( (const struct ieee_802_11_header*) data, this ); + new OWaveLanPacket( _end, (const struct ieee_802_11_header*) data, this ); } } @@ -109,7 +112,7 @@ int OPacket::len() const * OEthernetPacket *======================================================================================*/ -OEthernetPacket::OEthernetPacket( const struct ether_header* data, QObject* parent ) +OEthernetPacket::OEthernetPacket( const unsigned char* end, const struct ether_header* data, QObject* parent ) :QObject( parent, "Ethernet" ), _ether( data ) { @@ -124,7 +127,7 @@ OEthernetPacket::OEthernetPacket( const struct ether_header* data, QObject* pare switch ( type() ) { - case ETHERTYPE_IP: new OIPPacket( (const struct iphdr*) (data+1), this ); break; + 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" ); @@ -160,7 +163,7 @@ int OEthernetPacket::type() const *======================================================================================*/ -OIPPacket::OIPPacket( const struct iphdr* data, QObject* parent ) +OIPPacket::OIPPacket( const unsigned char* end, const struct iphdr* data, QObject* parent ) :QObject( parent, "IP" ), _iphdr( data ) { @@ -174,8 +177,8 @@ OIPPacket::OIPPacket( const struct iphdr* data, QObject* parent ) switch ( protocol() ) { - case IPPROTO_UDP: new OUDPPacket( (const struct udphdr*) (data+1), this ); break; - case IPPROTO_TCP: new OTCPPacket( (const struct tcphdr*) (data+1), this ); break; + 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: qDebug( "OIPPacket::OIPPacket(): unknown IP protocol type = %d", protocol() ); } @@ -244,7 +247,7 @@ int OIPPacket::checksum() const *======================================================================================*/ -OUDPPacket::OUDPPacket( const struct udphdr* data, QObject* parent ) +OUDPPacket::OUDPPacket( const unsigned char* end, const struct udphdr* data, QObject* parent ) :QObject( parent, "UDP" ), _udphdr( data ) { @@ -261,7 +264,7 @@ OUDPPacket::~OUDPPacket() *======================================================================================*/ -OTCPPacket::OTCPPacket( const struct tcphdr* data, QObject* parent ) +OTCPPacket::OTCPPacket( const unsigned char* end, const struct tcphdr* data, QObject* parent ) :QObject( parent, "TCP" ), _tcphdr( data ) { @@ -278,7 +281,7 @@ OTCPPacket::~OTCPPacket() *======================================================================================*/ -OWaveLanPacket::OWaveLanPacket( const struct ieee_802_11_header* data, QObject* parent ) +OWaveLanPacket::OWaveLanPacket( const unsigned char* end, const struct ieee_802_11_header* data, QObject* parent ) :QObject( parent, "802.11" ), _wlanhdr( data ) { @@ -295,9 +298,9 @@ OWaveLanPacket::OWaveLanPacket( const struct ieee_802_11_header* data, QObject* switch ( type() ) { - case T_MGMT: new OWaveLanManagementPacket( (const struct ieee_802_11_mgmt_header*) data, this ); break; - case T_DATA: new OWaveLanDataPacket( (const struct ieee_802_11_data_header*) data, this ); break; - //case T_CTRL: new OWaveLanControlPacket( (const struct ieee_802_11_ctrl_header*) data, this ); break; + case T_MGMT: new OWaveLanManagementPacket( end, (const struct ieee_802_11_mgmt_header*) data, this ); break; + case T_DATA: new OWaveLanDataPacket( end, (const struct ieee_802_11_data_header*) data, this ); break; + //case T_CTRL: new OWaveLanControlPacket( end, (const struct ieee_802_11_ctrl_header*) data, this ); break; default: qDebug( "OWaveLanPacket::OWaveLanPacket(): Warning: Unknown type!" ); } } @@ -383,7 +386,7 @@ bool OWaveLanPacket::usesWep() const * OWaveLanManagementPacket *======================================================================================*/ -OWaveLanManagementPacket::OWaveLanManagementPacket( const struct ieee_802_11_mgmt_header* data, OWaveLanPacket* parent ) +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) ) { @@ -393,10 +396,27 @@ OWaveLanManagementPacket::OWaveLanManagementPacket( const struct ieee_802_11_mgm { case ST_BEACON: { - qDebug( "TYPE: BEACON FRAME" ); - qDebug( "ESSID: %s", (const char*) SSID() ); - break; + // nice, received a beacon... + } + } + + // 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 } } @@ -406,22 +426,191 @@ OWaveLanManagementPacket::~OWaveLanManagementPacket() } -QString OWaveLanManagementPacket::SSID() const +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 { - int length = _body->ssid.length; + 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 ) +{ + qDebug( "OWaveLanManagementSSID()" ); +} + + +OWaveLanManagementSSID::~OWaveLanManagementSSID() +{ +} + + +QString OWaveLanManagementSSID::ID() const +{ + int length = _data->length; if ( length > 32 ) length = 32; char essid[length+1]; - memcpy( &essid, _body->ssid.ssid, length ); + 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 ) +{ + qDebug( "OWaveLanManagementRates()" ); +} + + +OWaveLanManagementRates::~OWaveLanManagementRates() +{ +} + +/*====================================================================================== + * OWaveLanManagementCF + *======================================================================================*/ + +OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* end, const struct cf_t* data, QObject* parent ) + :QObject( parent, "802.11 CF" ), _data( data ) +{ + qDebug( "OWaveLanManagementCF()" ); +} + + +OWaveLanManagementCF::~OWaveLanManagementCF() +{ +} + +/*====================================================================================== + * OWaveLanManagementFH + *======================================================================================*/ + +OWaveLanManagementFH::OWaveLanManagementFH( const unsigned char* end, const struct fh_t* data, QObject* parent ) + :QObject( parent, "802.11 FH" ), _data( data ) +{ + qDebug( "OWaveLanManagementFH()" ); +} + + +OWaveLanManagementFH::~OWaveLanManagementFH() +{ +} + +/*====================================================================================== + * OWaveLanManagementDS + *======================================================================================*/ + +OWaveLanManagementDS::OWaveLanManagementDS( const unsigned char* end, const struct ds_t* data, QObject* parent ) + :QObject( parent, "802.11 DS" ), _data( data ) +{ + qDebug( "OWaveLanManagementDS()" ); +} + + +OWaveLanManagementDS::~OWaveLanManagementDS() +{ +} + + +int OWaveLanManagementDS::channel() const +{ + return _data->channel; +} + +/*====================================================================================== + * OWaveLanManagementTim + *======================================================================================*/ + +OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* end, const struct tim_t* data, QObject* parent ) + :QObject( parent, "802.11 Tim" ), _data( data ) +{ + qDebug( "OWaveLanManagementTim()" ); +} + + +OWaveLanManagementTim::~OWaveLanManagementTim() +{ +} + +/*====================================================================================== + * OWaveLanManagementIBSS + *======================================================================================*/ + +OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* end, const struct ibss_t* data, QObject* parent ) + :QObject( parent, "802.11 IBSS" ), _data( data ) +{ + qDebug( "OWaveLanManagementIBSS()" ); +} + + +OWaveLanManagementIBSS::~OWaveLanManagementIBSS() +{ +} + +/*====================================================================================== + * OWaveLanManagementChallenge + *======================================================================================*/ + +OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* end, const struct challenge_t* data, QObject* parent ) + :QObject( parent, "802.11 Challenge" ), _data( data ) +{ + qDebug( "OWaveLanManagementChallenge()" ); +} + + +OWaveLanManagementChallenge::~OWaveLanManagementChallenge() +{ +} + +/*====================================================================================== * OWaveLanDataPacket *======================================================================================*/ -OWaveLanDataPacket::OWaveLanDataPacket( const struct ieee_802_11_data_header* data, OWaveLanPacket* parent ) +OWaveLanDataPacket::OWaveLanDataPacket( const unsigned char* end, const struct ieee_802_11_data_header* data, OWaveLanPacket* parent ) :QObject( parent, "802.11 Data" ), _header( data ) { //qDebug( "size of header = %d", sizeof( struct ieee_802_11_data_header ) ); @@ -431,7 +620,7 @@ OWaveLanDataPacket::OWaveLanDataPacket( const struct ieee_802_11_data_header* da if (!( ( (OWaveLanPacket*) this->parent())->duration() )) payload -= 6; // compensation for missing last address - new OLLCPacket( (const struct ieee_802_11_802_2_header*) payload, this ); + new OLLCPacket( end, (const struct ieee_802_11_802_2_header*) payload, this ); } @@ -444,7 +633,7 @@ OWaveLanDataPacket::~OWaveLanDataPacket() * OLLCPacket *======================================================================================*/ -OLLCPacket::OLLCPacket( const struct ieee_802_11_802_2_header* data, QObject* parent ) +OLLCPacket::OLLCPacket( const unsigned char* end, const struct ieee_802_11_802_2_header* data, QObject* parent ) :QObject( parent, "802.11 802_2" ), _header( data ) { qDebug( "OLLCPacket::OLLCPacket(): decoding frame..." ); @@ -455,7 +644,7 @@ OLLCPacket::OLLCPacket( const struct ieee_802_11_802_2_header* data, QObject* pa switch ( EXTRACT_16BITS( &_header->type ) ) // defined in linux/if_ether.h { - case ETH_P_IP: new OIPPacket( (const struct iphdr*) (data+1), this ); break; + case ETH_P_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break; default: qDebug( "OLLCPacket::OLLCPacket(): Unknown Encapsulation Type" ); } @@ -473,7 +662,7 @@ OLLCPacket::~OLLCPacket() OPacketCapturer::OPacketCapturer( QObject* parent, const char* name ) :QObject( parent, name ), _name( QString::null ), _open( false ), - _pch( 0 ) + _pch( 0 ), _sn( 0 ) { } @@ -517,6 +706,11 @@ void OPacketCapturer::close() { if ( _open ) { + if ( _sn ) + { + _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); + delete _sn; + } pcap_close( _pch ); _open = false; } @@ -545,7 +739,10 @@ int OPacketCapturer::fileno() const OPacket* OPacketCapturer::next() { packetheaderstruct header; + qDebug( "==> OPacketCapturer::next()" ); const unsigned char* pdata = pcap_next( _pch, &header ); + qDebug( "<== OPacketCapturer::next()" ); + if ( header.len ) return new OPacket( header, pdata, this ); else @@ -577,11 +774,11 @@ bool OPacketCapturer::open( const QString& name ) _pch = handle; _open = true; - // in case we have a qapp, create a socket notifier + // in case we have an application object, create a socket notifier if ( qApp ) { - QSocketNotifier* sn = new QSocketNotifier( fileno(), QSocketNotifier::Read, this ); - connect( sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); + _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 65c550c..0b06572 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h @@ -60,6 +60,7 @@ typedef struct pcap_pkthdr packetheaderstruct; /* FORWARDS */ class OPacketCapturer; +class QSocketNotifier; /*====================================================================================== * OPacket - A frame on the wire @@ -84,6 +85,7 @@ class OPacket : public QObject private: const packetheaderstruct _hdr; // pcap packet header const unsigned char* _data; // pcap packet data + const unsigned char* _end; // end of pcap packet data }; /*====================================================================================== @@ -95,7 +97,7 @@ class OEthernetPacket : public QObject Q_OBJECT public: - OEthernetPacket( const struct ether_header*, QObject* parent = 0 ); + OEthernetPacket( const unsigned char*, const struct ether_header*, QObject* parent = 0 ); virtual ~OEthernetPacket(); OMacAddress sourceAddress() const; @@ -116,7 +118,7 @@ class OWaveLanPacket : public QObject Q_OBJECT public: - OWaveLanPacket( const struct ieee_802_11_header*, QObject* parent = 0 ); + OWaveLanPacket( const unsigned char*, const struct ieee_802_11_header*, QObject* parent = 0 ); virtual ~OWaveLanPacket(); int duration() const; @@ -146,10 +148,17 @@ class OWaveLanManagementPacket : public QObject Q_OBJECT public: - OWaveLanManagementPacket( const struct ieee_802_11_mgmt_header*, OWaveLanPacket* parent = 0 ); + OWaveLanManagementPacket( const unsigned char*, const struct ieee_802_11_mgmt_header*, OWaveLanPacket* parent = 0 ); virtual ~OWaveLanManagementPacket(); - QString SSID() const; + int beaconInterval() const; + int capabilities() const; // generic + + bool canESS() const; + bool canIBSS() const; + bool canCFP() const; + bool canCFP_REQ() const; + bool canPrivacy() const; private: const struct ieee_802_11_mgmt_header* _header; @@ -158,6 +167,138 @@ class OWaveLanManagementPacket : public QObject /*====================================================================================== + * OWaveLanManagementSSID + *======================================================================================*/ + +class OWaveLanManagementSSID : public QObject +{ + Q_OBJECT + + public: + OWaveLanManagementSSID( const unsigned char*, const struct ssid_t*, QObject* parent = 0 ); + virtual ~OWaveLanManagementSSID(); + + QString ID() const; + + private: + const struct ssid_t* _data; +}; + +/*====================================================================================== + * OWaveLanManagementRates + *======================================================================================*/ + +class OWaveLanManagementRates : public QObject +{ + Q_OBJECT + + public: + OWaveLanManagementRates( const unsigned char*, const struct rates_t*, QObject* parent = 0 ); + virtual ~OWaveLanManagementRates(); + + private: + const struct rates_t* _data; +}; + +/*====================================================================================== + * OWaveLanManagementCF + *======================================================================================*/ + +class OWaveLanManagementCF : public QObject +{ + Q_OBJECT + + public: + OWaveLanManagementCF( const unsigned char*, const struct cf_t*, QObject* parent = 0 ); + virtual ~OWaveLanManagementCF(); + + private: + const struct cf_t* _data; +}; + +/*====================================================================================== + * OWaveLanManagementFH + *======================================================================================*/ + +class OWaveLanManagementFH : public QObject +{ + Q_OBJECT + + public: + OWaveLanManagementFH( const unsigned char*, const struct fh_t*, QObject* parent = 0 ); + virtual ~OWaveLanManagementFH(); + + private: + const struct fh_t* _data; +}; + +/*====================================================================================== + * 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) *======================================================================================*/ @@ -166,7 +307,7 @@ class OWaveLanDataPacket : public QObject Q_OBJECT public: - OWaveLanDataPacket( const struct ieee_802_11_data_header*, OWaveLanPacket* parent = 0 ); + OWaveLanDataPacket( const unsigned char*, const struct ieee_802_11_data_header*, OWaveLanPacket* parent = 0 ); virtual ~OWaveLanDataPacket(); private: @@ -182,7 +323,7 @@ class OLLCPacket : public QObject Q_OBJECT public: - OLLCPacket( const struct ieee_802_11_802_2_header* data, QObject* parent = 0 ); + OLLCPacket( const unsigned char*, const struct ieee_802_11_802_2_header* data, QObject* parent = 0 ); virtual ~OLLCPacket(); private: @@ -198,7 +339,7 @@ class OIPPacket : public QObject Q_OBJECT public: - OIPPacket( const struct iphdr*, QObject* parent = 0 ); + OIPPacket( const unsigned char*, const struct iphdr*, QObject* parent = 0 ); virtual ~OIPPacket(); QHostAddress fromIPAddress() const; @@ -225,7 +366,7 @@ class OUDPPacket : public QObject Q_OBJECT public: - OUDPPacket( const struct udphdr*, QObject* parent = 0 ); + OUDPPacket( const unsigned char*, const struct udphdr*, QObject* parent = 0 ); virtual ~OUDPPacket(); int fromPort() const; @@ -244,7 +385,7 @@ class OTCPPacket : public QObject Q_OBJECT public: - OTCPPacket( const struct tcphdr*, QObject* parent = 0 ); + OTCPPacket( const unsigned char*, const struct tcphdr*, QObject* parent = 0 ); virtual ~OTCPPacket(); int fromPort() const; @@ -284,9 +425,10 @@ class OPacketCapturer : public QObject void readyToReceive(); protected: - QString _name; // devicename - bool _open; // check this before doing pcap calls - pcap_t* _pch; // pcap library handle + QString _name; // devicename + bool _open; // check this before doing pcap calls + pcap_t* _pch; // pcap library handle + QSocketNotifier* _sn; // socket notifier for main loop mutable char _errbuf[PCAP_ERRBUF_SIZE]; }; -- cgit v0.9.0.2