Many changes :

  bluetooth and usb seems to work

  added preliminary support for VPN on top of any network

    This version is still very much crippled yet is does DO some
    things

1 files changed, 19 insertions, 7 deletions

diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp
index 41e1c53..3e24c5f 100644
--- a/noncore/settings/networksettings2/network/networkrun.cpp
+++ b/noncore/settings/networksettings2/network/networkrun.cpp
@@ -4,56 +4,68 @@
 
 void NetworkRun::detectState( NodeCollection * NC ) { 
     RuntimeInfo * RI = netNode()->nextNode()->runtime();
     AsDevice * Next = RI->asDevice();
     InterfaceInfo * II = Next->assignedInterface();
 
     if( II ) {
       // device has assigned interface
       NC->setCurrentState( (( II->IsUp ) ? IsUp : Available) );
       return;
     }
 
+    Log(( "%s not ! UP or ava\n", NC->name().latin1() ));
     // has no interface -> delegate
     RI->detectState( NC );
 }
 
 bool NetworkRun::setState( NodeCollection * NC, Action_t A, bool Force ) { 
     // we handle UP and DOWN
     RuntimeInfo * RI = netNode()->nextNode()->runtime();
     AsDevice * Next = RI->asDevice();
     InterfaceInfo * II = Next->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 );
       }
       return 1;
     } else if( A == Down ) {
-      if( NC->currentState() == IsUp || Force ) {
-        QString S;
-        S.sprintf( "ifdown %s=%s-c%d-allowed", 
-            II->Name.latin1(), II->Name.latin1(),
-            connection()->number() );
-        NSResources->system().runAsRoot( S );
+      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 );
+        }
+      } 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 );
+        }
       }
       return 1;
     } 
     // delegate
-    return RI->setState( NC, A );
+    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