Don't bother with killing bluetooth anymore, since our

/etc/suspend-scripts/S50bluetooth new script does that just when
we need it.  Also, don't forget to shut down Bluetooth when we
started it ourselves and when the authentication is finished (skipped or
successfull). Finally, there's more info in the debug output now.

2 files changed, 58 insertions, 35 deletions

diff --git a/noncore/securityplugins/blueping/bluepingplugin.cpp b/noncore/securityplugins/blueping/bluepingplugin.cpp
index f5d9ad6..1c514e5 100644
--- a/noncore/securityplugins/blueping/bluepingplugin.cpp
+++ b/noncore/securityplugins/blueping/bluepingplugin.cpp
@@ -16,17 +16,19 @@ using Opie::Security::MultiauthPluginObject;
 using Opie::Security::MultiauthConfigWidget;
 
 
 /// standard c'tor
-BluepingPlugin::BluepingPlugin() : MultiauthPluginObject(), m_ping(0), m_bluepingW(0) {
-    bluetoothAlreadyRestarted = false;
+BluepingPlugin::BluepingPlugin() : MultiauthPluginObject(), m_ping(0), m_bluepingW(0), bluetoothWasOff(false) {
 }
 
-/// cleans m_ping if we need to
+/// cleans m_ping and m_bluepingW if we need to
 BluepingPlugin::~BluepingPlugin() {
-    delete m_ping;
+    odebug << "closing Blueping plugin..." << oendl;
+    if (m_ping != 0)
+        delete m_ping;
     if (m_bluepingW != 0)
         delete m_bluepingW;
+    killBluetoothIfNecessary();
 }
 
 /// Simply return its name (Blueping plugin)
 QString BluepingPlugin::pluginName() const {
@@ -38,15 +40,31 @@ MultiauthConfigWidget * BluepingPlugin::configWidget(QWidget * parent) {
     if (m_bluepingW == 0)
         m_bluepingW = new BluepingConfigWidget(parent, "Blueping configuration widget");
     return m_bluepingW;
 }
+
 QString BluepingPlugin::pixmapNameWidget() const {
     return "security/bluepingplugin";
 }
+
 QString BluepingPlugin::pixmapNameConfig() const {
     return "security/bluepingplugin";
 }
 
+/// If Bluetooth was off before the plugin ran, we switch it off again
+void BluepingPlugin::killBluetoothIfNecessary() {
+    if (bluetoothWasOff) {
+        OProcess killB;
+        killB << "killall" << "hciattach";
+        odebug << "killing Bluetooth... (since it was up only for Blueping)" << oendl;
+        if ( !killB.start(OProcess::Block) ) {
+            oerr << "could not kill bluetooth" << oendl;
+        }
+    } else {
+        odebug << "keeping Bluetooth on" << oendl;
+    }
+}
+
 /// Emit the MultiauthPluginObject::Success emitCode
 void BluepingPlugin::success() {
     emit emitCode(MultiauthPluginObject::Success);
 }
@@ -80,20 +98,20 @@ void BluepingPlugin::ping() {
                      this, SLOT(pingFinished(Opie::Core::OProcess*)) );
 }
 
 /// Deals with m_ping result
-    void BluepingPlugin::pingFinished(OProcess * ping) {
-        if ( ping->normalExit() && (ping->exitStatus() == 0) )
-        {
-            odebug << "Successful Bluetooth ping!" << oendl;
-            success();
-        }
-        else
-        {
-            odebug << "Failed Bluetooth ping..." << oendl;
-            failure();
-        }
+void BluepingPlugin::pingFinished(OProcess * ping) {
+    if ( ping->normalExit() && (ping->exitStatus() == 0) )
+    {
+        odebug << "Successful Bluetooth ping!" << oendl;
+        success();
     }
+    else
+    {
+        odebug << "Failed Bluetooth ping... (normalExit: " << ping->normalExit() << ", exitStatus: " << ping->exitStatus() << ")" << oendl;
+        failure();
+    }
+}
 
 /// Make one authentication attempt with this plugin
 /**
  * (very simple "success" / "failure" buttons in a dialog)
@@ -135,19 +153,22 @@ int BluepingPlugin::authenticate() {
         QObject::connect(&pbSkip, SIGNAL(clicked()), this, SLOT(skip()));
         // connect the signal emitting functions to the bluepingDialog done(int) finishing function
         QObject::connect(this, SIGNAL(emitCode(int)), &bluepingDialog, SLOT(done(int)));
 
-        // we can uncomment the following when testing
-        //bluetoothAlreadyRestarted = true;
-        if (!bluetoothAlreadyRestarted)
+
+        
+        /* let's start Bluetooth if it's not running
+         */
+        OProcess checkB;
+        checkB << "pidof" << "hciattach";
+        odebug << "checking if Bluetooth is running..." << oendl;
+        // now we start bluetooth *only* if the previous command works, exits normally, and
+        // it returns a non-null exit code (which means hciattach is not running)
+        if ( checkB.start(OProcess::Block) && checkB.normalExit() && (checkB.exitStatus() != 0) )
         {
-            // we have just started or resumed the device, so Bluetooth has to be (re)started
-            OProcess killB;
-            killB << "killall" << "hciattach";
-            odebug << "killing Bluetooth..." << oendl;
-            if ( !killB.start(OProcess::Block) ) {
-                oerr << "could not kill bluetooth" << oendl;
-            }
+            // remember to switch off Bluetooth once we're finished...
+            bluetoothWasOff = true;
+            odebug << "Bluetooth is not running, we must start it now" << oendl;
 
             OProcess startB;
             switch ( ODevice::inst()->model() ) {
                 case Model_iPAQ_H39xx:
@@ -163,31 +184,32 @@ int BluepingPlugin::authenticate() {
                     break;
             } // end switch on device models
 
             if ( !startB.start(OProcess::Block) ) {
-                oerr << "could not (re)start bluetooth" << oendl;
+                oerr << "could not start Bluetooth" << oendl;
                 return MultiauthPluginObject::Skip;
             }
             else
             {
-                if ( startB.normalExit() && (startB.exitStatus() == 0) )
+                if ( (startB.normalExit()) && (startB.exitStatus() == 0) )
                 {
-                    odebug << "hciattach exited normally."<< oendl;
-                    bluetoothAlreadyRestarted = true;
+                    odebug << "hciattach exited normally, Bluetooth is probably on now, let's wait 500 ms and ping" << oendl;
                     // 500 ms timer, so l2ping won't try to find a route before bluetooth has \em really started
                     QTimer::singleShot( 500, this, SLOT(ping()) );
                 }
                 else
                 {
-                    owarn << "hciattach exited anormally (error code: " << startB.exitStatus() << ")" << oendl;
-                } // end if startBluetooth exit status == 0
+                    owarn << "hciattach exited anormally (normalExit: " << startB.normalExit() << ", exit status: " << startB.exitStatus() << ")" << oendl;
+                    return MultiauthPluginObject::Skip;
+                } // end if startB exited normaly
             } // end if startBluetooth started
         }
         else
         {
             // we don't need to wait, since bluetooth has been started long enough ago
+            odebug << "Bluetooth is already running, we can try to ping now" << oendl;
             ping();
-        } // end if bluetooth not restarted
+        } // end if Bluetooth was off
 
 
         // start the dialog event loop, while the ping is starting (or will start soon) in the background
         return bluepingDialog.exec();
diff --git a/noncore/securityplugins/blueping/bluepingplugin.h b/noncore/securityplugins/blueping/bluepingplugin.h
index b8d6734..56ff22d 100644
--- a/noncore/securityplugins/blueping/bluepingplugin.h
+++ b/noncore/securityplugins/blueping/bluepingplugin.h
@@ -72,12 +72,13 @@ class BluepingPlugin : public QObject, public Opie::Security::MultiauthPluginObj
         void ping();
         void pingFinished(Opie::Core::OProcess * ping);
         
      private:
-        Opie::Core::OProcess *m_ping;
+        void killBluetoothIfNecessary();
+        Opie::Core::OProcess * m_ping;
+        Config * m_config;
         BluepingConfigWidget * m_bluepingW;
-        bool bluetoothAlreadyRestarted;
+        bool bluetoothWasOff;
         QString macToPing;
-
 };
 
 #endif