Version bump, listen fix, cppcheck

* Bumped version to 0.6.4
* Implement fixes suggested by cppcheck
* Fix long-time listener bug where an invalid reverse connection would trash program's ability to spawn a new listener
* Free some strdups
* Move timestamp generation (for logs, stdout messages) to its own function to reduce repetitive code
* Minor code cleanup and formatting

Author: willbprog127

src/app.cxx

@@ -35,6 +35,7 @@
 #ifndef APP_H
 #define APP_H
 
+/* === windows only === */
 #ifdef _WIN32
 #include <winsock2.h>
 #include <windows.h>
@@ -55,17 +56,20 @@
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Menu_Item.H>
 #include <FL/Fl_Pack.H>
+#include <FL/Fl_PNG_Image.H>
 #include <FL/Fl_Radio_Round_Button.H>
 #include <FL/Fl_Scroll.H>
 #include <FL/Fl_Secret_Input.H>
 #include <FL/Fl_Spinner.H>
+#include <FL/Fl_Tabs.H>
 #include <FL/Fl_Tooltip.H>
 #include <FL/Fl_Multiline_Output.H>
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Window.H>
 
 #include <fstream>
 
+/* === *nix-like only == */
 #ifndef _WIN32
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -78,7 +82,6 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <signal.h>
-#include <vector>
 
 #include "base64.h"
 #include "consts_enums.h"
@@ -109,7 +112,7 @@ class AppVars
     iconConnected(NULL),
     iconNoConnect(NULL),
     iconConnecting(NULL),
-    libVncVncPointer((void *)"VncObject"),
+    libVncVncPointer(strdup("VncObject")),
     configPath(""),
     configPathAndFile(""),
     requestedListWidth(170),
@@ -130,7 +133,6 @@ class AppVars
     scanIsRunning(false),
     nCurrentScanItem(0),
     nScanTimeout(2),
-    //nDeadTimeout(100),
     nStartingLocalPort(15000),
     showTooltips(true),
     enableLogToFile(false),
@@ -199,17 +201,17 @@ class AppVars
 
     // set up config file path and file
 
-    // for macOS / OS X
+    // === macOS / OS X ===
     #if defined __APPLE__
     configPath = "/Users/" + userName + "/.spiritvnc/";
-    // Windows 10+
+    // === Windows 10+ ===
     #elif defined _WIN32
     configPath = std::string(getenv("APPDATA")) + "\\SpiritVNC\\";
+    // === solaris or openindiana ===
     #elif defined __sun__
-    // for solaris or openindiana
     configPath = "/export/home/" + userName + "/.spiritvnc/";
+    // === default linux, freebsd, others ===
     #else
-    // default is typical linux, freebsd path
     configPath = "/home/" + userName + "/.spiritvnc/";
     #endif
 
@@ -249,7 +251,6 @@ class AppVars
   bool scanIsRunning;
   int nCurrentScanItem;
   uint16_t nScanTimeout;
-  //uint16_t nDeadTimeout;
   int nStartingLocalPort;
   bool showTooltips;
   bool enableLogToFile;
@@ -286,7 +287,6 @@ class SVInput : public Fl_Input
 public:
   SVInput (int x, int y, int w, int h, const char * label = 0) :
     Fl_Input(x, y, w, h, label) {}
-//private:
   int handle (int event);
 };
 
@@ -369,6 +369,7 @@ void svItmOptionsRadioButtonsCallback (Fl_Widget *, void *);
 void svListeningModeBegin ();
 void svListeningModeEnd ();
 void svLogToFile (const std::string&);
+std::string svMakeTimeStamp (bool dashSeps = true);
 void svMessageWindow (const std::string&, const std::string& = "SpiritVNC");
 bool svThereAreConnectedItems ();
 void svPopUpEditMenu (Fl_Input_ *);

src/app.h

@@ -35,14 +35,14 @@
 #include "base64.h"
 
 
-/* base64 */
+/*  base64  */
 static inline bool base64Type (unsigned char c)
 {
   return (isalnum(c) || (c == '+') || (c == '/'));
 }
 
 
-/* base64 */
+/*  base64  */
 std::string base64Decode (std::string const& encoded_string)
 {
   size_t in_len = encoded_string.size();
@@ -54,18 +54,18 @@ std::string base64Decode (std::string const& encoded_string)
 
   while (in_len-- && ( encoded_string[in_] != '=') && base64Type(encoded_string[in_]))
   {
-    char_array_4[i++] = encoded_string[in_]; in_++;
+    char_array_4[i ++] = encoded_string[in_]; in_ ++;
 
     if (i ==4)
     {
-      for (i = 0; i < 4; i++)
+      for (i = 0; i < 4; i ++)
         char_array_4[i] = static_cast<unsigned char>(base64_chars.find(char_array_4[i]));
 
       char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
       char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
       char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
 
-      for (i = 0; (i < 3); i++)
+      for (i = 0; (i < 3); i ++)
         ret += char_array_3[i];
 
       i = 0;
@@ -74,25 +74,25 @@ std::string base64Decode (std::string const& encoded_string)
 
   if (i != 0)
   {
-    for (int j = i; j <4; j++)
+    for (int j = i; j <4; j ++)
       char_array_4[j] = 0;
 
-    for (int j = 0; j <4; j++)
+    for (int j = 0; j <4; j ++)
       char_array_4[j] = static_cast<unsigned char>(base64_chars.find(char_array_4[j]));
 
     char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
     char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
     char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
 
-    for (size_t j = 0; (j < i - 1); j++)
+    for (size_t j = 0; (j < i - 1); j ++)
       ret += char_array_3[j];
   }
 
   return ret;
 }
 
 
-/* base64 */
+/*  base64  */
 std::string base64Encode (unsigned char const * bytes_to_encode, unsigned int in_len)
 {
   std::string ret;
@@ -103,7 +103,7 @@ std::string base64Encode (unsigned char const * bytes_to_encode, unsigned int in
 
   while (in_len--)
   {
-    char_array_3[i++] = *(bytes_to_encode++);
+    char_array_3[i ++] = *(bytes_to_encode ++);
 
     if (i == 3)
     {
@@ -112,7 +112,7 @@ std::string base64Encode (unsigned char const * bytes_to_encode, unsigned int in
       char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
       char_array_4[3] = char_array_3[2] & 0x3f;
 
-      for (i = 0; (i < 4) ; i++)
+      for (i = 0; (i < 4) ; i ++)
         ret += base64_chars[char_array_4[i]];
 
       i = 0;
@@ -121,18 +121,18 @@ std::string base64Encode (unsigned char const * bytes_to_encode, unsigned int in
 
   if (i != 0)
   {
-    for (int j = i; j < 3; j++)
+    for (int j = i; j < 3; j ++)
       char_array_3[j] = '\0';
 
     char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
     char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
     char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
     char_array_4[3] = char_array_3[2] & 0x3f;
 
-    for (int j = 0; (j < i + 1); j++)
+    for (int j = 0; (j < i + 1); j ++)
       ret += base64_chars[char_array_4[j]];
 
-    while (i++ < 3)
+    while (i ++ < 3)
       ret += '=';
   }
 

src/base64.cxx

@@ -37,7 +37,7 @@
 
 #include <iostream>
 
-/* base64 */
+/*  base64  */
 static const std::string base64_chars =
              "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
              "abcdefghijklmnopqrstuvwxyz"

src/base64.h

@@ -36,7 +36,7 @@
 #define CONSTS_H
 
 /* constants */
-#define SV_APP_VERSION  "0.6.3"
+#define SV_APP_VERSION  "0.6.4"
 
 #define SV_CURRENT_YEAR "2024"
 

src/consts_enums.h

@@ -42,17 +42,15 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <FL/Fl.H>
-#include <FL/Fl_Double_Window.H>
-#include <FL/Fl_PNG_Image.H>
+
 #include "app.h"
 #include "consts_enums.h"
 
 
 AppVars * app = new AppVars();
 
 
-/* main program */
+/*  main program  */
 int main (int argc, char **argv)
 {
   // tells FLTK we're a multithreaded app
@@ -103,9 +101,8 @@ int main (int argc, char **argv)
   #endif
 
   // start up the connection 'supervisor' timer callback
-  // do NOT change the interval of this timer
-  // because program logic expects this to always be
-  // near 1 second
+  // do NOT change the interval of this timer because program
+  // logic expects this to always be near 1 second
   Fl::add_timeout(SV_ONE_SECOND, svConnectionWatcher);
 
   // start watching the clipboard

src/spiritvnc.cxx

@@ -36,8 +36,10 @@
 #include "hostitem.h"
 
 
-/* attempts to close the popen'd ssh process */
-/* (this is called as a thread because it could block) */
+/*
+  attempts to close the popen'd ssh process
+  (this is called as a thread because it could block)
+*/
 void * svSSHCloseHelper (void * itmData)
 {
   // detach this thread
@@ -48,8 +50,6 @@ void * svSSHCloseHelper (void * itmData)
   if (itm == NULL || itm->sshCmdStream == NULL)
     return SV_RET_VOID;
 
-  // fprintf(itm->sshCmdStream, "%s\r\n", "exit");  //  <<--- trying different way to close (below) ---<<<
-
   // send 'exit' control-char sequence
   fprintf(itm->sshCmdStream, "\r\n%s", "~.");
 
@@ -65,7 +65,7 @@ void * svSSHCloseHelper (void * itmData)
 }
 
 
-/* close and clean up ssh connection */
+/*  close and clean up ssh connection  */
 void svCloseSSHConnection (void * itmData)
 {
   HostItem * itm = static_cast<HostItem *>(itmData);
@@ -81,10 +81,6 @@ void svCloseSSHConnection (void * itmData)
     //itm->isConnecting = false;
     itm->hasCouldntConnect = true;
     itm->hasError = true;
-
-    //svHandleThreadConnection(itm);
-
-    //return;
   }
 
   itm->isConnecting = false;