1 files changed, 20 insertions, 4 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index a61f620..63b9603 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -128,124 +128,141 @@ MainWindowImp::~MainWindowImp(){
   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(PF_INET, SOCK_DGRAM, 0);
   if(sockfd == -1)
     return;
 
   struct ifreq ifr;
   QStringList ifaces;
   QFile procFile(QString(_PROCNETDEV));
   int result;
+  Interface *i;
 
   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);
       }
     }
   }
 
   for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) {
     int flags = 0, family;
-    Interface *i = NULL;
+    i = NULL;
 
     strcpy(ifr.ifr_name, (*it).latin1());
 
     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 *)));
+    connect(i, SIGNAL(updateInterface(Interface *)),
+            this, SLOT(updateInterface(Interface *)));
+  }
+  // now lets ask the plugins too ;)
+  QMap<Module*, QLibrary*>::Iterator it;
+  QList<Interface> ilist;
+  for( it = libraries.begin(); it != libraries.end(); ++it ){
+    if(it.key()){
+        ilist = it.key()->getInterfaces();
+        for( i = ilist.first(); i != 0; i = ilist.next() ){
+            qWarning("Adding interface %s to interfaceNames\n", i->getInterfaceName().latin1() );
+            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());
       qDebug("loaded plugin: >%s< ",QString(path + "/" + fi->fileName()).latin1());
     }
     ++it;
   }
@@ -287,66 +304,65 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
 
 #else
   QLibrary *lib = loader->library(pluginFileName);
   if( !lib || !lib->hasSymbol(resolveString) ){
       qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());
       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(){
   QMap<Module*, QLibrary*>::Iterator it;
   QMap<QString, QString> list;
   QMap<QString, Module*> newInterfaceOwners;
-  //list.insert("USB (PPP) / (ADD_TEST)", "A dialup connection over the USB port");
-  //list.insert("IrDa (PPP) / (ADD_TEST)", "A dialup connection over the IdDa port");
+
   for( it = libraries.begin(); it != libraries.end(); ++it ){
     if(it.key()){
       (it.key())->possibleNewInterfaces(list);
     }
   }
   // See if the list has anything that we can add.
   if(list.count() == 0){
     QMessageBox::information(this, "Sorry", "Nothing to add.", QMessageBox::Ok);
     return;
   }
   AddConnectionImp addNewConnection(this, "AddConnectionImp", true);
   addNewConnection.addConnections(list);
   addNewConnection.showMaximized();
   if(QDialog::Accepted == addNewConnection.exec()){
     QListViewItem *item = addNewConnection.registeredServicesList->currentItem();
     if(!item)
       return;
 
     for( it = libraries.begin(); it != libraries.end(); ++it ){
       if(it.key()){
         Interface *i = (it.key())->addNewInterface(item->text(0));
         if(i){
           qDebug("iface name %s",i->getInterfaceName().latin1());
           interfaceNames.insert(i->getInterfaceName(), i);
           updateInterface(i);
         }
       }
     }
   }
 }
 
 /**