macOS fixes, bump year

willbprog127 · web-flow · commit 72a9f3473a9d · 2022-02-14T15:43:36.000-08:00
Fixed so app works on macOS properly and bumped year to 2022.
* fixed breakdown of connection so VNC is closed first, then SSH (when applicable)
diff --git a/src/app.cxx b/src/app.cxx
@@ -1,6 +1,6 @@
 /*
  * app.cxx - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  */
 
 /*
@@ -2009,6 +2009,7 @@ void svHandleThreadConnection (void * data)
           itm->icon = app->iconDisconnectedBigError;
         else
           itm->icon = app->iconNoConnect;
+        
         svHandleListItemIconChange(NULL);
 
         if (itm->isListener == true)
@@ -2079,27 +2080,6 @@ void svHandleThreadCursorChange (void * notUsed)
 }
 
 
-void svHandlePKill (void * itmData)
-{
-    HostItem * itm = static_cast<HostItem *>(itmData);
-
-    if (itm == NULL)
-        return;
-
-    std::string sshKillCommand;
-    int sshKillResult = -1;
-
-    if (itm->sshCommandLine == "")
-        return;
-
-    sshKillCommand = "pkill --full \"" + itm->sshCommandLine + "\"";
-    //printf("%s\n", sshKillCommand.c_str());
-    sshKillResult = system(sshKillCommand.c_str());
-    (void)sshKillResult;
-    //printf("Result: %i\n", sshKillResult);
-}
-
-
 /* create and insert empty listitem if no items were added at startup */
 void svInsertEmptyItem ()
 {
diff --git a/src/app.h b/src/app.h
@@ -1,6 +1,6 @@
 /*
  * app.h - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  */
 
 /*
@@ -262,6 +262,7 @@ class SVSecretInput : public Fl_Secret_Input
 
 /* forward function declarations */
 void svCloseChildWindow (Fl_Widget *, void *);
+void svCloseSSHConnection (void *);
 void svConfigCreateNew ();
 void svConfigReadCreateHostList ();
 void svConfigWrite ();
@@ -270,7 +271,6 @@ void svCreateAppIcons (bool fromAppOptions = false);
 std::string svConvertBooleanToString (bool);
 bool svConvertStringToBoolean (const std::string&);
 void svCreateGUI ();
-void * svCreateSSHConnection(void *);
 void svDebugLog (const std::string&);
 void svDeleteItem (int);
 void svDeselectAllItems ();
@@ -283,7 +283,6 @@ void svHandleLocalClipboard (int, void *);
 void svHandleHostListButtons (Fl_Widget *, void *);
 void svHandleHostListEvents (Fl_Widget *, void *);
 void svHandleMainWindowEvents (Fl_Widget *, void *);
-void svHandlePKill (void *);
 void svPositionWidgets ();
 void svHandleListItemIconChange (void * notUsed);
 void svHandleThreadConnection (void *);
diff --git a/src/consts_enums.h b/src/consts_enums.h
@@ -1,6 +1,6 @@
 /*
  * consts_enums.h - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  */
 
 /*
@@ -38,7 +38,7 @@
 /* constants */
 #define SV_APP_VERSION "0.4.8"
 
-#define SV_CURRENT_YEAR "2021"
+#define SV_CURRENT_YEAR "2022"
 
 #define SV_CONNECTION_TIMEOUT_SECS 30
 #15
diff --git a/src/hostitem.h b/src/hostitem.h
@@ -1,6 +1,6 @@
 /*
  * hostitem.h - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  */
 
 /*
@@ -85,8 +85,8 @@ class HostItem
         hasEnded(false),
         icon(NULL),
         lastErrorMessage(""),
-        sshCommandLine(""),
-        sshWaitTime(5)
+        sshWaitTime(5),
+        sshCmdStream(NULL)
     {}
 
     std::string name;
@@ -128,8 +128,8 @@ class HostItem
     bool hasEnded;
     Fl_Image * icon;
     std::string lastErrorMessage;
-    std::string sshCommandLine;
     int sshWaitTime;
+    FILE * sshCmdStream;
 };
 
 #endif
diff --git a/src/spiritvnc.cxx b/src/spiritvnc.cxx
@@ -1,6 +1,6 @@
 /*
  * spiritvnc.cxx - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  *
  * To God be the glory!  In Jesus name! :-D
  *
diff --git a/src/ssh.cxx b/src/ssh.cxx
@@ -1,6 +1,6 @@
 /*
  * ssh.cxx - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  */
 
 /*
@@ -34,90 +34,79 @@
 
 #include "app.h"
 #include "hostitem.h"
-#include "ssh.h"
 
-#include <pthread.h>
 
+/* close and clean up ssh connection */
+void svCloseSSHConnection (void * itmData)
+{
+    HostItem * itm = static_cast<HostItem *>(itmData);
 
-//#include <array>
-
-
-//void sshExec(const char * cmd, HostItem * itm)
-//{
-    //char buffer[128];
-
-    //FILE * pipe = popen(cmd, "r");
-
-    //if (!pipe) //throw std::runtime_error("popen() failed!");
-        //return;
-
-    //while (fgets(buffer, sizeof buffer, pipe) != NULL)
-    //{
-        //itm->sshCommandOutput.append(buffer);
-    //}
+    if (itm == NULL || itm->sshCmdStream == NULL)
+        return;
 
-    //pclose(pipe);
+    int sshKillResult = -1;
+    
+    fprintf(itm->sshCmdStream, "%s\n", "exit");    
+    fflush(itm->sshCmdStream);  
+    
+    sshKillResult = pclose(itm->sshCmdStream);
 
-    //return;
-//}
+    (void)sshKillResult;
+}
 
 
 /* create ssh session and ssh forwarding */
-/* (this is called as a thread because it blocks) */
-void * svCreateSSHConnection (void * data)
+void svCreateSSHConnection (void * data)
 {
-    pthread_detach(pthread_self());
-
+    std::string sshCommandLine;
     std::string strError;
 
     HostItem * itm = static_cast<HostItem *>(data);
 
     if (itm == NULL)
-        return SV_RET_VOID;
+        return;
 
-    std::string sshCheck = "which " + app->sshCommand + " > /dev/null";
+    std::string sshCheck = "which " + app->sshCommand + "5 > /dev/null";
 
     // first check to see if the ssh command is working
     if (system(sshCheck.c_str()) != 0)
     {
         fl_beep(FL_BEEP_DEFAULT);
-        svMessageWindow("Error: The SSH command doesn't work.\n\nCheck that the SSH client "
-            "is installed", "SpiritVNC - FLTK");
+        svMessageWindow("Error: This connection requires SSH and \nthe SSH command isn't working."
+            "\n\nCheck that the SSH client program is installed", "SpiritVNC - FLTK");
 
         svLogToFile("SSH command not working for connection '"
             + itm->name + "' - " + itm->hostAddress);
+            
+        itm->lastErrorMessage = "SSH command not working";
 
         itm->sshReady = false;
         itm->hasError = true;
 
-        return SV_RET_VOID;
+        return;
     }
 
     // build the command string for our system() call
-    itm->sshCommandLine = app->sshCommand + " " + itm->sshUser + "@" + itm->hostAddress + " -N" +
+    sshCommandLine = app->sshCommand + " " + itm->sshUser + "@" + itm->hostAddress + " -t" + " -t" + //" -N" +
         " -p " + itm->sshPort +
         " -L " + std::to_string(itm->sshLocalPort) + ":127.0.0.1:" + itm->vncPort +
         " -i " + itm->sshKeyPrivate;
 
-    // (over-)optimistically declare that ssh is ready
-    itm->sshReady = true;
-
     // call the system's ssh client, if available
-    if (system(itm->sshCommandLine.c_str()) != -1)
-    {
-        svLogToFile("SSH connection disconnected normally from '"
-            + itm->name + "' - " + itm->hostAddress);
-
-        itm->sshReady = false;
-    }
+    itm->sshCmdStream = popen(sshCommandLine.c_str(), "w");
+    
+    if (itm->sshCmdStream != NULL)
+        // ssh started okay
+        itm->sshReady = true;
     else
     {
+        // something -- happened
         svLogToFile("SSH connection disconnected abnormally from '"
             + itm->name + "' - " + itm->hostAddress);
 
         itm->sshReady = false;
         itm->hasError = true;
     }
 
-    return SV_RET_VOID;
+    return;
 }
diff --git a/src/ssh.h b/src/ssh.h
@@ -1,6 +1,6 @@
 /*
  * ssh.h - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  */
 
 /*
@@ -35,7 +35,7 @@
 #ifndef SSH_H
 #define SSH_H
 
-//void sshExec(const char * cmd);
-void * svCreateSSHConnection (void *);
+void svCloseSSHConnection (void *);
+void svCreateSSHConnection (void *);
 
 #endif
diff --git a/src/vnc.cxx b/src/vnc.cxx
@@ -1,6 +1,6 @@
 /*
  * vnc.cxx - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  */
 
 /*
@@ -166,7 +166,7 @@ void VncObject::createVNCObject (HostItem * itm)
                 itm->hasError = true;
 
                 svLogToFile("ERROR - Could not open the private SSH key file");
-                svMessageWindow("Could not open the private SSH key "
+                svMessageWindow("Error: Could not open the private SSH key "
                   "file for '" + itm->name + "' - " + itm->hostAddress);
 
                 if (vnc->vncClient != NULL)
@@ -184,9 +184,11 @@ void VncObject::createVNCObject (HostItem * itm)
             svDebugLog("svCreateVNCObject - Creating and running threadSSH");
 
             // create, launch and detach call to create our ssh connection
-            int sshResult = pthread_create(&itm->threadSSH, NULL, svCreateSSHConnection, itm);
+            //int sshResult = pthread_create(&itm->threadSSH, NULL, svCreateSSHConnection, itm);
+            svCreateSSHConnection(itm);
 
-            if (sshResult != 0)
+            //if (sshResult != 0)
+            if (itm->sshReady == false)
             {
                 svLogToFile("ERROR - Couldn't create SSH thread for '" + itm->name +
                   "' - " + itm->hostAddress);
@@ -222,8 +224,7 @@ void VncObject::createVNCObject (HostItem * itm)
                 itm->isConnecting = false;
                 itm->hasCouldntConnect = true;
 
-                if (itm->sshCommandLine != "")
-                    svHandlePKill(itm);
+                svCloseSSHConnection(itm);
 
                 svHandleThreadConnection(itm);
 
@@ -235,9 +236,7 @@ void VncObject::createVNCObject (HostItem * itm)
         svDebugLog("svCreateVNCObject - Creating and running itm->threadRFB");
 
         // create, launch and detach call to create our vnc connection
-        int rfbResult = pthread_create(&itm->threadRFB, NULL, VncObject::initVNCConnection, itm);
-
-        if (rfbResult != 0)
+        if (pthread_create(&itm->threadRFB, NULL, VncObject::initVNCConnection, itm) != 0)
         {
             svLogToFile("ERROR - Couldn't create RFB thread for '" + itm->name +
                   "' - " + itm->hostAddress);
@@ -350,23 +349,21 @@ void VncObject::endViewer ()
             itm->threadRFBRunning = false;
         }
 
-        // tell ssh to clean up if a ssh/vnc connection
-        if (itm->hostType == 's')
-        {
-            itm->sshReady = false;
-
-            if (itm->sshCommandLine != "")
-                svHandlePKill(itm);
-            //Fl::awake(svHandlePKill, itm);
-        }
-
         itm->isConnected = false;
         itm->isConnecting = false;
         itm->hasDisconnectRequest = false;
         itm->hasEnded = true;
 
         // clean up the client
         rfbClientCleanup(vncClient);
+        
+        // tell ssh to clean up if a ssh/vnc connection
+        if (itm->hostType == 's')
+        {
+            itm->sshReady = false;
+
+            svCloseSSHConnection(itm);
+        }        
     }
 }
 
diff --git a/src/vnc.h b/src/vnc.h
@@ -1,6 +1,6 @@
 /*
  * vnc.h - part of SpiritVNC - FLTK
- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/
+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/
  */
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* spiritvnc.cxx - part of SpiritVNC - FLTK`
`3`		`- * 2016-2021 Will Brokenbourgh https://www.pismotek.com/brainout/`
	`3`	`+ * 2016-2022 Will Brokenbourgh https://www.pismotek.com/brainout/`
`4`	`4`	`*`
`5`	`5`	`* To God be the glory! In Jesus name! :-D`
`6`	`6`	`*`