BUGFIX: obtaining a network interface list via an ioctl does not always

        return all available interfaces.  Per busybox ifconfig,
        use /proc/net/dev as a preferred interface list if it exists,
        and fall back to the ioctl method if it does not.

1 files changed, 71 insertions, 54 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 765b522..50131d8 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,94 +1,96 @@
 #include "mainwindowimp.h"

 #include "addconnectionimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

 #include "interfaces.h"

 #include "module.h"

 

 #include <qpushbutton.h>

 #include <qlistbox.h>

 #include <qlineedit.h>

 #include <qlistview.h>

 #include <qheader.h>

 #include <qlabel.h>

 

 #include <qmessagebox.h>

 

 #ifdef QWS 

  #include <qpe/config.h>

  #include <qpe/qlibrary.h>

  #include <qpe/resource.h>

  #include <qpe/qpeapplication.h>

 #else

  #include <klibloader.h>

  #define QLibrary KLibrary

  #include <kconfig.h>

  #define Config KConfig

  #include <kapplication.h>

  #include <kstandarddirs.h>

  #include <kiconloader.h>

  #define showMaximized show

 #endif

 

 #if QT_VERSION < 300

 #include <qlist.h>

 #else

 #include <qptrlist.h>

 #endif

 #include <qdir.h>

 #include <qfile.h>

 #include <qtextstream.h>

 #include <qregexp.h>

 

 #include <net/if.h>

 #include <sys/ioctl.h>

+#include <sys/socket.h>

 

 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"

+#define _PROCNETDEV "/proc/net/dev"

 

 MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){

   connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));

   connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));

   connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));

   connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); 

   

   connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));

   connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));

   connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));

 

   connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));  

   // Load connections.

   // /usr/local/kde/lib/libinterfaces.la

 #ifdef QWS 

   loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");

 #else

   loader = KLibLoader::self();

   loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));

 #endif

   getAllInterfaces();

   

   Interfaces i;

   QStringList list = i.getInterfaceList();

   QMap<QString, Interface*>::Iterator it;

   for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) {

     bool found = false;

     for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){

       if(it.key() == (*ni))

         found = true;

     }

     if(!found){

       if(!(*ni).contains("_")){

         Interface *i = new Interface(this, *ni, false);

         i->setAttached(false);

         i->setHardwareName("Disconnected");

         interfaceNames.insert(i->getInterfaceName(), i);

         updateInterface(i);

         connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

       }

     }

   }

   

   //getInterfaceList();

   connectionList->header()->hide();

 

   Config cfg("NetworkSetup");

   profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));

@@ -102,200 +104,215 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
   if ( file.open(IO_ReadOnly) ) {    // file opened successfully

     QTextStream stream( &file );        // use a text stream

     while ( !stream.eof() ) {        // until end of file...

       QString line = stream.readLine();       // line of text excluding '\n'

       if(line.contains("SCHEME")){

         line = line.mid(7, line.length());

         currentProfileLabel->setText(line);

         break;

       }

     }

     file.close();

   }

 }

 

 /**

  * Deconstructor. Save profiles.  Delete loaded libraries.

  */

 MainWindowImp::~MainWindowImp(){

   // Save profiles.

   Config cfg("NetworkSetup");

   cfg.setGroup("General");

   cfg.writeEntry("Profiles", profiles.join(" "));

   

   // Delete all interfaces that don't have owners.

   QMap<Interface*, QListViewItem*>::Iterator iIt;

   for( iIt = items.begin(); iIt != items.end(); ++iIt ){

     if(iIt.key()->getModuleOwner() == NULL)

       delete iIt.key();

   }

   

 #ifdef QWS

   // Delete Modules and Libraries

   QMap<Module*, QLibrary*>::Iterator it;

   for( it = libraries.begin(); it != libraries.end(); ++it ){

     delete it.key();

     // I wonder why I can't delete the libraries

     // What fucking shit this is.

     //delete it.data();

   }

 #else

   // klibloader automaticly deletes the libraries for us...

 #endif

 }

 

 /**

  * Query the kernel for all of the interfaces.

  */ 

 void MainWindowImp::getAllInterfaces(){

-  int sockfd = socket(AF_INET, SOCK_DGRAM, 0);

+  int sockfd = socket(PF_INET, SOCK_DGRAM, 0);

   if(sockfd == -1)

     return;

   

-  char buf[8*1024];

-  struct ifconf ifc;

-  ifc.ifc_len = sizeof(buf);

-  ifc.ifc_req = (struct ifreq *) buf;

-  int result=ioctl(sockfd, SIOCGIFCONF, &ifc);

-

-  for (char* ptr = buf; ptr < buf + ifc.ifc_len; ){

-    struct ifreq *ifr =(struct ifreq *) ptr;

-    int len = sizeof(struct sockaddr);

-#ifdef  HAVE_SOCKADDR_SA_LEN

-    if (ifr->ifr_addr.sa_len > len)

-      len = ifr->ifr_addr.sa_len;    /* length > 16 */

-#endif

-    ptr += sizeof(ifr->ifr_name) + len;  /* for next one in buffer */

+  struct ifreq ifr;

+  QStringList ifaces;

+  QFile procFile(QString(_PROCNETDEV));

+  int result;

+

+  if (! procFile.exists()) {

+    struct ifreq ifrs[100];

+    struct ifconf ifc;

+    ifc.ifc_len = sizeof(ifrs);

+    ifc.ifc_req = ifrs;

+    result = ioctl(sockfd, SIOCGIFCONF, &ifc);

+    

+    for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++) {

+      struct ifreq *pifr = &ifrs[i];

+  

+      ifaces += pifr->ifr_name;

+    }

+  } else {

+    procFile.open(IO_ReadOnly);

+    QString line;

+    QTextStream procTs(&procFile);

+    int loc = -1;

+

+    procTs.readLine(); // eat a line

+    procTs.readLine(); // eat a line

+    while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) {

+      if((loc = line.find(":")) != -1) {

+        ifaces += line.left(loc);

+      }

+    }

+  }

 

-    int flags;

-    struct sockaddr_in *sinptr;

+  for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) {

+    int flags = 0, family;

     Interface *i = NULL;

-    switch (ifr->ifr_addr.sa_family){

-      case AF_INET:

-        sinptr = (struct sockaddr_in *) &ifr->ifr_addr;

-        flags=0;

-

-        struct ifreq ifcopy;

-        ifcopy=*ifr;

-        result=ioctl(sockfd,SIOCGIFFLAGS,&ifcopy);

-        flags=ifcopy.ifr_flags;

-        i = new Interface(this, ifr->ifr_name, false);

-        i->setAttached(true);

-        if ((flags & IFF_UP) == IFF_UP)

-          i->setStatus(true);

-        else

-          i->setStatus(false);

-

-        if ((flags & IFF_BROADCAST) == IFF_BROADCAST)

-          i->setHardwareName("Ethernet");

-        else if ((flags & IFF_POINTOPOINT) == IFF_POINTOPOINT)

-          i->setHardwareName("Point to Point");

-        else if ((flags & IFF_MULTICAST) == IFF_MULTICAST)

-          i->setHardwareName("Multicast");

-        else if ((flags & IFF_LOOPBACK) == IFF_LOOPBACK)

-          i->setHardwareName("Loopback");

-        else

-          i->setHardwareName("Unknown");

 

-        interfaceNames.insert(i->getInterfaceName(), i);

-        updateInterface(i);

-        connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

-        break;

+    strcpy(ifr.ifr_name, (*it).latin1());

 

-      default:

-        qDebug(ifr->ifr_name);

-        qDebug(QString("%1").arg(ifr->ifr_addr.sa_family).latin1());

-        break;

-    }

+    qWarning("ifr.ifr_name=%s\n", ifr.ifr_name); 

+

+    struct ifreq ifcopy;

+    ifcopy = ifr;

+    result = ioctl(sockfd, SIOCGIFFLAGS, &ifcopy);

+    flags = ifcopy.ifr_flags;

+    i = new Interface(this, ifr.ifr_name, false);

+        i->setAttached(true);

+    if ((flags & IFF_UP) == IFF_UP)

+      i->setStatus(true);

+    else

+      i->setStatus(false);

+

+    if ((flags & IFF_BROADCAST) == IFF_BROADCAST)

+      i->setHardwareName("Ethernet");

+    else if ((flags & IFF_POINTOPOINT) == IFF_POINTOPOINT)

+      i->setHardwareName("Point to Point");

+    else if ((flags & IFF_MULTICAST) == IFF_MULTICAST)

+      i->setHardwareName("Multicast");

+    else if ((flags & IFF_LOOPBACK) == IFF_LOOPBACK)

+      i->setHardwareName("Loopback");

+    else

+      i->setHardwareName("Unknown");

+

+    qWarning("Adding interface %s to interfaceNames\n", ifr.ifr_name);

+    interfaceNames.insert(i->getInterfaceName(), i);

+    updateInterface(i);

+    connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));

   }

 }

 

 /**

  * Load all modules that are found in the path

  * @param path a directory that is scaned for any plugins that can be loaded

  *  and attempts to load them

  */ 

 void MainWindowImp::loadModules(const QString &path){

 #ifdef DEBUG

   qDebug("MainWindowImp::loadModules: %s", path.latin1());

 #endif

   QDir d(path);

   if(!d.exists())

     return;

 

   // Don't want sym links

   d.setFilter( QDir::Files | QDir::NoSymLinks );

   const QFileInfoList *list = d.entryInfoList();

   QFileInfoListIterator it( *list );

   QFileInfo *fi;

   while ( (fi=it.current()) ) {

+#ifdef QWS 

+    if(fi->fileName().contains(".so")){

+#else

     if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){

+#endif

       loadPlugin(path + "/" + fi->fileName());

     }

     ++it;

   }

 }

 

 /**

  * Attempt to load a function and resolve a function.

  * @param pluginFileName - the name of the file in which to attempt to load

  * @param resolveString - function pointer to resolve 

  * @return pointer to the function with name resolveString or NULL

  */ 

 Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){

 #ifdef DEBUG

-  qDebug("MainWindowImp::loadPlugin: %s", pluginFileName.latin1());

+  qDebug("MainWindowImp::loadPlugin: %s: resolving %s", pluginFileName.latin1(), resolveString.latin1());

 #endif

 #ifdef QWS 

   QLibrary *lib = new QLibrary(pluginFileName);

   void *functionPointer = lib->resolve(resolveString);

   if( !functionPointer ){

 #ifdef DEBUG

-  qDebug("MainWindowImp::loadPlugin: File: %s is not a plugin, but though was.", pluginFileName.latin1());

+  qDebug("MainWindowImp::loadPlugin: Warning: %s is not a plugin", pluginFileName.latin1());

 #endif

     delete lib;

     return NULL;

   }

   // Try to get an object.

   Module *object = ((Module* (*)()) functionPointer)();

   if(object == NULL){

 #ifdef DEBUG

     qDebug("MainWindowImp: Couldn't create object, but did load library!");

 #endif

     delete lib;

     return NULL;

   }

 

   // Store for deletion later

   libraries.insert(object, lib);

   return object;

 

 #else

   QLibrary *lib = loader->library(pluginFileName);

   if( !lib || !lib->hasSymbol(resolveString) ){

 #ifdef DEBUG

     qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

 #endif

     return NULL;

   }

   // Try to get an object.

   Module *object = ((Module* (*)()) lib->symbol(resolveString))();

   if(object == NULL){

 #ifdef DEBUG

     qDebug("MainWindowImp: Couldn't create object, but did load library!");

 #endif

     return NULL;

   }

 #ifdef DEBUG

   qDebug("MainWindowImp::loadPlugin:: Found object, storing.");

 #endif

   // Store for deletion later

   libraries.insert(object, lib);

   return object;

 #endif

 }

 

 /**

  * The Add button was clicked.  Bring up the add dialog and if OK is hit

  * load the plugin and append it to the list

  */ 

 void MainWindowImp::addClicked(){