8 files changed, 42 insertions, 14 deletions

diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp
index b9b09ad..f6eed00 100644
--- a/noncore/net/networksetup/interface.cpp
+++ b/noncore/net/networksetup/interface.cpp
@@ -70,167 +70,167 @@ bool Interface::refresh(){
     subnetMask = "0.0.0.0";
     broadcast = "";
     dhcp = false;
     dhcpServerIp = "";
     leaseObtained = "";
     leaseExpires = "";
     return true;
   }
         
   QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName);
   int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1());
   if(ret != 0){
     qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1());
     return false;
   }
   
   QFile file(fileName);
   if (!file.open(IO_ReadOnly)){
     qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1());
     return false;
   }
 
   // Set to the defaults
   macAddress = "";
   ip = "0.0.0.0";
   subnetMask = "0.0.0.0";
   broadcast = "";
   
   QTextStream stream( &file );
   QString line;
   while ( !stream.eof() ) {
     line = stream.readLine();
     if(line.contains("HWaddr")){
       int mac = line.find("HWaddr");
       macAddress = line.mid(mac+7, line.length());
     }
     if(line.contains("inet addr")){
       int ipl = line.find("inet addr");
       int space = line.find(" ", ipl+10);
       ip = line.mid(ipl+10, space-ipl-10);
     }
     if(line.contains("Mask")){
       int mask = line.find("Mask");
       subnetMask = line.mid(mask+5, line.length());
     }
     if(line.contains("Bcast")){
       int mask = line.find("Bcast");
       int space = line.find(" ", mask+6);
       broadcast = line.mid(mask+6, space-mask-6);
     }
   }
   file.close();
   QFile::remove(fileName);
 
   // DHCP TESTING
   // reset DHCP info
   dhcpServerIp = "";
   leaseObtained = "";
   leaseExpires = "";
   dhcp = false;
     
   // See if we have 
   QString dhcpFile(QString(HDCP_INFO_DIR "/dhcpcd-%1.info").arg(interfaceName));
   // If there is no DHCP information then exit now with no errors.
   if(!QFile::exists(dhcpFile)){
     return true;
   }
   
   file.setName(dhcpFile);
   if (!file.open(IO_ReadOnly)){
     qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1());
     return false;
   }
   
   // leaseTime and renewalTime and used if pid and deamon exe can be accessed.
   int leaseTime = 0;
   int renewalTime = 0;
   
   stream.setDevice( &file );
   while ( !stream.eof() ) {
     line = stream.readLine();
     if(line.contains("DHCPSID="))
       dhcpServerIp = line.mid(8, line.length());
     if(line.contains("LEASETIME="))
       leaseTime = line.mid(10, line.length()).toInt();
     if(line.contains("RENEWALTIME="))
       renewalTime = line.mid(12, line.length()).toInt();
   }
   file.close();
   //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1());
   //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1());
   
   // Get the pid of the deamond
   dhcpFile = (QString(HDCP_INFO_DIR "/dhcpcd-%1.pid").arg(interfaceName));
   file.setName(dhcpFile);
   if (!file.open(IO_ReadOnly)){
     qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1());
     return false;
   }
 
   int pid = -1;
   stream.setDevice( &file );
   while ( !stream.eof() ) {
     line = stream.readLine();
     pid = line.toInt();
   }
   file.close();
 
   if( pid == -1){
     qDebug("Interface: Could not get pid of dhcpc deamon.");
     return false;
   }
 
   // Get the start running time of the deamon 
   fileName = (QString("/proc/%1/stat").arg(pid));
   file.setName(fileName);
   stream.setDevice( &file );
   if (!file.open(IO_ReadOnly)){
     qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1());
     return false;
   }
   while ( !stream.eof() ) {
     line = stream.readLine();
   }
   file.close();
   long time = 0;
   // Grab the start time  
   //                     pid com state ppid pgrp session tty_nr tpgid flags
-  int r = sscanf(line.latin1(), "%*d %*s %*c   %*d  %*d  %*d     %*d    %*d   %*u "
+  sscanf(line.latin1(), "%*d %*s %*c   %*d  %*d  %*d     %*d    %*d   %*u "
   //   minflt cminflt majflt cmajflt utime stime cutime cstime priority
       "%*u    %*u    %*u    %*u     %*u   %*u   %*d   %*d   %*d "
   //   nice 0   itrealvalue starttime
       "%*d  %*d %*d %lu", (long*) &time);
   time = time/100;
   
   QDateTime datetime(QDateTime::currentDateTime());
 
   // Get the uptime of the computer.
   QFile f("/proc/uptime");
   if ( f.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &f );        // use a text stream
     int sec = 0;
     t >> sec;
     datetime = datetime.addSecs((-1*sec));
     f.close();
   }
   else{
     qDebug("Interface: Can't open /proc/uptime to retrive uptime.");
     return false;
   }
   
   datetime = datetime.addSecs(time);
   //qDebug(QString("Interface: %1 %2").arg(datetime.toString()).arg(pid).latin1());
    
   // Calculate the start and renew times 
           leaseObtained= datetime.toString();
   
   // Calculate the start and renew times 
   datetime = datetime.addSecs(leaseTime);
   leaseExpires = datetime.toString();
   
   dhcp = true;
   return true;
 }
 
 // interface.cpp
 
diff --git a/noncore/net/networksetup/interfaceinformationimp.h b/noncore/net/networksetup/interfaceinformationimp.h
index 6fc2384..c8a478e 100644
--- a/noncore/net/networksetup/interfaceinformationimp.h
+++ b/noncore/net/networksetup/interfaceinformationimp.h
@@ -1,31 +1,31 @@
 #ifndef INTERFACEINFORMATIONIMP_H 
 #define INTERFACEINFORMATIONIMP_H
 
 #include "interfaceinformation.h"
 #include "interface.h"
 
 class InterfaceInformationImp : public InterfaceInformation {
 
 Q_OBJECT
         
 public:
   InterfaceInformationImp(QWidget *parent=0, const char *name=0, Interface *i=0, WFlags f=0);
   ~InterfaceInformationImp(){};
   
 private slots:
   void start();
   void stop();
   void refresh();
   void restart();
   void advanced();
-  Interface *interface;
 
 private:
+  Interface *interface;
   void updateInterface();
   
 };
 
 #endif
 
 // addserviceimp.h
 
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 3c13143..ad9362f 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -1,308 +1,319 @@
 #include "mainwindowimp.h"

 #include "addserviceimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

+#include "interface.h"

+#include "kprocess.h"

+#include "module.h"

 

 #include <qpushbutton.h>

 #include <qdir.h>

 #include <qtabwidget.h>

 #include <qmainwindow.h>

 #include <qmessagebox.h>

 #include <qlistbox.h>

 #include <qpe/config.h>

 #include <qpe/qlibrary.h>

 #include <qpe/resource.h>

 #include <qlist.h>

 

 #include <qfile.h>

 #include <qtextstream.h>

 #include <qlistview.h>

 #include <qheader.h>

 // For library loading.

 #include <dlfcn.h>

 

 #define TEMP_ALL "/tmp/ifconfig-a"

 #define TEMP_UP "/tmp/ifconfig"

 

 #define NO_SELECT_ERROR_AND_RETURN { \

   QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \

   return; \

 }

 

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

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

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

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

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

   // Make sure we have a plugin directory to scan.

   QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;

   QDir pluginDir( DirStr );

   pluginDir.mkdir( DirStr );

   pluginDir.mkdir( ( DirStr + "plugins/" ) );

   QString path = DirStr + "plugins";

   pluginDir.setPath(path);

   if(!pluginDir.exists()){

     qDebug(QString("MainWindowImp: ERROR: %1 %2").arg(__FILE__).arg(__LINE__).latin1());

     return;

   }

 

   // Load any saved services.

   loadModules(path);

   getInterfaceList();

   serviceList->header()->hide();

+

+

+  Config cfg("NetworkSetup");

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

 }

 

 /**

- * Deconstructor.  Unload libraries and save.

+ * Deconstructor.  Unload libraries and save profile list.

  */

 MainWindowImp::~MainWindowImp(){

+  if(profiles.count() > 1){

+    Config cfg("NetworkSetup");

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

+  }

 }

 

 void MainWindowImp::loadModules(QString path){

 }

 

 /**

  * 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(QString pluginFileName, QString resolveString){

   //qDebug(pluginFileName.latin1());

   QLibrary *lib = new QLibrary(pluginFileName);

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

   if( !functionPointer ){

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

     delete lib;

     return NULL;

   }

   

   // Try to get an object.

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

   if(object == NULL){

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

     delete lib;

     return NULL;

   }

 

   // Store for reference

   libraries.insert(object, lib);

   return object;

 }

 

 /*

 QList<QString> MainWindowImp::retrieveUnloadedPluginList(){

   QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;

   QString path = DirStr + "plugins";

   QDir d(path);

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

 

   QMap<QObject*, QLibrary*>::Iterator libraryIt;

   QList<QString> rlist; 

   rlist.setAutoDelete(false);

           

   const QFileInfoList *list = d.entryInfoList();

   QFileInfoListIterator it( *list );

   QFileInfo *fi;

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

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

       for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )

         if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){

           QString *s = new QString(path + "/" + fi->fileName());

           rlist.append(s);

         }

     }

     ++it;

   }

   return rlist;

 }

 */

 

 /**

  * 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(){

   // Now that we have a list of all of the protocals, list them.

   {

     QMessageBox::information(this, "No Modules", "Nothing to add.", "Ok");

     return;

   }

   AddServiceImp service(this, "AddService", true);

   service.showMaximized();

   service.exec();

 }

 

 /**

  * Prompt the user to see if they really want to do this.

  * If they do then remove from the list and unload.

  */ 

 void MainWindowImp::removeClicked(){

   QListViewItem *item = serviceList->currentItem();

   if(item == NULL) NO_SELECT_ERROR_AND_RETURN

   

   if(modules.find(interfaceItems[item]) == modules.end()){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");

   }

   else{

     // Try to remove. 

   }

 

 }

 

 /**

  * See if there is a configuration for the selected protocal.

  * Prompt with errors.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = serviceList->currentItem();

   if(item == NULL) NO_SELECT_ERROR_AND_RETURN

   

   if(modules.find(interfaceItems[item]) == modules.end()){

     InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);

     conf->showMaximized();

     conf->show();

   }

   else{

     InterfaceSetupImp *conf = new InterfaceSetupImp(this, "InterfaceConfiguration");

     conf->show();

   }

 }

 

 /**

  * Pull up the information about the selected interface

  * Report an error

  */ 

 void MainWindowImp::informationClicked(){

   QListViewItem *item = serviceList->currentItem();

   if(item == NULL)NO_SELECT_ERROR_AND_RETURN

         

   if(modules.find(interfaceItems[item]) == modules.end()){

     InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);

     i->showMaximized();

     i->show();

   }

   else{

     QTabWidget *t = new QTabWidget(this, "InterfaceInformationTAB");

     InterfaceInformationImp *i = new InterfaceInformationImp(t, "TCPIPInformation", interfaceItems[item], true);

     t->insertTab(i, "TCP/IP");

     t->show();

   }

 }

 

 /**

  * Aquire the list of active interfaces from ifconfig

  * Call ifconfig and ifconfig -a

  */ 

 void MainWindowImp::getInterfaceList(){

   KShellProcess *processAll = new KShellProcess();

   *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;

   connect(processAll, SIGNAL(processExited(KProcess *)),

           this, SLOT(jobDone(KProcess *)));

   threads.insert(processAll, TEMP_ALL);

   processAll->start(KShellProcess::NotifyOnExit);

 

   KShellProcess *process = new KShellProcess();

   *process << "/sbin/ifconfig" << " > " TEMP_UP;

   connect(process, SIGNAL(processExited(KProcess *)),

           this, SLOT(jobDone(KProcess *)));

   threads.insert(process, TEMP_UP);

   process->start(KShellProcess::NotifyOnExit);

 }

 

 void MainWindowImp::jobDone(KProcess *process){

   QString fileName = threads[process];

   threads.remove(process);

   delete process;

 

   QFile file(fileName);

   if (!file.open(IO_ReadOnly)){

     qDebug(QString("MainWindowImp: Can't open file: %1").arg(fileName).latin1());

     return;

   }

   

   QTextStream stream( &file );

   QString line;

   while ( !stream.eof() ) {

     line = stream.readLine();

     int space = line.find(" ");

     if(space > 1){

       // We have found an interface

       QString interfaceName = line.mid(0, space);

       Interface *i;

       // See if we already have it

       if(interfaceNames.find(interfaceName) == interfaceNames.end()){

         if(fileName == TEMP_ALL)

           i = new Interface(interfaceName, false);

         else

           i = new Interface(interfaceName, true);

       }

       else{

         i = interfaceNames[interfaceName];

         if(fileName != TEMP_ALL)

           i->setStatus(true);

       }

       

       i->setAttached(true);

       i->setInterfaceName(interfaceName);

 

       QString hardName = "Ethernet";

       int hardwareName = line.find("Link encap:");

       int macAddress = line.find("HWaddr");

       if(macAddress == -1)

         macAddress = line.length();

       if(hardwareName != -1)

-        i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)));

+        i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));

       // We have found an interface

       //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());

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

       updateInterface(i);

     }

   }

   file.close();

   QFile::remove(fileName);

 } 

 

 void MainWindowImp::updateInterface(Interface *i){

   QListViewItem *item = NULL;

   

   // See if we already have it

   if(items.find(i) == items.end()){

     item = new QListViewItem(serviceList, "", "", "");

     // See if you can't find a module owner for this interface

     //EmployeeMap::Iterator it;

     //for( it = map.begin(); it != map.end(); ++it )

     //        printf( "%s, %s earns %d\n", it.key().latin1(), it.data().name().latin1(), it.data().salary() );

 

     items.insert(i, item);

     interfaceItems.insert(item, i);

   }

   else

     item = items[i];

   

   QString statusImage = "down";

   if(i->getStatus())

     statusImage = "up";

   QPixmap status = (Resource::loadPixmap(statusImage));

   item->setPixmap(0, status);

  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     typeName = "lo";

   QPixmap type = (Resource::loadPixmap(typeName));

   item->setPixmap(1, type);

 

   item->setText(2, i->getHardwareName());

   

 }

 

 void MainWindowImp::addProfile(){

 

 }

 

 void MainWindowImp::removeProfile(){

 

 }

 

 // mainwindowimp.cpp

 

diff --git a/noncore/net/networksetup/mainwindowimp.h b/noncore/net/networksetup/mainwindowimp.h
index 95ec2a1..0618dd2 100644
--- a/noncore/net/networksetup/mainwindowimp.h
+++ b/noncore/net/networksetup/mainwindowimp.h
@@ -1,53 +1,56 @@
 #ifndef MAINWINOWIMP_H

 #define MAINWINOWIMP_H

 

 #include "mainwindow.h"

-#include "module.h"

-#include "interface.h"

-#include "kprocess.h"

 #include <qmap.h>

+#include <qstringlist.h>

 

+class Module;

+class Interface;

 class QLibrary;

+class KProcess;

 

 class MainWindowImp : public MainWindow {

   Q_OBJECT

 

 public:

   MainWindowImp(QWidget *parent=0, const char *name=0);

   ~MainWindowImp();

   

 private slots:

   void addClicked();

   void removeClicked();

   void configureClicked();

   void informationClicked();

   

   void jobDone(KProcess *process);

   void getInterfaceList();

  

   void addProfile();

   void removeProfile();

   

   void updateInterface(Interface *i);

 

 private:

   void loadModules(QString path);

   

   Module* loadPlugin(QString pluginFileName,

                      QString resolveString = "create_plugin");

 

   // For our local list of names

   QMap<QString, Interface*> interfaceNames;

 

   QMap<Module*, QLibrary*> libraries;

   QMap<Interface*, Module*> modules;

   QMap<Interface*, QListViewItem*> items;

   QMap<QListViewItem*, Interface*> interfaceItems;

   

   QMap<KProcess*, QString> threads;

+  QStringList profiles;

+

 };

 

 #endif

 

 // mainwindowimp.h

 

diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp
index b9b09ad..f6eed00 100644
--- a/noncore/settings/networksettings/interface.cpp
+++ b/noncore/settings/networksettings/interface.cpp
@@ -70,167 +70,167 @@ bool Interface::refresh(){
     subnetMask = "0.0.0.0";
     broadcast = "";
     dhcp = false;
     dhcpServerIp = "";
     leaseObtained = "";
     leaseExpires = "";
     return true;
   }
         
   QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName);
   int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1());
   if(ret != 0){
     qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1());
     return false;
   }
   
   QFile file(fileName);
   if (!file.open(IO_ReadOnly)){
     qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1());
     return false;
   }
 
   // Set to the defaults
   macAddress = "";
   ip = "0.0.0.0";
   subnetMask = "0.0.0.0";
   broadcast = "";
   
   QTextStream stream( &file );
   QString line;
   while ( !stream.eof() ) {
     line = stream.readLine();
     if(line.contains("HWaddr")){
       int mac = line.find("HWaddr");
       macAddress = line.mid(mac+7, line.length());
     }
     if(line.contains("inet addr")){
       int ipl = line.find("inet addr");
       int space = line.find(" ", ipl+10);
       ip = line.mid(ipl+10, space-ipl-10);
     }
     if(line.contains("Mask")){
       int mask = line.find("Mask");
       subnetMask = line.mid(mask+5, line.length());
     }
     if(line.contains("Bcast")){
       int mask = line.find("Bcast");
       int space = line.find(" ", mask+6);
       broadcast = line.mid(mask+6, space-mask-6);
     }
   }
   file.close();
   QFile::remove(fileName);
 
   // DHCP TESTING
   // reset DHCP info
   dhcpServerIp = "";
   leaseObtained = "";
   leaseExpires = "";
   dhcp = false;
     
   // See if we have 
   QString dhcpFile(QString(HDCP_INFO_DIR "/dhcpcd-%1.info").arg(interfaceName));
   // If there is no DHCP information then exit now with no errors.
   if(!QFile::exists(dhcpFile)){
     return true;
   }
   
   file.setName(dhcpFile);
   if (!file.open(IO_ReadOnly)){
     qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1());
     return false;
   }
   
   // leaseTime and renewalTime and used if pid and deamon exe can be accessed.
   int leaseTime = 0;
   int renewalTime = 0;
   
   stream.setDevice( &file );
   while ( !stream.eof() ) {
     line = stream.readLine();
     if(line.contains("DHCPSID="))
       dhcpServerIp = line.mid(8, line.length());
     if(line.contains("LEASETIME="))
       leaseTime = line.mid(10, line.length()).toInt();
     if(line.contains("RENEWALTIME="))
       renewalTime = line.mid(12, line.length()).toInt();
   }
   file.close();
   //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1());
   //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1());
   
   // Get the pid of the deamond
   dhcpFile = (QString(HDCP_INFO_DIR "/dhcpcd-%1.pid").arg(interfaceName));
   file.setName(dhcpFile);
   if (!file.open(IO_ReadOnly)){
     qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1());
     return false;
   }
 
   int pid = -1;
   stream.setDevice( &file );
   while ( !stream.eof() ) {
     line = stream.readLine();
     pid = line.toInt();
   }
   file.close();
 
   if( pid == -1){
     qDebug("Interface: Could not get pid of dhcpc deamon.");
     return false;
   }
 
   // Get the start running time of the deamon 
   fileName = (QString("/proc/%1/stat").arg(pid));
   file.setName(fileName);
   stream.setDevice( &file );
   if (!file.open(IO_ReadOnly)){
     qDebug(QString("Interface: Can't open file: %1").arg(fileName).latin1());
     return false;
   }
   while ( !stream.eof() ) {
     line = stream.readLine();
   }
   file.close();
   long time = 0;
   // Grab the start time  
   //                     pid com state ppid pgrp session tty_nr tpgid flags
-  int r = sscanf(line.latin1(), "%*d %*s %*c   %*d  %*d  %*d     %*d    %*d   %*u "
+  sscanf(line.latin1(), "%*d %*s %*c   %*d  %*d  %*d     %*d    %*d   %*u "
   //   minflt cminflt majflt cmajflt utime stime cutime cstime priority
       "%*u    %*u    %*u    %*u     %*u   %*u   %*d   %*d   %*d "
   //   nice 0   itrealvalue starttime
       "%*d  %*d %*d %lu", (long*) &time);
   time = time/100;
   
   QDateTime datetime(QDateTime::currentDateTime());
 
   // Get the uptime of the computer.
   QFile f("/proc/uptime");
   if ( f.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &f );        // use a text stream
     int sec = 0;
     t >> sec;
     datetime = datetime.addSecs((-1*sec));
     f.close();
   }
   else{
     qDebug("Interface: Can't open /proc/uptime to retrive uptime.");
     return false;
   }
   
   datetime = datetime.addSecs(time);
   //qDebug(QString("Interface: %1 %2").arg(datetime.toString()).arg(pid).latin1());
    
   // Calculate the start and renew times 
           leaseObtained= datetime.toString();
   
   // Calculate the start and renew times 
   datetime = datetime.addSecs(leaseTime);
   leaseExpires = datetime.toString();
   
   dhcp = true;
   return true;
 }
 
 // interface.cpp
 
diff --git a/noncore/settings/networksettings/interfaceinformationimp.h b/noncore/settings/networksettings/interfaceinformationimp.h
index 6fc2384..c8a478e 100644
--- a/noncore/settings/networksettings/interfaceinformationimp.h
+++ b/noncore/settings/networksettings/interfaceinformationimp.h
@@ -1,31 +1,31 @@
 #ifndef INTERFACEINFORMATIONIMP_H 
 #define INTERFACEINFORMATIONIMP_H
 
 #include "interfaceinformation.h"
 #include "interface.h"
 
 class InterfaceInformationImp : public InterfaceInformation {
 
 Q_OBJECT
         
 public:
   InterfaceInformationImp(QWidget *parent=0, const char *name=0, Interface *i=0, WFlags f=0);
   ~InterfaceInformationImp(){};
   
 private slots:
   void start();
   void stop();
   void refresh();
   void restart();
   void advanced();
-  Interface *interface;
 
 private:
+  Interface *interface;
   void updateInterface();
   
 };
 
 #endif
 
 // addserviceimp.h
 
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 3c13143..ad9362f 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -1,308 +1,319 @@
 #include "mainwindowimp.h"

 #include "addserviceimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

+#include "interface.h"

+#include "kprocess.h"

+#include "module.h"

 

 #include <qpushbutton.h>

 #include <qdir.h>

 #include <qtabwidget.h>

 #include <qmainwindow.h>

 #include <qmessagebox.h>

 #include <qlistbox.h>

 #include <qpe/config.h>

 #include <qpe/qlibrary.h>

 #include <qpe/resource.h>

 #include <qlist.h>

 

 #include <qfile.h>

 #include <qtextstream.h>

 #include <qlistview.h>

 #include <qheader.h>

 // For library loading.

 #include <dlfcn.h>

 

 #define TEMP_ALL "/tmp/ifconfig-a"

 #define TEMP_UP "/tmp/ifconfig"

 

 #define NO_SELECT_ERROR_AND_RETURN { \

   QMessageBox::information(this, "Error","Please select an interface.", "Ok"); \

   return; \

 }

 

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

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

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

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

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

   // Make sure we have a plugin directory to scan.

   QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;

   QDir pluginDir( DirStr );

   pluginDir.mkdir( DirStr );

   pluginDir.mkdir( ( DirStr + "plugins/" ) );

   QString path = DirStr + "plugins";

   pluginDir.setPath(path);

   if(!pluginDir.exists()){

     qDebug(QString("MainWindowImp: ERROR: %1 %2").arg(__FILE__).arg(__LINE__).latin1());

     return;

   }

 

   // Load any saved services.

   loadModules(path);

   getInterfaceList();

   serviceList->header()->hide();

+

+

+  Config cfg("NetworkSetup");

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

 }

 

 /**

- * Deconstructor.  Unload libraries and save.

+ * Deconstructor.  Unload libraries and save profile list.

  */

 MainWindowImp::~MainWindowImp(){

+  if(profiles.count() > 1){

+    Config cfg("NetworkSetup");

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

+  }

 }

 

 void MainWindowImp::loadModules(QString path){

 }

 

 /**

  * 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(QString pluginFileName, QString resolveString){

   //qDebug(pluginFileName.latin1());

   QLibrary *lib = new QLibrary(pluginFileName);

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

   if( !functionPointer ){

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

     delete lib;

     return NULL;

   }

   

   // Try to get an object.

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

   if(object == NULL){

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

     delete lib;

     return NULL;

   }

 

   // Store for reference

   libraries.insert(object, lib);

   return object;

 }

 

 /*

 QList<QString> MainWindowImp::retrieveUnloadedPluginList(){

   QString DirStr = QDir::homeDirPath() + "/.networksetup/" ;

   QString path = DirStr + "plugins";

   QDir d(path);

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

 

   QMap<QObject*, QLibrary*>::Iterator libraryIt;

   QList<QString> rlist; 

   rlist.setAutoDelete(false);

           

   const QFileInfoList *list = d.entryInfoList();

   QFileInfoListIterator it( *list );

   QFileInfo *fi;

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

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

       for( libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt )

         if((path + "/" + fi->fileName()) != (libraryIt.data())->library()){

           QString *s = new QString(path + "/" + fi->fileName());

           rlist.append(s);

         }

     }

     ++it;

   }

   return rlist;

 }

 */

 

 /**

  * 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(){

   // Now that we have a list of all of the protocals, list them.

   {

     QMessageBox::information(this, "No Modules", "Nothing to add.", "Ok");

     return;

   }

   AddServiceImp service(this, "AddService", true);

   service.showMaximized();

   service.exec();

 }

 

 /**

  * Prompt the user to see if they really want to do this.

  * If they do then remove from the list and unload.

  */ 

 void MainWindowImp::removeClicked(){

   QListViewItem *item = serviceList->currentItem();

   if(item == NULL) NO_SELECT_ERROR_AND_RETURN

   

   if(modules.find(interfaceItems[item]) == modules.end()){

     QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", "Ok");

   }

   else{

     // Try to remove. 

   }

 

 }

 

 /**

  * See if there is a configuration for the selected protocal.

  * Prompt with errors.

  */ 

 void MainWindowImp::configureClicked(){

   QListViewItem *item = serviceList->currentItem();

   if(item == NULL) NO_SELECT_ERROR_AND_RETURN

   

   if(modules.find(interfaceItems[item]) == modules.end()){

     InterfaceSetupImp *conf = new InterfaceSetupImp(0, "InterfaceConfiguration", interfaceItems[item]);

     conf->showMaximized();

     conf->show();

   }

   else{

     InterfaceSetupImp *conf = new InterfaceSetupImp(this, "InterfaceConfiguration");

     conf->show();

   }

 }

 

 /**

  * Pull up the information about the selected interface

  * Report an error

  */ 

 void MainWindowImp::informationClicked(){

   QListViewItem *item = serviceList->currentItem();

   if(item == NULL)NO_SELECT_ERROR_AND_RETURN

         

   if(modules.find(interfaceItems[item]) == modules.end()){

     InterfaceInformationImp *i = new InterfaceInformationImp(0, "InterfaceInformationImp", interfaceItems[item]);

     i->showMaximized();

     i->show();

   }

   else{

     QTabWidget *t = new QTabWidget(this, "InterfaceInformationTAB");

     InterfaceInformationImp *i = new InterfaceInformationImp(t, "TCPIPInformation", interfaceItems[item], true);

     t->insertTab(i, "TCP/IP");

     t->show();

   }

 }

 

 /**

  * Aquire the list of active interfaces from ifconfig

  * Call ifconfig and ifconfig -a

  */ 

 void MainWindowImp::getInterfaceList(){

   KShellProcess *processAll = new KShellProcess();

   *processAll << "/sbin/ifconfig" << "-a" << " > " TEMP_ALL;

   connect(processAll, SIGNAL(processExited(KProcess *)),

           this, SLOT(jobDone(KProcess *)));

   threads.insert(processAll, TEMP_ALL);

   processAll->start(KShellProcess::NotifyOnExit);

 

   KShellProcess *process = new KShellProcess();

   *process << "/sbin/ifconfig" << " > " TEMP_UP;

   connect(process, SIGNAL(processExited(KProcess *)),

           this, SLOT(jobDone(KProcess *)));

   threads.insert(process, TEMP_UP);

   process->start(KShellProcess::NotifyOnExit);

 }

 

 void MainWindowImp::jobDone(KProcess *process){

   QString fileName = threads[process];

   threads.remove(process);

   delete process;

 

   QFile file(fileName);

   if (!file.open(IO_ReadOnly)){

     qDebug(QString("MainWindowImp: Can't open file: %1").arg(fileName).latin1());

     return;

   }

   

   QTextStream stream( &file );

   QString line;

   while ( !stream.eof() ) {

     line = stream.readLine();

     int space = line.find(" ");

     if(space > 1){

       // We have found an interface

       QString interfaceName = line.mid(0, space);

       Interface *i;

       // See if we already have it

       if(interfaceNames.find(interfaceName) == interfaceNames.end()){

         if(fileName == TEMP_ALL)

           i = new Interface(interfaceName, false);

         else

           i = new Interface(interfaceName, true);

       }

       else{

         i = interfaceNames[interfaceName];

         if(fileName != TEMP_ALL)

           i->setStatus(true);

       }

       

       i->setAttached(true);

       i->setInterfaceName(interfaceName);

 

       QString hardName = "Ethernet";

       int hardwareName = line.find("Link encap:");

       int macAddress = line.find("HWaddr");

       if(macAddress == -1)

         macAddress = line.length();

       if(hardwareName != -1)

-        i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)));

+        i->setHardwareName(line.mid(hardwareName+11, macAddress-(hardwareName+11)) + QString(" (%1)").arg(i->getInterfaceName()));

       // We have found an interface

       //qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());

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

       updateInterface(i);

     }

   }

   file.close();

   QFile::remove(fileName);

 } 

 

 void MainWindowImp::updateInterface(Interface *i){

   QListViewItem *item = NULL;

   

   // See if we already have it

   if(items.find(i) == items.end()){

     item = new QListViewItem(serviceList, "", "", "");

     // See if you can't find a module owner for this interface

     //EmployeeMap::Iterator it;

     //for( it = map.begin(); it != map.end(); ++it )

     //        printf( "%s, %s earns %d\n", it.key().latin1(), it.data().name().latin1(), it.data().salary() );

 

     items.insert(i, item);

     interfaceItems.insert(item, i);

   }

   else

     item = items[i];

   

   QString statusImage = "down";

   if(i->getStatus())

     statusImage = "up";

   QPixmap status = (Resource::loadPixmap(statusImage));

   item->setPixmap(0, status);

  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

     typeName = "lo";

   QPixmap type = (Resource::loadPixmap(typeName));

   item->setPixmap(1, type);

 

   item->setText(2, i->getHardwareName());

   

 }

 

 void MainWindowImp::addProfile(){

 

 }

 

 void MainWindowImp::removeProfile(){

 

 }

 

 // mainwindowimp.cpp

 

diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 95ec2a1..0618dd2 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -1,53 +1,56 @@
 #ifndef MAINWINOWIMP_H

 #define MAINWINOWIMP_H

 

 #include "mainwindow.h"

-#include "module.h"

-#include "interface.h"

-#include "kprocess.h"

 #include <qmap.h>

+#include <qstringlist.h>

 

+class Module;

+class Interface;

 class QLibrary;

+class KProcess;

 

 class MainWindowImp : public MainWindow {

   Q_OBJECT

 

 public:

   MainWindowImp(QWidget *parent=0, const char *name=0);

   ~MainWindowImp();

   

 private slots:

   void addClicked();

   void removeClicked();

   void configureClicked();

   void informationClicked();

   

   void jobDone(KProcess *process);

   void getInterfaceList();

  

   void addProfile();

   void removeProfile();

   

   void updateInterface(Interface *i);

 

 private:

   void loadModules(QString path);

   

   Module* loadPlugin(QString pluginFileName,

                      QString resolveString = "create_plugin");

 

   // For our local list of names

   QMap<QString, Interface*> interfaceNames;

 

   QMap<Module*, QLibrary*> libraries;

   QMap<Interface*, Module*> modules;

   QMap<Interface*, QListViewItem*> items;

   QMap<QListViewItem*, Interface*> interfaceItems;

   

   QMap<KProcess*, QString> threads;

+  QStringList profiles;

+

 };

 

 #endif

 

 // mainwindowimp.h