CONTROL files : changed version string

NS2 many changes and first release of OT2

6 files changed, 60 insertions, 99 deletions

diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.cpp b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
index 20ae7f6..e36f757 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NN.cpp
+++ b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
@@ -2,7 +2,13 @@
 #include "lancard_NNI.h"
 
 static const char * LanCardNeeds[] = 
-    { 0 };
+    { 0
+    };
+
+static const char * LanCardProvides[] = 
+    { "device",
+      0
+    };
 
 /**
  * Constructor, find all of the possible interfaces
@@ -34,8 +40,8 @@ const char ** LanCardNetNode::needs( void ) {
       return LanCardNeeds;
 }
 
-const char * LanCardNetNode::provides( void ) {
-      return "device";
+const char ** LanCardNetNode::provides( void ) {
+      return LanCardProvides;
 }
 
 QString LanCardNetNode::genNic( long nr ) { 
diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.h b/noncore/settings/networksettings2/lancard/lancard_NN.h
index 6882af7..dc7566a 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NN.h
+++ b/noncore/settings/networksettings2/lancard/lancard_NN.h
@@ -25,7 +25,7 @@ public:
     virtual const QString nodeDescription() ;
     virtual ANetNodeInstance * createInstance( void );
     virtual const char ** needs( void );
-    virtual const char * provides( void );
+    virtual const char ** provides( void );
 
     QStringList & addressesOfNIC( void )
       { return NICMACAddresses; }
diff --git a/noncore/settings/networksettings2/lancard/lancarddata.h b/noncore/settings/networksettings2/lancard/lancarddata.h
index c76767f..8f5e2b5 100644
--- a/noncore/settings/networksettings2/lancard/lancarddata.h
+++ b/noncore/settings/networksettings2/lancard/lancarddata.h
@@ -4,10 +4,11 @@
 #include <qstringlist.h>
 #include <qstring.h>
 
-typedef struct LanCardData {
+class LanCardData {
+public :
       bool AnyLanCard;
       QStringList HWAddresses;
 
-} LanCardData_t; 
+} ; 
 
 #endif
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.cpp b/noncore/settings/networksettings2/lancard/lancardrun.cpp
index 1544ddc..470b797 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.cpp
+++ b/noncore/settings/networksettings2/lancard/lancardrun.cpp
@@ -4,13 +4,15 @@
 #include <resources.h>
 #include "lancardrun.h"
 
-void LanCardRun::detectState( NodeCollection * NC ) {
+State_t LanCardRun::detectState( void ) {
 
     // unavailable : no card found
     // available : card found and assigned to us or free
     // up : card found and assigned to us and up
 
-    QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number());
+    NodeCollection * NC = nodeCollection();
+    QString S = QString( "/tmp/profile-%1.up" ).
+                arg( NC->number());
     System & Sys = NSResources->system();
     InterfaceInfo * Run;
 
@@ -28,26 +30,23 @@ void LanCardRun::detectState( NodeCollection * NC ) {
              ++It ) {
           Run = It.current();
           if( X == Run->Name ) {
-            Run->assignNode( netNode() );
-            assignInterface( Run );
-            NC->setCurrentState( IsUp );
-            return;
+            NC->assignInterface( Run );
+            return IsUp;
           }
         }
       }
     } 
 
-    if( ( Run = assignedInterface() ) ) {
+    if( ( Run = NC->assignedInterface() ) ) {
       // we already have an interface assigned -> still present ?
       if( ! Run->IsUp ) {
         // usb is still free -> keep assignment
-        NC->setCurrentState( Available );
-        return;
+        return Available;
       } // else interface is up but NOT us -> some other profile
     }
 
     // nothing (valid) assigned to us
-    assignInterface( 0 );
+    NC->assignInterface( 0 );
 
     // find possible interface
     for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
@@ -63,81 +62,38 @@ void LanCardRun::detectState( NodeCollection * NC ) {
           ! Run->IsUp
         ) {
         // proper type, and Not UP -> free
-        NC->setCurrentState( Off );
-        return;
+        return Off;
       }
     }
     // no free found
 
-    NC->setCurrentState( Unavailable );
-
+    return Unavailable;
 }
 
-bool LanCardRun::setState( NodeCollection * NC, Action_t A, bool ) {
+QString LanCardRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
 
-    // we only handle activate and deactivate
-    switch( A ) {
-      case Activate :
-        { 
-          if( NC->currentState() != Off ) {
-            return 0;
-          }
-          InterfaceInfo * N = getInterface();
-          if( ! N ) {
-            // no interface available
-            NC->setCurrentState( Unavailable );
-            return 0;
-          }
-          // because we were OFF the interface
-          // we get back is NOT assigned
-          N->assignNode( netNode() );
-          assignInterface( N );
-          NC->setCurrentState( Available );
-          return 1;
-        }
-      case Deactivate :
-        if( NC->currentState() == IsUp ) {
-          // bring down first
-          if( ! connection()->setState( Down ) )
-            // could not ...
-            return 0;
-        } else if( NC->currentState() != Available ) {
-          return 1;
-        }
-        assignedInterface()->assignNode( 0 ); // release
-        assignInterface( 0 );
-        NC->setCurrentState( Off );
-        return 1;
-      default :
-        // FT
-        break;
+    if( A == Activate ) {
+      InterfaceInfo * N = getInterface();
+
+      if( ! N ) {
+        // no interface available
+        NC->setCurrentState( Unavailable );
+        return tr("No interface found");
+      }
+
+      // because we were OFF the interface
+      // we get back is NOT assigned
+      NC->assignInterface( N );
+      NC->setCurrentState( Available );
+      return QString();
     }
-    return 0;
-}
 
-bool LanCardRun::canSetState( State_t Curr, Action_t A ) {
-    // we only handle up down activate and deactivate
-    switch( A ) {
-      case Activate :
-        { // at least available 
-          if( Curr == Available ) {
-            return 1;
-          }
-          // or we can make one available
-          InterfaceInfo * N = getInterface();
-          if( ! N || N->assignedNode() != 0 ) {
-            // non available or assigned
-            return 0;
-          }
-          return 1;
-        }
-      case Deactivate :
-        return ( Curr >= Available );
-      default :
-        // FT
-        break;
+    if( A == Deactivate ) {
+      NC->assignInterface( 0 );
+      NC->setCurrentState( Off );
     }
-    return 0;
+
+    return QString();
 }
 
 // get interface that is free or assigned to us
@@ -158,10 +114,10 @@ InterfaceInfo * LanCardRun::getInterface( void ) {
           )
         ) {
         // this is a LAN card
-        if( Run->assignedNode() == netNode() ) {
+        if( Run->assignedConnection() == netNode()->connection() ) {
           // assigned to us
           return Run;
-        } else if( Run->assignedNode() == 0 ) {
+        } else if( Run->assignedConnection() == 0 ) {
           // free
           best = Run;
         }
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.h b/noncore/settings/networksettings2/lancard/lancardrun.h
index b28dda7..57ef3fb 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.h
+++ b/noncore/settings/networksettings2/lancard/lancardrun.h
@@ -1,33 +1,31 @@
 #ifndef LANCARDRUN_H
 #define LANCARDRUN_H
 
-#include <asdevice.h>
+#include <netnode.h>
 #include <qregexp.h>
 #include "lancarddata.h"
 
-class LanCardRun  : public AsDevice {
+class LanCardRun  : public RuntimeInfo {
 
 public :
 
       LanCardRun( ANetNodeInstance * NNI, 
-                  LanCardData & D ) : AsDevice( NNI ),
-                                         Pat( "eth[0-9]" )
-        { Data = &D; }
+                  LanCardData & D ) : RuntimeInfo( NNI ),
+                                      Pat( "eth[0-9]" ) { 
+        Data = &D;
+      }
 
-      virtual AsDevice * device( void ) 
-        { return (AsDevice *)this; }
+      virtual RuntimeInfo * device( void ) 
+        { return this; }
 
-      virtual AsDevice * asDevice( void ) 
-        { return (AsDevice *)this; }
+      bool handlesInterface( const QString & I );
+      bool handlesInterface( const InterfaceInfo & II );
 
-protected :
+      State_t detectState( void );
 
-      void detectState( NodeCollection * NC );
-      bool setState( NodeCollection * NC, Action_t A, bool Force );
-      bool canSetState( State_t Curr, Action_t A );
+protected :
 
-      bool handlesInterface( const QString & I );
-      bool handlesInterface( const InterfaceInfo & II );
+      QString setMyState( NodeCollection * , Action_t, bool );
 
 private :
 
diff --git a/noncore/settings/networksettings2/lancard/opie-networksettings2plugin-lancard.control b/noncore/settings/networksettings2/lancard/opie-networksettings2plugin-lancard.control
index d5aca66..4f87d04 100644
--- a/noncore/settings/networksettings2/lancard/opie-networksettings2plugin-lancard.control
+++ b/noncore/settings/networksettings2/lancard/opie-networksettings2plugin-lancard.control
@@ -1,4 +1,4 @@
-Package: opie-networksettingsplugin2-lancard
+Package: opie-networksettings2plugin-lancard
 Files: plugins/networksettings2/liblancard.so*
 Priority: optional
 Section: opie/settings