Do not assume device is Up based on existance of profile-xx file only

3 files changed, 3 insertions, 3 deletions

diff --git a/noncore/settings/networksettings2/lancard/lancardrun.cpp b/noncore/settings/networksettings2/lancard/lancardrun.cpp
index 470b797..8157dce 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.cpp
+++ b/noncore/settings/networksettings2/lancard/lancardrun.cpp
@@ -10,49 +10,49 @@ State_t LanCardRun::detectState( void ) {
     // available : card found and assigned to us or free
     // up : card found and assigned to us and up
 
     NodeCollection * NC = nodeCollection();
     QString S = QString( "/tmp/profile-%1.up" ).
                 arg( NC->number());
     System & Sys = NSResources->system();
     InterfaceInfo * Run;
 
     QFile F( S );
 
     if( F.open( IO_ReadOnly ) ) {
       // could open file -> read interface and assign
       QString X;
       QTextStream TS(&F);
       X = TS.readLine();
       // find interface
       if( handlesInterface( X ) ) {
         for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
              It.current();
              ++It ) {
           Run = It.current();
           if( X == Run->Name ) {
             NC->assignInterface( Run );
-            return IsUp;
+            return (Run->IsUp) ? IsUp : Available;
           }
         }
       }
     } 
 
     if( ( Run = NC->assignedInterface() ) ) {
       // we already have an interface assigned -> still present ?
       if( ! Run->IsUp ) {
         // usb is still free -> keep assignment
         return Available;
       } // else interface is up but NOT us -> some other profile
     }
 
     // nothing (valid) assigned to us
     NC->assignInterface( 0 );
 
     // find possible interface
     for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
          It.current();
          ++It ) {
       Run = It.current();
       if( handlesInterface( *Run ) &&
           ( Run->CardType == ARPHRD_ETHER
 #ifdef ARPHRD_IEEE1394
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp
index de8c8a2..763644e 100644
--- a/noncore/settings/networksettings2/usb/usbrun.cpp
+++ b/noncore/settings/networksettings2/usb/usbrun.cpp
@@ -10,49 +10,49 @@ State_t USBRun::detectState( void ) {
     // available : card found and assigned to us or free
     // up : card found and assigned to us and up
 
     NodeCollection * NC = nodeCollection();
     QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number());
     System & Sys = NSResources->system();
     InterfaceInfo * Run;
     QFile F( S );
     Log(("Detecting for %s\n", NC->name().latin1() ));
 
     if( F.open( IO_ReadOnly ) ) {
       // could open file -> read interface and assign
       QString X;
       QTextStream TS(&F);
       X = TS.readLine();
       Log(("%s exists\n", S.latin1() ));
       // find interface
       if( handlesInterface( X ) ) {
         for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
              It.current();
              ++It ) {
           Run = It.current();
           if( X == Run->Name ) {
             NC->assignInterface( Run );
-            return IsUp;
+            return (Run->IsUp) ? IsUp : Available;
           }
         }
       }
     } 
 
     Log(("Assigned %p\n", NC->assignedInterface() ));
 
     if( ( Run = NC->assignedInterface() ) ) {
       // we already have an interface assigned -> still present ?
       if( ! Run->IsUp ) {
         // usb is still free -> keep assignment
         return Available;
       } // else interface is up but NOT us -> some other profile
     }
 
     // nothing (valid) assigned to us
     NC->assignInterface( 0 );
 
     // find possible interface
     if( getInterface() ) {
       // proper type, and Not UP -> free
       // usb cables are currently always available when requested
       // until we can detect if we are plugged in
       return Available;
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.cpp b/noncore/settings/networksettings2/wlan/wlanrun.cpp
index fe49c4e..b15a560 100644
--- a/noncore/settings/networksettings2/wlan/wlanrun.cpp
+++ b/noncore/settings/networksettings2/wlan/wlanrun.cpp
@@ -10,49 +10,49 @@ State_t WLanRun::detectState( void ) {
     // unavailable : no card found
     // available : card found and assigned to us or free
     // up : card found and assigned to us and up
 
     NodeCollection * NC = nodeCollection();
     QString S = QString( "/tmp/profile-%1.up" ).arg(NC->number());
     System & Sys = NSResources->system();
     InterfaceInfo * Run;
 
     QFile F( S );
 
     if( F.open( IO_ReadOnly ) ) {
       // could open file -> read interface and assign
       QString X;
       QTextStream TS(&F);
       X = TS.readLine();
       // find interface
       if( handlesInterface( X ) ) {
         for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
              It.current();
              ++It ) {
           Run = It.current();
           if( X == Run->Name ) {
             NC->assignInterface( Run );
-            return IsUp;
+            return (Run->IsUp) ? IsUp : Available;
           }
         }
       }
     } 
 
     if( ( Run = NC->assignedInterface() ) ) {
       // we already have an interface assigned -> still present ?
       if( ! Run->IsUp ) {
         // usb is still free -> keep assignment
         return Available;
       } // else interface is up but NOT us -> some other profile
     }
 
     // nothing (valid) assigned to us
     NC->assignInterface( 0 );
 
     // find possible interface
     for( QDictIterator<InterfaceInfo> It(Sys.interfaces());
          It.current();
          ++It ) {
       Run = It.current();
       if( handlesInterface( *Run ) &&
           ( Run->CardType == ARPHRD_ETHER
 #ifdef ARPHRD_IEEE1394