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

2 files changed, 21 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
@@ -139,16 +139,27 @@ ONetwork* ONetwork::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;

@@ -577,21 +588,21 @@ void OWirelessNetworkInterface::buildPrivateList()
     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;

 }

 

@@ -967,33 +978,33 @@ OStationList* OWirelessNetworkInterface::scanNetwork()
     {

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

diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 0a51108..93b129f 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -89,16 +89,20 @@ class ONetwork : public QObject
      * @returns a pointer to the (one and only) @ref ONetwork instance.
      */
     static ONetwork* instance();
     /**
      * @returns an iterator usable for iterating through all network interfaces.
      */
     InterfaceIterator iterator() const;
     /**
+     * @returns true, if the @a interface is present.
+     */
+    bool isPresent( const char* interface ) const;
+    /**
      * @returns true, if the @a interface supports the wireless extension protocol.
      */
     bool isWirelessInterface( const char* interface ) const;
     /**
      * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found.
      * @see ONetworkInterface
      */
     ONetworkInterface* interface( const QString& interface ) const;