10 files changed, 105 insertions, 128 deletions

diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index b5c41bf..23b3d44 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -1,4 +1,5 @@
 #include <qpe/qpeapplication.h>
-#include <asdevice.h>
+#include <resources.h>
+#include <netnode.h>
 #include "network_NN.h"
 #include "network_NNI.h"
@@ -9,8 +10,16 @@ static const char * NetworkNeeds[] =
     };
 
+static const char * NetworkProvides[] = 
+    { "connection",
+      0
+    };
+
 /**
  * Constructor, find all of the possible interfaces
  */
 NetworkNetNode::NetworkNetNode() : ANetNode(tr("IP Configuration")) {
+
+      NSResources->addSystemFile(
+        "interfaces", "/etc/network/interfaces", 1 );
 }
 
@@ -33,29 +42,32 @@ ANetNodeInstance * NetworkNetNode::createInstance( void ) {
 }
 
-bool NetworkNetNode::hasDataForFile( const QString & S ) {
-      return S == "interfaces";
+bool NetworkNetNode::hasDataForFile( SystemFile & S ) {
+      return S.name() == "interfaces";
 }
 
-short NetworkNetNode::generateFile( const QString & ID,
-                                   const QString & ,
-                                   QTextStream & TS, 
+short NetworkNetNode::generateFile( SystemFile & SF, 
                                    ANetNodeInstance * NNI,
                                    long DevNr ) {
                                    
+      if( DevNr < 0 ) {
+        // generate device specific but common part
+        return 1;
+      }
+
       QString NIC = NNI->runtime()->device()->netNode()->nodeClass()->genNic( DevNr );
 
-      if( ID == "interfaces" ) {
-        Log(("Generate entry for %s in %s\n", NIC.latin1(), ID.latin1() ));
+      if( SF.name() == "interfaces" ) {
+        Log(("Generate entry for %s in %s\n", NIC.latin1(), SF.name().latin1() ));
         // generate mapping stanza for this interface
-        TS << "# check if " 
+        SF << "# check if " 
            << NIC 
            << " can be brought UP" 
            << endl;
-        TS << "mapping " 
+        SF << "mapping " 
            << NIC 
            << endl;
-        TS << "  script "
+        SF << "  script "
            << QPEApplication::qpeDir()
-           << "/bin/networksettings2-request" 
+           << "bin/networksettings2-request" 
            << endl 
            << endl;
@@ -69,6 +81,6 @@ const char ** NetworkNetNode::needs( void ) {
 }
 
-const char * NetworkNetNode::provides( void ) {
-      return "connection";
+const char ** NetworkNetNode::provides( void ) {
+      return NetworkProvides;
 }
 
diff --git a/noncore/settings/networksettings2/network/network_NN.h b/noncore/settings/networksettings2/network/network_NN.h
index 745d1a7..b063d4c 100644
--- a/noncore/settings/networksettings2/network/network_NN.h
+++ b/noncore/settings/networksettings2/network/network_NN.h
@@ -15,9 +15,7 @@ public:
       virtual ~NetworkNetNode();
 
-      virtual bool hasDataForFile( const QString & S );
+      virtual bool hasDataForFile( SystemFile & S );
 
-      virtual short generateFile( const QString & ID,
-                                 const QString & Path,
-                                 QTextStream & TS, 
+      virtual short generateFile( SystemFile & TS, 
                                  ANetNodeInstance * NNI,
                                  long DevNr );
@@ -28,5 +26,5 @@ public:
       virtual ANetNodeInstance * createInstance( void );
       virtual const char ** needs( void );
-      virtual const char * provides( void );
+      virtual const char ** provides( void );
 
 private:
diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp
index 324c6e2..78e6545 100644
--- a/noncore/settings/networksettings2/network/network_NNI.cpp
+++ b/noncore/settings/networksettings2/network/network_NNI.cpp
@@ -1,4 +1,4 @@
 #include <system.h>
-#include <asdevice.h>
+#include <netnode.h>
 #include "networkedit.h"
 #include "network_NNI.h"
@@ -100,13 +100,11 @@ void ANetwork::commit( void ) {
 }
 
-bool ANetwork::hasDataForFile( const QString & S ) {
-      return S == "interfaces";
+bool ANetwork::hasDataForFile( SystemFile & S ) {
+      return S.name() == "interfaces";
 }
 
-short ANetwork::generateFile( const QString & ID,
-                             const QString & Path,
-                             QTextStream &TS,
-                             long DevNr 
-                           ) {
+short ANetwork::generateFile( SystemFile &SF,
+                               long DevNr 
+                             ) {
 
     short rvl, rvd ;
@@ -114,9 +112,9 @@ short ANetwork::generateFile( const QString & ID,
 
     rvl = 1;
-    if( ID == "interfaces" ) {
-      Log(("Generate Network for %s\n", ID.latin1() ));
+    if( SF.name() == "interfaces" ) {
+      Log(("Generate Network for %s\n", SF.name().latin1() ));
       // we can safely call from here since device item is deeper
       if( Data.UseDHCP ) {
-        TS << "iface " 
+        SF << "iface " 
            << NIC 
            << "-c" 
@@ -124,5 +122,5 @@ short ANetwork::generateFile( const QString & ID,
            << "-allowed inet dhcp" 
            << endl;
-        TS << "  up echo \"" 
+        SF << "  up echo \"" 
            << NIC 
            << "\" > /tmp/profile-" 
@@ -131,20 +129,20 @@ short ANetwork::generateFile( const QString & ID,
            << endl;
         if( Data.SendHostname ) {
-          TS << "  hostname "
+          SF << "  hostname "
              << Data.Hostname  
              << endl;
         }
 
-        TS << "  down rm -f /tmp/profile-" 
+        SF << "  down rm -f /tmp/profile-" 
            << connection()->number() 
            << ".up"
            << endl;
       } else {
-        TS << "iface " 
+        SF << "iface " 
            << NIC << "-c" 
            << connection()->number() 
            << "-allowed inet static" 
            << endl;
-        TS << "  up echo \"" 
+        SF << "  up echo \"" 
            << NIC 
            << "\" > /tmp/profile-" 
@@ -152,15 +150,15 @@ short ANetwork::generateFile( const QString & ID,
            << ".up" 
            << endl;
-        TS << "  down rm -f /tmp/profile-" 
+        SF << "  down rm -f /tmp/profile-" 
            << connection()->number() 
            << ".up" 
            << endl;
-        TS << "  address   " 
+        SF << "  address   " 
            << Data.IPAddress 
            << endl;
-        TS << "  broadcast " 
+        SF << "  broadcast " 
            << Data.Broadcast 
            << endl;
-        TS << "  netmask   " 
+        SF << "  netmask   " 
            << Data.NetMask 
            << endl;
@@ -176,5 +174,5 @@ short ANetwork::generateFile( const QString & ID,
               arg( ipal[2].toShort() & nmal[2].toShort() ).
               arg( ipal[3].toShort() & nmal[3].toShort() );
-          TS << "  network   " 
+          SF << "  network   " 
              << NW 
              << endl;
@@ -184,5 +182,5 @@ short ANetwork::generateFile( const QString & ID,
             it != Data.PreUp_SL.end(); 
             ++it ) {
-        TS << "  pre-up    " 
+        SF << "  pre-up    " 
            << (*it) 
            << endl;
@@ -191,5 +189,5 @@ short ANetwork::generateFile( const QString & ID,
             it != Data.PostUp_SL.end(); 
             ++it ) {
-        TS << "  up        " 
+        SF << "  up        " 
            << (*it) 
            << endl;
@@ -198,5 +196,5 @@ short ANetwork::generateFile( const QString & ID,
             it != Data.PreDown_SL.end(); 
             ++it ) {
-        TS << "  down      " 
+        SF << "  down      " 
            << (*it) 
            << endl;
@@ -205,5 +203,5 @@ short ANetwork::generateFile( const QString & ID,
             it != Data.PostDown_SL.end(); 
             ++it ) {
-        TS << "  post-down " 
+        SF << "  post-down " 
            << (*it) 
            << endl;
@@ -213,5 +211,5 @@ short ANetwork::generateFile( const QString & ID,
 
     // embed other info in it
-    rvd = connection()->getToplevel()->generateFileEmbedded( ID, Path, TS, DevNr );
+    rvd = connection()->getToplevel()->generateFileEmbedded( SF, DevNr );
 
     return (rvd == 2 || rvl == 2 ) ? 2 :
diff --git a/noncore/settings/networksettings2/network/network_NNI.h b/noncore/settings/networksettings2/network/network_NNI.h
index 5e42503..71c276a 100644
--- a/noncore/settings/networksettings2/network/network_NNI.h
+++ b/noncore/settings/networksettings2/network/network_NNI.h
@@ -28,9 +28,7 @@ public :
         { return (void *)&Data; }
 
-      virtual bool hasDataForFile( const QString & S );
-      virtual short generateFile( const QString & ID,
-                                 const QString & Path,
-                                 QTextStream &TS,
-                                 long DevNr );
+      virtual bool hasDataForFile( SystemFile & SF );
+      virtual short generateFile( SystemFile &TS,
+                                   long DevNr );
 
 protected :
@@ -42,5 +40,5 @@ private :
 
       NetworkEdit * GUI;
-      NetworkData_t Data;
+      NetworkData Data;
       NetworkRun * RT;
 };
diff --git a/noncore/settings/networksettings2/network/networkdata.h b/noncore/settings/networksettings2/network/networkdata.h
index 2c5da37..1df9dc4 100644
--- a/noncore/settings/networksettings2/network/networkdata.h
+++ b/noncore/settings/networksettings2/network/networkdata.h
@@ -4,5 +4,6 @@
 #include <qstring.h>
 #include <qstringlist.h>
-typedef struct NetworkData {
+class NetworkData {
+public :
       bool UseDHCP;
       QString Hostname;
@@ -18,5 +19,5 @@ typedef struct NetworkData {
       QStringList PreDown_SL;
       QStringList PostDown_SL;
-} NetworkData_t; 
+} ; 
 
 #endif
diff --git a/noncore/settings/networksettings2/network/networkedit.cpp b/noncore/settings/networksettings2/network/networkedit.cpp
index 05110d9..d13cb66 100644
--- a/noncore/settings/networksettings2/network/networkedit.cpp
+++ b/noncore/settings/networksettings2/network/networkedit.cpp
@@ -66,5 +66,5 @@ QString NetworkEdit::acceptable( void ) {
 }
 
-bool NetworkEdit::commit( NetworkData_t & Data ) {
+bool NetworkEdit::commit( NetworkData & Data ) {
     bool SM = 0;
     CBM( Data.UseDHCP, DHCP_CB, SM );
@@ -86,5 +86,5 @@ bool NetworkEdit::commit( NetworkData_t & Data ) {
 }
 
-void NetworkEdit::showData( NetworkData_t & Data ) {
+void NetworkEdit::showData( NetworkData & Data ) {
     DHCP_CB->setChecked( Data.UseDHCP );
     SendHostname_CB->setChecked( Data.SendHostname );
diff --git a/noncore/settings/networksettings2/network/networkedit.h b/noncore/settings/networksettings2/network/networkedit.h
index adc20e0..45635c8 100644
--- a/noncore/settings/networksettings2/network/networkedit.h
+++ b/noncore/settings/networksettings2/network/networkedit.h
@@ -10,6 +10,6 @@ public :
     NetworkEdit( QWidget * parent );
     QString acceptable( void );
-    bool commit( NetworkData_t & Data );
-    void showData( NetworkData_t & Data );
+    bool commit( NetworkData & Data );
+    void showData( NetworkData & Data );
 
 public slots :
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp
index 3e24c5f..c17aa7f 100644
--- a/noncore/settings/networksettings2/network/networkrun.cpp
+++ b/noncore/settings/networksettings2/network/networkrun.cpp
@@ -1,78 +1,51 @@
 #include <system.h>
-#include <asdevice.h>
+#include <netnode.h>
+#include <resources.h>
 #include "networkrun.h"
 
-void NetworkRun::detectState( NodeCollection * NC ) { 
-    RuntimeInfo * RI = netNode()->nextNode()->runtime();
-    AsDevice * Next = RI->asDevice();
-    InterfaceInfo * II = Next->assignedInterface();
+State_t NetworkRun::detectState( void ) { 
+    InterfaceInfo * II = nodeCollection()->assignedInterface();
 
-    if( II ) {
+    Log(( "Interface %p : %d\n", II, (II) ? II->IsUp : 0 ));
+    if( II && II->IsUp ) {
       // device has assigned interface
-      NC->setCurrentState( (( II->IsUp ) ? IsUp : Available) );
-      return;
+      return IsUp;
     }
 
-    Log(( "%s not ! UP or ava\n", NC->name().latin1() ));
-    // has no interface -> delegate
-    RI->detectState( NC );
+    // had no interface or interface is no longer up -> release
+    nodeCollection()->assignInterface( 0 );
+
+    return Unknown;
 }
 
-bool NetworkRun::setState( NodeCollection * NC, Action_t A, bool Force ) { 
+QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { 
     // we handle UP and DOWN
-    RuntimeInfo * RI = netNode()->nextNode()->runtime();
-    AsDevice * Next = RI->asDevice();
-    InterfaceInfo * II = Next->assignedInterface();
+    InterfaceInfo * II = NC->assignedInterface();
 
     if( A == Up ) {
       // we can bring UP if lower level is available
-      if( NC->currentState() == Available || Force ) {
-        QString S;
-        S.sprintf( "ifup %s=%s-c%d-allowed", 
-            II->Name.latin1(), II->Name.latin1(),
-            connection()->number() );
-        NSResources->system().runAsRoot( S );
+      QStringList SL;
+      SL << "ifup"
+         << QString().sprintf( "%s=%s-c%d-allowed",
+                        II->Name.latin1(), II->Name.latin1(),
+                        nodeCollection()->number() );
+      if( ! NSResources->system().runAsRoot( SL ) ) {
+        return QString("Cannot call %1").arg(SL.join(" "));
       }
-      return 1;
-    } else if( A == Down ) {
-      QString S;
-      if( Force ) {
-        Log(("Force mode %d\n", Force ));
-        for( int i = 0; 
-             i < RI->netNode()->nodeClass()->instanceCount(); 
-             i ++ ) {
-          S.sprintf( "ifdown %s", 
-                      RI->netNode()->nodeClass()->genNic( i ).latin1() );
-          NSResources->system().runAsRoot( S );
+      return QString();
+    } 
+
+    if( A == Down ) {
+      QStringList SL;
+      if( II ) {
+        SL << "ifdown"
+           << II->Name.latin1();
+        if( !  NSResources->system().runAsRoot( SL ) ) {
+          return QString( "Cannot call %1" ).arg( SL.join( " " ));
         }
       } else {
-        if( NC->currentState() == IsUp ) {
-          S.sprintf( "ifdown %s=%s-c%d-allowed", 
-              II->Name.latin1(), II->Name.latin1(),
-              connection()->number() );
-          NSResources->system().runAsRoot( S );
-        }
+        Log(( "no interface assigned." ));
       }
-      return 1;
-    } 
-    // delegate
-    return RI->setState( NC, A, Force );
-}
-
-bool NetworkRun::canSetState( State_t Curr, Action_t A ) {
-    // we handle UP and DOWN
-    RuntimeInfo * RI = netNode()->nextNode()->runtime();
-
-    if( A == Up ) {
-      return ( Curr == Available );
-    } else if( A == Down ) {
-      return ( Curr == IsUp );
     } 
-    // delegate
-    return RI->canSetState( Curr, A );
-}
-
-bool NetworkRun::handlesInterface( const QString & S ) {
-    // donno -> pass deeper
-    return netNode()->nextNode()->runtime()->handlesInterface(S);
+    return QString();
 }
diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h
index 522a912..78a1694 100644
--- a/noncore/settings/networksettings2/network/networkrun.h
+++ b/noncore/settings/networksettings2/network/networkrun.h
@@ -1,23 +1,20 @@
-#include <asconnection.h>
+#include <netnode.h>
 #include "networkdata.h"
 
-class NetworkRun  : public AsConnection {
+class NetworkRun  : public RuntimeInfo {
 
 public :
 
       NetworkRun( ANetNodeInstance * NNI, 
-                  NetworkData & Data ) : AsConnection( NNI )
+                  NetworkData & Data ) : RuntimeInfo( NNI )
         { }
 
-      virtual AsConnection * asConnection( void ) 
-        { return (AsConnection *)this; }
+      virtual RuntimeInfo * connection( void ) 
+        { return this; }
 
-protected :
-
-      void detectState( NodeCollection * );
-      bool setState( NodeCollection * ,Action_t A, bool );
-      bool canSetState( State_t , Action_t A );
+      State_t detectState( void );
 
-      bool handlesInterface( const QString & I );
+protected :
 
+      QString setMyState( NodeCollection * , Action_t, bool );
 };
diff --git a/noncore/settings/networksettings2/network/opie-networksettings2plugin-network.control b/noncore/settings/networksettings2/network/opie-networksettings2plugin-network.control
index 3dbb808..7b1056b 100644
--- a/noncore/settings/networksettings2/network/opie-networksettings2plugin-network.control
+++ b/noncore/settings/networksettings2/network/opie-networksettings2plugin-network.control
@@ -1,3 +1,3 @@
-Package: opie-networksettingsplugin2-network
+Package: opie-networksettings2plugin-network
 Files: plugins/networksettings2/libnetwork.so*
 Priority: optional