Index: sources/wifi/WifiInterface.h
===================================================================
diff -u -r66506a15ac0234c0a2fcf78d3262fdb91c51cbca -r7f61c3b45a50145fe5c245018d481d6266166fa6
--- sources/wifi/WifiInterface.h	(.../WifiInterface.h)	(revision 66506a15ac0234c0a2fcf78d3262fdb91c51cbca)
+++ sources/wifi/WifiInterface.h	(.../WifiInterface.h)	(revision 7f61c3b45a50145fe5c245018d481d6266166fa6)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    WifiInterface.h
- * \author  (last)      Peter Lucia
- * \date    (last)      16-Apr-2021
- * \author  (original)  Peter Lucia
- * \date    (original)  16-Apr-2021
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      02-Feb-2023
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  11-May-2021
  *
  */
 #pragma once
@@ -54,6 +54,8 @@
     int     _scanTimeout = 30000;
     int     _processCounter = 0;
     int     _dhcpAttemptsLeft = 5;
+    const quint8 _dhcpAttempts = 5;
+
     QProcess _processScan;
     QProcess _processDisconnectNetwork;
     QProcess _processReadIPSettings;
@@ -68,9 +70,8 @@
     QProcess _processSetDNS;
     WifiNetworkData _network;
 
-    const QString _scriptsFolder         = Storage::Scripts_Path_Name;
     const QString _iface                 = "wlan0";
-    const QString _wpaSupplicantConfPath = "/etc/wpa_supplicant.conf";
+    const QString _wpaSupplicantConfPath = QString("/etc/wpa_supplicant/wpa_supplicant-%1.conf").arg(_iface);
 
 // Singleton
 SINGLETON(WifiInterface)
@@ -93,12 +94,10 @@
     QStringList securityTypesToStringList(const QList<MWifiNetwork::SECURITY_TYPE> &securityTypes);
     QList<MWifiNetwork::SECURITY_TYPE> variantListToSecurityTypes(const QList<QVariant> &securityTypesVar);
 
-public:
-    void start();
-
 public slots:
     bool init(QThread &vThread);
     bool init();
+    void quit();
 
     void doScan                     ();
     void doJoinNetwork              (const WifiNetworkData &vNetwork, const QString &vPassword);
@@ -131,8 +130,6 @@
     void didError                   (const QString         &);
 
 private slots:
-    void quit();
-    void onStart();
     void onStatusChanged(const QString &vMessage);
     void onRequestAutoAssignedIP();
     void onProcessFinishedScan                  (int vExitCode, QProcess::ExitStatus vExitStatus);
@@ -147,4 +144,6 @@
     void onProcessFinishedSetGateway            (int vExitCode, QProcess::ExitStatus vExitStatus);
     void onProcessFinishedSetSubnetMask         (int vExitCode, QProcess::ExitStatus vExitStatus);
     void onProcessFinishedSetDNS                (int vExitCode, QProcess::ExitStatus vExitStatus);
+
+    SAFE_CALL(doStart)
 };