API extension: ONetwork::isPresent( const char* name )

1 files changed, 17 insertions, 6 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 915814d..e5b091f 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -99,96 +99,107 @@ void ONetwork::synchronize()
         odebug << "ONetwork: found interface '" << str << "'" << oendl;

         ONetworkInterface* iface;

         if ( isWirelessInterface( str ) )

         {

             iface = new OWirelessNetworkInterface( this, (const char*) str );

             odebug << "ONetwork: interface '" << str << "' has Wireless Extensions" << oendl;

         }

         else

         {

             iface = new ONetworkInterface( this, (const char*) str );

         }

         _interfaces.insert( str, iface );

         s.readLine();

     }

 }

 

 

 short ONetwork::wirelessExtensionVersion()

 {

     return WIRELESS_EXT;

 }

 

 

 int ONetwork::count() const

 {

     return _interfaces.count();

 }

 

 

 ONetworkInterface* ONetwork::interface( const QString& iface ) const

 {

     return _interfaces[iface];

 }

 

 

 ONetwork* ONetwork::instance()

 {

     if ( !_instance ) _instance = new ONetwork();

     return _instance;

 }

 

 

 ONetwork::InterfaceIterator ONetwork::iterator() const

 {

     return ONetwork::InterfaceIterator( _interfaces );

 }

 

 

+bool ONetwork::isPresent( const char* name ) const

+{

+    int sfd = socket( AF_INET, SOCK_STREAM, 0 );

+    struct ifreq ifr;

+    memset( &ifr, 0, sizeof( struct ifreq ) );

+    strcpy( (char*) &ifr.ifr_name, name );

+    int result = ::ioctl( sfd, SIOCGIFFLAGS, &ifr );

+    return result != -1;

+}

+

+

 bool ONetwork::isWirelessInterface( const char* name ) const

 {

     int sfd = socket( AF_INET, SOCK_STREAM, 0 );

     struct iwreq iwr;

     memset( &iwr, 0, sizeof( struct iwreq ) );

     strcpy( (char*) &iwr.ifr_name, name );

     int result = ::ioctl( sfd, SIOCGIWNAME, &iwr );

     return result != -1;

 }

 

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

  * ONetworkInterface

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

 

 ONetworkInterface::ONetworkInterface( QObject* parent, const char* name )

                  :QObject( parent, name ),

                  _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 )

 {

     odebug << "ONetworkInterface::ONetworkInterface()" << oendl;

     init();

 }

 

 

 struct ifreq& ONetworkInterface::ifr() const

 {

     return _ifr;

 }

 

 

 void ONetworkInterface::init()

 {

     odebug << "ONetworkInterface::init()" << oendl;

 

     memset( &_ifr, 0, sizeof( struct ifreq ) );

 

     if ( _sfd == -1 )

     {

         odebug << "ONetworkInterface::init(): Warning - can't get socket for device '" << name() << "'" << oendl;

         return;

     }

 }

 

 

 bool ONetworkInterface::ioctl( int call, struct ifreq& ifreq ) const

 {

     #ifndef NODEBUG

     int result = ::ioctl( _sfd, call, &ifreq );

     if ( result == -1 )

@@ -537,101 +548,101 @@ void OWirelessNetworkInterface::buildInformation()
         }

         // </check if the driver overwrites stuff>

 

         struct iw_range range;

         memcpy( &range, buffer, sizeof range );

 

         odebug << "OWirelessNetworkInterface::buildInformation(): Interface reported to have " << (int) range.num_frequency << " channels." << oendl;

         for ( int i = 0; i < range.num_frequency; ++i )

         {

             int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 );

             _channels.insert( freq, i+1 );

         }

     }

 

     memcpy( &_range, buffer, sizeof( struct iw_range ) );

     odebug << "OWirelessNetworkInterface::buildInformation(): Information block constructed." << oendl;

     free(buffer);

 }

 

 

 void OWirelessNetworkInterface::buildPrivateList()

 {

     odebug << "OWirelessNetworkInterface::buildPrivateList()" << oendl;

 

     struct iw_priv_args priv[IW_MAX_PRIV_DEF];

 

     _iwr.u.data.pointer = (char*) &priv;

     _iwr.u.data.length = IW_MAX_PRIV_DEF; // length in terms of number of (sizeof iw_priv_args), not (sizeof iw_priv_args) itself

     _iwr.u.data.flags = 0;

 

     if ( !wioctl( SIOCGIWPRIV ) )

     {

         owarn << "OWirelessNetworkInterface::buildPrivateList(): Can't get private ioctl information." << oendl;

         return;

     }

 

     for ( int i = 0; i < _iwr.u.data.length; ++i )

     {

         new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args );

     }

     odebug << "OWirelessNetworkInterface::buildPrivateList(): Private ioctl list constructed." << oendl;

 }

 

 

 void OWirelessNetworkInterface::dumpInformation() const

 {

     odebug << "OWirelessNetworkInterface::() -------------- dumping information block ----------------" << oendl;

 

-    qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s", 

+    qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s",

             _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 );

     qDebug( " - driver for '%s' (V%d) has been compiled against WE V%d",

              name(), _range.we_version_source, _range.we_version_compiled );

-             

+

     if ( _range.we_version_compiled != WIRELESS_EXT )

     {

         owarn << "Version mismatch! WE_DRIVER = " << _range.we_version_compiled << " and WE_OPIENET = " << WIRELESS_EXT << oendl;

     }

 

     odebug << "OWirelessNetworkInterface::() ---------------------------------------------------------" << oendl;

 }

 

 

 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

     {

         return _channels[ static_cast<int>(double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000) ];

     }

 }

 

 

 void OWirelessNetworkInterface::setChannel( int c ) const

 {

     if ( !c )

     {

         oerr << "OWirelessNetworkInterface::setChannel( 0 ) called - fix your application!" << oendl;

         return;

     }

 

     if ( !_mon )

     {

         memset( &_iwr, 0, sizeof( struct iwreq ) );

         _iwr.u.freq.m = c;

         _iwr.u.freq.e = 0;

         wioctl( SIOCSIWFREQ );

     }

     else

     {

         _mon->setChannel( c );

     }

 }

@@ -927,113 +938,113 @@ OStationList* OWirelessNetworkInterface::scanNetwork()
                     stations->last()->macAddress = (const unsigned char*) &we->u.ap_addr.sa_data[0];

                     break;

                 }

                 case SIOCGIWMODE:

                 {

                     odebug << "SIOCGIWMODE" << oendl;

                     stations->last()->type = modeToString( we->u.mode );

                     break;

                 }

                 case SIOCGIWFREQ:

                 {

                     odebug << "SIOCGIWFREQ" << oendl;

                     stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ];

                     break;

                 }

                 case SIOCGIWESSID:

                 {

                     odebug << "SIOCGIWESSID" << oendl;

                     stations->last()->ssid = we->u.essid.pointer;

                     break;

                 }

                 case SIOCGIWSENS: odebug << "SIOCGIWSENS" << oendl; break;

                 case SIOCGIWENCODE: odebug << "SIOCGIWENCODE" << oendl; break;

                 case IWEVTXDROP: odebug << "IWEVTXDROP" << oendl; break;         /* Packet dropped to excessive retry */

                 case IWEVQUAL: odebug << "IWEVQUAL" << oendl; break;             /* Quality part of statistics (scan) */

                 case IWEVCUSTOM: odebug << "IWEVCUSTOM" << oendl; break;         /* Driver specific ascii string */

                 case IWEVREGISTERED: odebug << "IWEVREGISTERED" << oendl; break; /* Discovered a new node (AP mode) */

                 case IWEVEXPIRED: odebug << "IWEVEXPIRED" << oendl; break;       /* Expired a node (AP mode) */

                 default: odebug << "unhandled event" << oendl;

             }

 

             offset += we->len;

             we = (struct iw_event*) &buffer[offset];

         }

         return stations;

 

         return stations;

 

     }

     else

     {

         odebug << " - no results (timeout) :(" << oendl;

         return stations;

     }

 }

 

 

 int OWirelessNetworkInterface::signalStrength() const

-{   

+{

     iw_statistics stat;

     ::memset( &stat, 0, sizeof stat );

     _iwr.u.data.pointer = (char*) &stat;

     _iwr.u.data.flags = 0;

     _iwr.u.data.length = sizeof stat;

-    

+

     if ( !wioctl( SIOCGIWSTATS ) )

     {

         return -1;

     }

-   

+

     int max = _range.max_qual.qual;

     int cur = stat.qual.qual;

     int lev = stat.qual.level; //FIXME: Do something with them?

     int noi = stat.qual.noise; //FIXME: Do something with them?

-    

+

     return cur*100/max;

 }

 

 

 bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const

 {

     #ifndef NODEBUG

     int result = ::ioctl( _sfd, call, &iwreq );

 

     if ( result == -1 )

         odebug << "ONetworkInterface::wioctl (" << name() << ") call '"

                << debugmapper->map( call ) << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl;

     else

         odebug << "ONetworkInterface::wioctl (" << name() << ") call '"

                << debugmapper->map( call ) << "' - Status: Ok." << oendl;

 

     return ( result != -1 );

     #else

     return ::ioctl( _sfd, call, &iwreq ) != -1;

     #endif

 }

 

 

 bool OWirelessNetworkInterface::wioctl( int call ) const

 {

     strcpy( _iwr.ifr_name, name() );

     return wioctl( call, _iwr );

 }

 

 

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

  * OMonitoringInterface

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

 

 OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface, bool prismHeader )

                       :_if( static_cast<OWirelessNetworkInterface*>( iface ) ), _prismHeader( prismHeader )

 {

 }

 

 

 OMonitoringInterface::~OMonitoringInterface()

 {

 }

 

 

 void OMonitoringInterface::setChannel( int c )

 {

     // use standard WE channel switching protocol