DHCP works, addProfile works

8 files changed, 148 insertions, 70 deletions

diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp
index 5b21364..1f32093 100644
--- a/noncore/net/networksetup/interface.cpp
+++ b/noncore/net/networksetup/interface.cpp
@@ -1,9 +1,10 @@
 #include "interface.h"
 #include <qdatetime.h>
 #include <qfile.h>
+#include <qdir.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 
 #define IFCONFIG "/sbin/ifconfig"
 #define HDCP_INFO_DIR "/etc/dhcpc"
 
@@ -124,15 +125,20 @@ bool Interface::refresh(){
   // DHCP TESTING
   // reset DHCP info
   dhcpServerIp = "";
   leaseObtained = "";
   leaseExpires = "";
   dhcp = false;
-    
+   
+  QString dhcpDirectory(HDCP_INFO_DIR);
+  QDir d(dhcpDirectory);
+  if(!d.exists(dhcpDirectory))
+    dhcpDirectory = "/var/run";
+  
   // See if we have 
-  QString dhcpFile(QString(HDCP_INFO_DIR "/dhcpcd-%1.info").arg(interfaceName));
+  QString dhcpFile(QString(dhcpDirectory+"/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);
@@ -145,25 +151,25 @@ bool Interface::refresh(){
   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("DHCPSIADDR="))
+      dhcpServerIp = line.mid(11, 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));
+  dhcpFile = (QString(dhcpDirectory+"/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;
   }
 
diff --git a/noncore/net/networksetup/mainwindow.ui b/noncore/net/networksetup/mainwindow.ui
index f5b104a..3538aeb 100644
--- a/noncore/net/networksetup/mainwindow.ui
+++ b/noncore/net/networksetup/mainwindow.ui
@@ -42,13 +42,13 @@
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Widget3</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
-                    <string>Interfaces</string>
+                    <string>Connections</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>0</number>
                     </property>
@@ -97,12 +97,26 @@
                             </property>
                             <property>
                                 <name>resizeable</name>
                                 <bool>true</bool>
                             </property>
                         </column>
+                        <column>
+                            <property>
+                                <name>text</name>
+                                <string>IP</string>
+                            </property>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
+                            </property>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
+                            </property>
+                        </column>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>connectionList</cstring>
                         </property>
                         <property stdset="1">
                             <name>allColumnsShowFocus</name>
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 66ec8b5..e9429e3 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -2,12 +2,13 @@
 #include "addconnectionimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

 #include "module.h"

 

 #include "kprocess.h"

+#include "namedialog.h"

 

 #include <qpushbutton.h>

 #include <qtabwidget.h>

 #include <qlistbox.h>

 #include <qlistview.h>

 #include <qheader.h>

@@ -125,49 +126,69 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
  * 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())

+    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.", "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){

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

+	  updateInterface(i);

+	}

+      }

+    }

   }

 }

 

 /**

  * 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 = connectionList->currentItem();

-  if(item == NULL) {

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

-     return; 

+  if(!item) {

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

+    return; 

   }

   

-  if((interfaceItems[item])->getModuleOwner() == NULL){

+  Interface *i = interfaceItems[item];

+  if(i->getModuleOwner() == NULL){

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

   }

   else{

-    // Try to remove. 

+    if(!i->getModuleOwner()->remove(i))

+      QMessageBox::information(this, "Error", "Unable to remove.", "Ok");

+    else{

+      QMessageBox::information(this, "Success", "Interface was removed.", "Ok");

+      // TODO memory managment....

+      // who deletes the interface?

+    }

   }

-

 }

 

 /**

  * Pull up the configure about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure with a empty

@@ -308,71 +329,69 @@ void MainWindowImp::jobDone(KProcess *process){
   }

   file.close();

   QFile::remove(fileName);

 } 

 

 /**

- *

+ * Update this interface.  If no QListViewItem exists create one.

+ * @param Interface* pointer to the interface that needs to be updated.

  */ 

 void MainWindowImp::updateInterface(Interface *i){

   QListViewItem *item = NULL;

   

-  // See if we already have it

+  // Find the interface, making it if needed.

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

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

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

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

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

       if(it.key()->isOwner(i))

         i->setModuleOwner(it.key());

     }

-    

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

+ 

+  // Update the icons and information 

+  item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));

  

   QString typeName = "lan";

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

     typeName = "lo";

   if(i->getInterfaceName().contains("irda"))

     typeName = "irda";

   if(i->getInterfaceName().contains("wlan"))

     typeName = "wlan";

   // Actually try to use the Module

-  if(i->getModuleOwner() != NULL){

+  if(i->getModuleOwner() != NULL)

     typeName = i->getModuleOwner()->getPixmapName(i);

-  }

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

-  item->setPixmap(1, type);

-

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

   

+  item->setPixmap(1, (Resource::loadPixmap(typeName)));

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

+  item->setText(3, (i->getStatus()) ? i->getIp() : QString(""));

 }

 

 /**

  * Adds a new profile to the list of profiles.

  * Don't add profiles that already exists.

- * Appends to the combo and QStringList

+ * Appends to the list and QStringList

  */ 

 void MainWindowImp::addProfile(){

-  QString newProfileName = "New";

+  NameDialog foo(this, "namedialog", true);

+  QString newProfileName = foo.go();

+  if(newProfileName.length() == 0)

+    return;

+  

   if(profiles.grep(newProfileName).count() > 0){

-    QMessageBox::information(this, "Can't Add.","Profile already exists.", "Ok");

+    QMessageBox::information(this, "Can't Add","Profile already exists.", "Ok");

     return;

   }

   profiles.append(newProfileName);

   profilesList->insertItem(newProfileName);

-

 }

 

 /**

  * Removes the currently selected profile in the combo.

  * Doesn't delete if there are less then 2 profiles.

  */

diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index ba70180..e146eb4 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -1,10 +1,10 @@
 TEMPLATE	= app
 #CONFIG		= qt warn_on debug
 CONFIG		= qt warn_on release
-HEADERS		= mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h  kprocctrl.h module.h  kprocess.h
-SOURCES		= main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
+HEADERS		= mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h  kprocctrl.h module.h  kprocess.h namedialog.h
+SOURCES		= main.cpp namedialog.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
 #INCLUDEPATH	+= $(QPEDIR)/include
 #DEPENDPATH	+= $(QPEDIR)/include
 LIBS            += -lqpe
 INTERFACES	= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
 TARGET		= networksetup
diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp
index 5b21364..1f32093 100644
--- a/noncore/settings/networksettings/interface.cpp
+++ b/noncore/settings/networksettings/interface.cpp
@@ -1,9 +1,10 @@
 #include "interface.h"
 #include <qdatetime.h>
 #include <qfile.h>
+#include <qdir.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 
 #define IFCONFIG "/sbin/ifconfig"
 #define HDCP_INFO_DIR "/etc/dhcpc"
 
@@ -124,15 +125,20 @@ bool Interface::refresh(){
   // DHCP TESTING
   // reset DHCP info
   dhcpServerIp = "";
   leaseObtained = "";
   leaseExpires = "";
   dhcp = false;
-    
+   
+  QString dhcpDirectory(HDCP_INFO_DIR);
+  QDir d(dhcpDirectory);
+  if(!d.exists(dhcpDirectory))
+    dhcpDirectory = "/var/run";
+  
   // See if we have 
-  QString dhcpFile(QString(HDCP_INFO_DIR "/dhcpcd-%1.info").arg(interfaceName));
+  QString dhcpFile(QString(dhcpDirectory+"/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);
@@ -145,25 +151,25 @@ bool Interface::refresh(){
   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("DHCPSIADDR="))
+      dhcpServerIp = line.mid(11, 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));
+  dhcpFile = (QString(dhcpDirectory+"/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;
   }
 
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index f5b104a..3538aeb 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -42,13 +42,13 @@
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Widget3</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
-                    <string>Interfaces</string>
+                    <string>Connections</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>0</number>
                     </property>
@@ -97,12 +97,26 @@
                             </property>
                             <property>
                                 <name>resizeable</name>
                                 <bool>true</bool>
                             </property>
                         </column>
+                        <column>
+                            <property>
+                                <name>text</name>
+                                <string>IP</string>
+                            </property>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
+                            </property>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
+                            </property>
+                        </column>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>connectionList</cstring>
                         </property>
                         <property stdset="1">
                             <name>allColumnsShowFocus</name>
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 66ec8b5..e9429e3 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -2,12 +2,13 @@
 #include "addconnectionimp.h"

 #include "interfaceinformationimp.h"

 #include "interfacesetupimp.h"

 #include "module.h"

 

 #include "kprocess.h"

+#include "namedialog.h"

 

 #include <qpushbutton.h>

 #include <qtabwidget.h>

 #include <qlistbox.h>

 #include <qlistview.h>

 #include <qheader.h>

@@ -125,49 +126,69 @@ Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString)
  * 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())

+    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.", "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){

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

+	  updateInterface(i);

+	}

+      }

+    }

   }

 }

 

 /**

  * 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 = connectionList->currentItem();

-  if(item == NULL) {

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

-     return; 

+  if(!item) {

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

+    return; 

   }

   

-  if((interfaceItems[item])->getModuleOwner() == NULL){

+  Interface *i = interfaceItems[item];

+  if(i->getModuleOwner() == NULL){

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

   }

   else{

-    // Try to remove. 

+    if(!i->getModuleOwner()->remove(i))

+      QMessageBox::information(this, "Error", "Unable to remove.", "Ok");

+    else{

+      QMessageBox::information(this, "Success", "Interface was removed.", "Ok");

+      // TODO memory managment....

+      // who deletes the interface?

+    }

   }

-

 }

 

 /**

  * Pull up the configure about the currently selected interface.

  * Report an error if no interface is selected.

  * If the interface has a module owner then request its configure with a empty

@@ -308,71 +329,69 @@ void MainWindowImp::jobDone(KProcess *process){
   }

   file.close();

   QFile::remove(fileName);

 } 

 

 /**

- *

+ * Update this interface.  If no QListViewItem exists create one.

+ * @param Interface* pointer to the interface that needs to be updated.

  */ 

 void MainWindowImp::updateInterface(Interface *i){

   QListViewItem *item = NULL;

   

-  // See if we already have it

+  // Find the interface, making it if needed.

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

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

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

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

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

       if(it.key()->isOwner(i))

         i->setModuleOwner(it.key());

     }

-    

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

+ 

+  // Update the icons and information 

+  item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));

  

   QString typeName = "lan";

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

     typeName = "lo";

   if(i->getInterfaceName().contains("irda"))

     typeName = "irda";

   if(i->getInterfaceName().contains("wlan"))

     typeName = "wlan";

   // Actually try to use the Module

-  if(i->getModuleOwner() != NULL){

+  if(i->getModuleOwner() != NULL)

     typeName = i->getModuleOwner()->getPixmapName(i);

-  }

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

-  item->setPixmap(1, type);

-

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

   

+  item->setPixmap(1, (Resource::loadPixmap(typeName)));

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

+  item->setText(3, (i->getStatus()) ? i->getIp() : QString(""));

 }

 

 /**

  * Adds a new profile to the list of profiles.

  * Don't add profiles that already exists.

- * Appends to the combo and QStringList

+ * Appends to the list and QStringList

  */ 

 void MainWindowImp::addProfile(){

-  QString newProfileName = "New";

+  NameDialog foo(this, "namedialog", true);

+  QString newProfileName = foo.go();

+  if(newProfileName.length() == 0)

+    return;

+  

   if(profiles.grep(newProfileName).count() > 0){

-    QMessageBox::information(this, "Can't Add.","Profile already exists.", "Ok");

+    QMessageBox::information(this, "Can't Add","Profile already exists.", "Ok");

     return;

   }

   profiles.append(newProfileName);

   profilesList->insertItem(newProfileName);

-

 }

 

 /**

  * Removes the currently selected profile in the combo.

  * Doesn't delete if there are less then 2 profiles.

  */

diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index ba70180..e146eb4 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -1,10 +1,10 @@
 TEMPLATE	= app
 #CONFIG		= qt warn_on debug
 CONFIG		= qt warn_on release
-HEADERS		= mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h  kprocctrl.h module.h  kprocess.h
-SOURCES		= main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
+HEADERS		= mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h  kprocctrl.h module.h  kprocess.h namedialog.h
+SOURCES		= main.cpp namedialog.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp  interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
 #INCLUDEPATH	+= $(QPEDIR)/include
 #DEPENDPATH	+= $(QPEDIR)/include
 LIBS            += -lqpe
 INTERFACES	= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
 TARGET		= networksetup