async processes now call dbus connect service only after they complete

Author: andrew-bibb

apps/cmstapp/code/control_box/controlbox.cpp

@@ -155,6 +155,7 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
   settings = new QSettings(ORG, APP, this);
   notifyclient = NULL;
   onlineobjectpath.clear();
+  pendingobjectpath.clear();
   socketserver = new QLocalServer(this);
   socketserver->removeServer(SOCKET_NAME);  // remove any files that may have been left after a crash
   socketserver->listen(SOCKET_NAME);
@@ -739,6 +740,11 @@ void ControlBox::connectPressed()
     return;
   }
 
+//Because of single selection mode list can only have 0 or 1 items in it.
+  if (qtw == ui.tableWidget_wifi) pendingobjectpath = wifi_list.at(list.at(0)->row()).objpath.path();
+    else if (qtw == ui.tableWidget_vpn) pendingobjectpath = vpn_list.at(list.at(0)->row()).objpath.path();
+      else pendingobjectpath.clear();
+
   // execute external program if specified
   if (! ui.lineEdit_beforeconnect->text().isEmpty() ) {
     if (list.at(0)->text() == ui.comboBox_beforeconnectserviceslist->currentText() ) {
@@ -750,29 +756,30 @@ void ControlBox::connectPressed()
       if (ui.checkBox_modifyservicefile->isChecked()) {
 	GEN_Editor* gened = new GEN_Editor(this);
 	gened->editInPlace(ui.comboBox_beforeconnectservicefile->currentText(), cmd, args);
-	//delete gened;	  
+	connect (gened, SIGNAL(finished(int)), this, SLOT(requestConnection()));
+//	gened->deleteLater();
       } // program does require a root helper 
       else {
 	QProcess* proc = new QProcess(this);
 	proc->startDetached(cmd, args);
-	proc->waitForFinished(); // could be dangerous - will block until finished or timeout at 30 seconds
-	delete proc;
+	connect (proc, SIGNAL(finished(int)), this, SLOT(requestConnection()));
+//	proc->deleteLater();
       } // program does not require root helper
     } // if service is correct 
   } // if there is a command to execute
-     
 
-  // now request the connection.  Because of single selection mode list can only have 0 or 1 items in it.
-  QDBusInterface* iface_serv = NULL;
+  // else request the connection now
+  else requestConnection();
 
-  if (qtw == ui.tableWidget_wifi) {
-    iface_serv = new QDBusInterface(DBUS_CON_SERVICE, wifi_list.at(list.at(0)->row()).objpath.path(), "net.connman.Service", QDBusConnection::systemBus(), this);
-  }
-  else if (qtw == ui.tableWidget_vpn) {
-    iface_serv = new QDBusInterface(DBUS_CON_SERVICE, vpn_list.at(list.at(0)->row()).objpath.path(), "net.connman.Service", QDBusConnection::systemBus(), this);
-  }
-  else return;  // really not needed
+  return;
+}     
+
+//
+// Slot to actually request a connection via DBUS.  Called from the connectPressed() slot
+void ControlBox::requestConnection() {
+  QDBusInterface* iface_serv = NULL;
 
+  iface_serv = new QDBusInterface(DBUS_CON_SERVICE, pendingobjectpath, "net.connman.Service", QDBusConnection::systemBus(), this);
   iface_serv->setTimeout(5);  // need a short timeout to get the Agent
   QDBusMessage reply = iface_serv->call(QDBus::AutoDetect, "Connect");
   if (reply.errorName() != "org.freedesktop.DBus.Error.NoReply") shared::processReply(reply);

apps/cmstapp/code/control_box/controlbox.h

@@ -144,11 +144,11 @@ class ControlBox : public QDialog
     bool b_usemate;
     QSettings* settings;
     QString onlineobjectpath;
+    QString pendingobjectpath;
     QLocalServer* socketserver;
     QColor trayiconbackground;
     IconManager* iconman;
     float f_connmanversion;
-    int conn_type;
 
   // functions
     int managerRescan(const int& srv = 0);
@@ -178,6 +178,7 @@ class ControlBox : public QDialog
     void enableMoveButtons(int,int);
     void counterUpdated(const QDBusObjectPath&, const QString&, const QString&);
     void connectPressed();
+    void requestConnection();
     void disconnectPressed();
     void removePressed();
     void dbsPropertyChanged(QString,QDBusVariant);

apps/cmstapp/code/gen_conf_ed/gen_conf_ed.cpp

@@ -36,7 +36,15 @@ DEALINGS IN THE SOFTWARE.
 # include "./gen_conf_ed.h"
 # include "../resource.h"
 # include "./code/trstring/tr_strings.h"
-  
+
+// Function to execute a process which may modify a /cmst/config file
+// in /var/lib/connman or /var/lib/connman-vpn.  It will send a finished(int) 
+// signal when completed.  Exit codes:
+//  negative number = this function never really executed
+//  0 = everything completed normally
+//  1 = one of the DBUS calls failed to complete
+//  2 = the external process failed to start 
+//  3 = the external process returned a nonzero exit code
 //
 //  Constructor  
 GEN_Editor::GEN_Editor(QWidget* parent) : QWidget(parent)
@@ -47,12 +55,12 @@ GEN_Editor::GEN_Editor(QWidget* parent) : QWidget(parent)
   path.clear();
   process.clear();
   args.clear();
-  filecontents.clear();
-  finished = false;
+  filecontents.clear();\
+  proc = NULL;
 
   // signals and slots
   connect(this, SIGNAL(readCompleted()), this, SLOT(executeProcess()));
-  connect(this, SIGNAL(processCompleted()), this, SLOT(editContents())); 
+  
   return;
  }
 
@@ -131,49 +139,65 @@ void GEN_Editor::storeContents(const QString& data)
 }
 
 //
-// Slot to execute the process.  This blocks untill the the process is complete or timeouts
-// connected to the readCompleted signal emited by storeContents
+// Slot to execute the process.  
 void GEN_Editor::executeProcess()
 {
-  QProcess* proc = new QProcess(this);
+  proc = new QProcess(this);
   proc->start(process, args);
-  if (! proc->waitForStarted() ) return;
-
-  if (! proc->waitForFinished()) return;
+  if (! proc->waitForStarted() ) {
+    emit finished(2);
+    return;
+  }
 
-  changed = QString(proc->readAll()).split('\n');
-  emit processCompleted();
+  connect (proc, SIGNAL(finished(int)), this, SLOT(processExitCode(int)));
 
   return; 
+
+}
+
+//
+// Slot to process the return codes from executeProcess
+void GEN_Editor::processExitCode(int exitcode)
+{
+  if (exitcode == 0) {
+    changed = QString(proc->readAll()).split('\n');
+    editBuffer();   
+  }
+  else
+    emit (finished(3));
+
+  return;
 }
+ 
 
 //
-//  Slot to edit the contents of the config file.  Connected to the processCompleted
-//  signal emited by executeProcess
-void GEN_Editor::editContents()
+//  Slot to edit the buffer containing the contents of the config file.  Connected to  processExitCode() function
+void GEN_Editor::editBuffer()
 {
-  if (changed.size() <= 0 ) return;
-
-  for (int i = 0; i < filecontents.size(); ++i) {
-    if (filecontents.at(i).size() == 0) {
-      filecontents.removeAt(i);
-      continue;
-      }
-    for (int j = 0; j < changed.size(); ++j) {
-      if (changed.at(j).size() == 0) {
-	changed.removeAt(j);
+  if (changed.size() > 0 ) {
+    for (int i = 0; i < filecontents.size(); ++i) {
+      if (filecontents.at(i).size() == 0) {
+	filecontents.removeAt(i);
 	continue;
 	}
-      if(filecontents.at(i).split('=').at(0).simplified() == changed.at(j).split('=').at(0).simplified()) {
-	filecontents.removeAt(i);
-	filecontents.insert(i, changed.at(j));
-	changed.removeAt(j);
-      }	// if
-    }// j for
-  } // i for
-  if (changed.size() > 0) filecontents.append(changed);
-  
-  this->writeFile();
+      for (int j = 0; j < changed.size(); ++j) {
+	if (changed.at(j).size() == 0) {
+	  changed.removeAt(j);
+	  continue;
+	  }
+	if(filecontents.at(i).split('=').at(0).simplified() == changed.at(j).split('=').at(0).simplified()) {
+	  filecontents.removeAt(i);
+	  filecontents.insert(i, changed.at(j));
+	  changed.removeAt(j);
+	}	// if
+      }// j for
+    } // i for
+    if (changed.size() > 0) filecontents.append(changed);
+    
+    this->writeFile();
+  } // if we changed something
+
+  else emit finished(0);
 
   return;
 }
@@ -195,9 +219,7 @@ void GEN_Editor::writeCompleted(qint64 bytes)
       msg = tr("%L1 Bytes written").arg(bytes);
   }
 
-  finished = true;
-
-  qDebug() <<  msg;
+  emit finished(0);
 
   return;
 }
@@ -212,7 +234,7 @@ void GEN_Editor::callbackErrorHandler(QDBusError err)
     QMessageBox::Ok,
     QMessageBox::Ok);
 
-  finished = true;
+  emit finished(1);
 
   return;
 }

apps/cmstapp/code/gen_conf_ed/gen_conf_ed.h

@@ -42,7 +42,6 @@ class GEN_Editor : public QWidget
   public:
     GEN_Editor(QWidget*);
     void editInPlace(const QString&, const QString&, const QStringList&);
-    inline bool isFinished() {return finished;}
 
   private:  
   // members
@@ -52,7 +51,7 @@ class GEN_Editor : public QWidget
     QString process;
     QStringList args;
     QStringList changed;
-    bool finished;
+    QProcess* proc;
 
   //functions  
     void readFile();
@@ -61,13 +60,14 @@ class GEN_Editor : public QWidget
   private slots:
     void storeContents(const QString&);
     void executeProcess();
-    void editContents();
+    void processExitCode(int);
+    void editBuffer();
     void writeCompleted(qint64);
     void callbackErrorHandler(QDBusError);
 
   signals:
     void readCompleted();
-    void processCompleted();
+    void finished(int exitcode = -1);
 
 };
 

apps/resource.h

@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
 ///////////////////////////////// Program Values ///////////////////////
 //
 // Program Info (may be visible, but don't mark for tranalation) 
-#define VERSION "2020.03.22-1"
+#define VERSION "2020.03.23-1"
 
 #define RELEASE_DATE "7 March 2020"
 #define COPYRIGHT_DATE "2013-2020"