Improve memory management

common/callback.hpp

@@ -0,0 +1,41 @@
+#ifndef _COMMON_CALLBACK_HPP_
+#define _COMMON_CALLBACK_HPP_
+#ifndef _COMMON_CALLBACKDATA_HPP_
+#include <common/cbdata.hpp>
+#endif
+#ifndef _COMMON_PURECALLBACK_HPP_
+#include <common/pcallbck.hpp>
+#endif
+#ifndef _COMMON_CALLBACKPOINTER_HPP_
+#include <common/cbptr.hpp>
+#endif
+
+template <class T,class D>
+class Callback : public PureCallback<D>
+{
+public:
+  typedef LONG (T::*PFNMETHOD)(CallbackData<D> &callbackData);
+	Callback(void);
+	Callback(const Callback<T,D> &someCallback);
+	Callback(T *lpObject,PFNMETHOD lpMethod);
+	virtual ~Callback();
+	void setObject(T *lpObject);
+	void setMethod(PFNMETHOD lpMethod);
+	void setCallback(T *lpObject,PFNMETHOD lpMethod);
+	WORD operator==(const Callback<T,D> &someCallback)const;
+	void operator=(const Callback<T,D> &someCallback);
+	LONG operator*(CallbackData<D> &someCallbackData);
+private:
+	T *mlpObject;
+	LONG (T::*mlpMethod)(CallbackData<D> &someCallbackData);
+};
+
+template <class T,class D>
+inline
+LONG Callback<T,D>::operator*(CallbackData<D> &someCallbackData)
+{
+	if((!mlpObject)||(!mlpMethod))return (LONG)0;
+	return (mlpObject->*mlpMethod)(someCallbackData);
+}
+#include <common/callback.tpp>
+#endif

common/callback.tpp

@@ -0,0 +1,60 @@
+#ifndef _COMMON_CALLBACK_TPP_
+#define _COMMON_CALLBACK_TPP_
+
+template <class T,class D>
+Callback<T,D>::Callback(void)
+: mlpObject(0), mlpMethod(0)
+{
+}
+
+template <class T,class D>
+Callback<T,D>::Callback(const Callback<T,D> &someCallback)
+: mlpObject(someCallback.mlpObject), mlpMethod(someCallback.mlpMethod)
+{
+}
+
+
+template <class T,class D>
+Callback<T,D>::Callback(T *lpObject,PFNMETHOD lpMethod)
+: mlpObject(lpObject), mlpMethod(lpMethod)
+{
+}
+
+template <class T,class D>
+Callback<T,D>::~Callback()
+{
+}
+
+template <class T,class D>
+WORD Callback<T,D>::operator==(const Callback<T,D> &someCallback)const
+{
+	return (mlpObject==someCallback.mlpObject && mlpMethod==someCallback.mlpMethod);
+}
+
+template <class T,class D>
+void Callback<T,D>::operator=(const Callback<T,D> &someCallback)
+{
+	mlpObject=someCallback.mlpObject;
+	mlpMethod=someCallback.mlpMethod;
+}
+
+template <class T,class D>
+void Callback<T,D>::setObject(T *lpObject)
+{
+	mlpObject=lpObject;
+}
+
+template <class T,class D>
+void Callback<T,D>::setMethod(PFNMETHOD lpMethod)
+{
+	mlpMethod=lpMethod;
+}
+
+template <class T,class D>
+void Callback<T,D>::setCallback(T *lpObject,PFNMETHOD lpMethod)
+{
+  mlpObject=lpObject;
+	mlpMethod=lpMethod;
+}
+
+#endif

common/cbdata.hpp

@@ -0,0 +1,70 @@
+#ifndef _COMMON_CALLBACKDATA_HPP_
+#define _COMMON_CALLBACKDATA_HPP_
+#ifndef _COMMON_WINDOWS_HPP_
+#include <common/windows.hpp>
+#endif
+
+template<class T>
+class CallbackData
+{
+public:
+  typedef LONG ReturnType;
+  CallbackData(void);
+	CallbackData(T &data);
+  CallbackData(const CallbackData &someCallbackData);
+	virtual ~CallbackData();
+	CallbackData &operator=(const CallbackData &someCallbackData);
+	T &getData(void);
+	void setData(T &data);
+private:
+  SmartPointer<T> mData;
+};
+
+template<class T>
+inline
+CallbackData<T>::CallbackData(void)
+{
+}
+
+template<class T>
+inline
+CallbackData<T>::CallbackData(T &data)
+{
+	mData=&data;
+}
+
+template <class T>
+inline
+CallbackData<T>::CallbackData(const CallbackData &someCallbackData)
+{
+  *this=someCallbackData;
+}
+
+template <class T>
+inline
+CallbackData<T>::~CallbackData()
+{
+}
+
+template <class T>
+inline
+CallbackData<T> &CallbackData<T>::operator=(const CallbackData<T> &someCallbackData)
+{
+	mData = someCallbackData.mData;
+	return *this;
+}
+
+template <class T>
+inline
+T &CallbackData<T>::getData(void)
+{
+	return *mData;
+}
+
+template <class T>
+inline
+void CallbackData<T>::setData(T &data)
+{
+  mData=&data;
+}
+#endif

common/cbptr.hpp

@@ -0,0 +1,81 @@
+#ifndef _COMMON_CALLBACKPOINTER_HPP_
+#define _COMMON_CALLBACKPOINTER_HPP_
+#ifndef _COMMON_WINDOWS_HPP_
+#include <common/windows.hpp>
+#endif
+#ifndef _COMMON_PURECALLBACK_HPP_
+#include <common/pcallbck.hpp>
+#endif
+
+template <class T>
+class CallbackPointer
+{
+public:
+	CallbackPointer(void);
+	CallbackPointer(PureCallback<T> *lpCallback);
+	CallbackPointer(const CallbackPointer<T> &someCallbackPointer);
+	virtual ~CallbackPointer();
+	void operator=(CallbackPointer &someCallbackPointer);
+	WORD operator==(const CallbackPointer &someCallbackPointer)const;
+	LONG callback(CallbackData<T> &someCallbackData);
+	bool isOkay(void)const;
+private:
+	PureCallback<T> *mlpCallback;
+};
+
+template <class T>
+inline
+CallbackPointer<T>::CallbackPointer(void)
+: mlpCallback(0)
+{
+}
+
+template <class T>
+inline
+CallbackPointer<T>::CallbackPointer(PureCallback<T> *lpCallback)
+: mlpCallback(lpCallback)
+{
+}
+
+template <class T>
+inline
+CallbackPointer<T>::CallbackPointer(const CallbackPointer<T> &someCallbackPointer)
+: mlpCallback(someCallbackPointer.mlpCallback)
+{
+}
+
+template <class T>
+inline
+CallbackPointer<T>::~CallbackPointer()
+{
+}
+
+template <class T>
+inline
+void CallbackPointer<T>::operator=(CallbackPointer<T> &someCallbackPointer)
+{
+	mlpCallback=someCallbackPointer.mlpCallback;
+}
+
+template <class T>
+inline
+WORD CallbackPointer<T>::operator==(const CallbackPointer<T> &someCallbackPointer)const
+{
+	return (mlpCallback==someCallbackPointer.mlpCallback);
+}
+
+template <class T>
+inline
+LONG CallbackPointer<T>::callback(CallbackData<T> &someCallbackData)
+{
+	if(!mlpCallback)return (LONG)0;
+	return mlpCallback->operator*(someCallbackData);
+}
+
+template <class T>
+inline
+bool CallbackPointer<T>::isOkay(void)const
+{
+  return mlpCallback?true:false;
+}
+#endif

common/pcallbck.hpp

@@ -0,0 +1,35 @@
+#ifndef _COMMON_PURECALLBACK_HPP_
+#define _COMMON_PURECALLBACK_HPP_
+#ifndef _COMMON_CALLBACKDATA_HPP_
+#include <common/cbdata.hpp>
+#endif
+
+template <class T>
+class PureCallback
+{
+public:
+	PureCallback(void);
+	virtual ~PureCallback();
+	virtual LONG operator*(CallbackData<T> &someCallbackData)=0;
+private:
+};
+
+template <class T>
+inline
+PureCallback<T>::PureCallback(void)
+{
+}
+
+template <class T>
+inline
+PureCallback<T>::~PureCallback()
+{
+}
+
+template <class T>
+inline
+LONG PureCallback<T>::operator*(CallbackData<T> &/*someCallbackData*/)
+{
+	return 0;
+}
+#endif

common/pointer.hpp

@@ -14,7 +14,8 @@ template <class T>
 class SmartPointer
 {
 public:
-	SmartPointer(void);
+//	SmartPointer(void);
+	SmartPointer(bool createNew=false);
 	SmartPointer(T FAR *lpSmartPointer,PointerDisposition::Disposition disposition=PointerDisposition::Assume);
 	SmartPointer(const SmartPointer<T> &someSmartPointer);
 	virtual ~SmartPointer();
@@ -36,11 +37,23 @@ private:
 	PointerDisposition::Disposition mDisposition;
 };
 
+// template <class T>
+// inline
+// SmartPointer<T>::SmartPointer(void)
+// : mlpSmartPointer(0), mDisposition(PointerDisposition::Assume)
+// {
+// }
+
 template <class T>
 inline
-SmartPointer<T>::SmartPointer(void)
+SmartPointer<T>::SmartPointer(bool createNew)
 : mlpSmartPointer(0), mDisposition(PointerDisposition::Assume)
 {
+	if(createNew)
+	{
+		mlpSmartPointer = ::new T();
+		mDisposition = PointerDisposition::Delete;
+	}
 }
 
 template <class T>

common/utility.hpp

@@ -15,7 +15,7 @@ class Utility
     static String formatCurrency(double number,int places=2);
     static bool fmod(double dividend,double divisor);
     static bool fmod(double dividend, double divisor,double epsilon);
-    static String bytesTransferredToString(double bytesTransferred);
+    static String byteCountToString(double bytesTransferred, bool perSecond = true);
   private:
     static String pad(String theString,char padChar,int toLength);
     static String addCommas(String& theString);
@@ -34,30 +34,35 @@ Utility::~Utility()
 }
 
 inline
-String Utility::bytesTransferredToString(double bytesTransferred)
+String Utility::byteCountToString(double bytesTransferred, bool perSecond)
 {
   double roundedValue = std::round(bytesTransferred * 100.00)/100.00;
+  String strBytesTransferrred;
   if(roundedValue >= 1E+15)
   {
-    return Utility::formatNumber(roundedValue/1E+15,2) + "Pb/s";
+    strBytesTransferrred = Utility::formatNumber(roundedValue/1E+15,2) + "Pb";
   }
   else if(roundedValue >= 1000000000000)
   {
-    return Utility::formatNumber(roundedValue/1000000000000,2) + "Tb/s";
+    strBytesTransferrred = Utility::formatNumber(roundedValue/1000000000000,2) + "Tb";
   }
   else if(roundedValue >= 1073741824)
   {
-    return Utility::formatNumber(roundedValue/1073741824,2) + "Gbb/s";
+    strBytesTransferrred = Utility::formatNumber(roundedValue/1073741824,2) + "Gb";
   }  
   else if(roundedValue >= 1000000)
   {
-    return Utility::formatNumber(roundedValue/1000000,2) + "Mb/s";
+    strBytesTransferrred = Utility::formatNumber(roundedValue/1000000,2) + "Mb";
   }    
   else if(roundedValue >= 1000)
   {
-    return Utility::formatNumber(roundedValue/1000,2) + "Kb/s";
+    strBytesTransferrred = Utility::formatNumber(roundedValue/1000,2) + "Kb";
   } 
-  return Utility::formatNumber(roundedValue,2) + "B/s";   
+  else strBytesTransferrred =  Utility::formatNumber(roundedValue,2) + "B";   
+
+  if(perSecond)strBytesTransferrred+="/s";
+
+  return strBytesTransferrred;
 }
 
 inline

ctest/.vscode/settings.json

@@ -48,6 +48,11 @@
         "streambuf": "cpp",
         "typeinfo": "cpp",
         "fstream": "cpp",
-        "iostream": "cpp"
+        "iostream": "cpp",
+        "complex": "cpp",
+        "cstring": "cpp",
+        "semaphore": "cpp",
+        "stop_token": "cpp",
+        "thread": "cpp"
     }
 }

ctest/CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.10.0)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/home/pi/Boneyard")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/home/pi/CPP")
 project(tester VERSION 0.1.0 LANGUAGES C CXX)
 
 add_executable(tester main.cpp)
 
-add_subdirectory(/home/pi/Boneyard/common /home/pi/Boneyard/common/build) 
+add_subdirectory(/home/pi/CPP/common /home/pi/CPP/common/build) 
 target_link_libraries(tester PRIVATE common)
 
 

ctest/Untitled-1

@@ -1 +0,0 @@
-

ctest/main.cpp

@@ -10,144 +10,141 @@
 #include <iostream>
 #include <algorithm>
 #include <tuple>
+#include <utility>
 #include <complex>
+#include <common/callback.hpp>
 
-
-// #include <iostream> // For standard input/output operations (like std::cout)
-// #include <fstream>  // For file stream operations (like std::ifstream)
-// #include <string>   // For using std::string
-// int main()
-// {
-//     Profiler profiler = Profiler();
-//     std::ifstream inputFile("/mnt/mariadb/backupdb.sql"); 
-
-//     if (!inputFile.is_open())
-//     {
-//         std::cerr << "Error: Could not open the file." << std::endl;
-//         return 1; // Indicate an error
-//     }
-
-//     DWORD lines = 0;
-//     std::string line;
-//     while (std::getline(inputFile, line))
-//     {
-//        lines++;
-//        if(!(lines%1000000))
-//       {
-//         std::cout << "reading " << lines << " " << line << std::endl;
-//       }
-//     }
-
-//     inputFile.close();
-//     std::cout << "Done, total took " << profiler.end() << " (ms)" << std::endl;
-//     return 0; // Indicate successful execution
-//   }
-
-// int main(int argc, char ** argv)
-// {
-//   Profiler profiler = Profiler();
-//   FileIO inputFile = FileIO("/mnt/mariadb/backupdb.sql");
-//   inputFile.setBufferLength(500000000);
-// //  FileIO inputFile = FileIO("/home/pi/Boneyard/ctest/main.cpp");  
-//   String strLine = String();
-//   DWORD length =  0;
-//   DWORD lines = 0;
-
-//   printf("opening...\n");
-//   while(inputFile.readLine(strLine))
-//   {
-//     lines++;
-// //    printf("reading %d %s\n",lines,(char*)strLine);
-//     if(!(lines%1000000))
-//     {
-//       printf("reading %d %s\n",lines,(char*)strLine);
-//     }
-//   }
-//   printf("Done, read %d lines\n",lines);
-//   inputFile.close();
-//   printf("done, took %d(ms)...\n",profiler.end());
-
-//     return 0;
-// }
-
-std::tuple<int,int,int> foo()
+class Info
 {
-    return std::make_tuple(2,3,4);
+  public:
+  Info();
+  ~Info();
+  String getMessage(void);
+  void setMessage(const String &message);
+  private:
+  String mMessage;
+};
+
+Info::Info()
+{
+  std::cout << "Info" << std::endl;
+}
+
+Info::~Info()
+{
+  std::cout << "~Info" << std::endl;
+}
+
+String Info::getMessage(void)
+{
+    return mMessage;
+}
+
+void Info::setMessage(const String &message)
+{
+    mMessage = message;
+}
+
+class B 
+{
+  public:
+    B();
+    LONG callback(CallbackData<Info> &callbackData);
+    ~B();
+  private:
+    String mFoo;
+};
+
+B::B()
+{
+}
+
+B::~B()
+{
+}
+
+LONG B::callback(CallbackData<Info> &callbackData)
+{
+  std::cout << "callback with data " << callbackData.getData().getMessage().str() << std::endl;  
+  return 0;
+}
+
+class Monitor
+{
+  public:
+  Monitor();
+  ~Monitor();
+  void setCallback(Callback<B,Info> &callback);
+  void doCallback(CallbackData<Info> &callbackData);
+  private:
+  Callback<B,Info> mCallback;
+};
+
+Monitor::Monitor()
+{
+  std::cout << "Monitor" << std::endl;
+}
+
+
+Monitor::~Monitor()
+{
+  std::cout << "~Monitor" << std::endl;
+}
+
+void Monitor::setCallback(Callback<B,Info> &callback)
+{
+  mCallback=callback;
+}
+
+void Monitor::doCallback(CallbackData<Info> &callbackData)
+{
+  CallbackPointer cbptr(&mCallback);
+  cbptr.callback(callbackData);
 }
 
 int main(int argc, char ** argv)
 {
-    //  std::complex<double> c{4.0,3.0};
+    // std::vector<int> myBigVec(10000000, 2011);
+    // std::vector<std::string> s1;
+    // std::vector<std::string> s2;
+
+    // s1.push_back("hello");
+    // s1.push_back("world");
+
+    // s2 = std::move(s1);
 
 
+  Monitor monitor;
+//  SmartPointer<B> b(::new B(),PointerDisposition::Delete);
+  SmartPointer<B> b(true);
+  Callback<B,Info> callback(&(*b),&B::callback);
+  monitor.setCallback(callback);
 
-  // FileIO fileIO = FileIO("/mnt/mariadb/backupdb.sql");
-  // std::cout << "Reading ... " << std::endl;
-  // int lines =0;
-  // String strLine;
-  // while(fileIO.readLine(strLine))
-  // {
-  //   lines++;
-  //   if(!(lines%1000000))
-  //   {
-  //     printf("reading %d %s\n",lines,(char*)strLine);
-  //   }    
-  // }  
-  // fileIO.close();  
-}
-
-void stdLibStuff()
-{
-    // std::vector<int> numbers;
-    // numbers.push_back(100);
-    // numbers.push_back(50);
-    // numbers.push_back(100);
-
-    // int *p=&numbers[0];
-    // int *p1=&numbers[1];
-    // int *p2=&numbers[2];
-
-    // int max = *std::max_element(numbers.begin(), numbers.end());
-
-//    std::cout <<  typeid(max_it).name() << std::endl;
-    // if(max_it == p)std::cout << "p" << std::endl;
-    // if(max_it == p1) std::cout << "p1" << std::endl;
-    // if(max_it == p2)std::cout << "p2" << std::endl;
-
-
-//    std::cout << *max_it << std::endl;
-
-
-    // int max_value = *max_it;
-    // std::max(*numbers.begin());
-
-
-//    std::cout << std::max(numbers) << std::endl;
-//  Block<int> numbers;
-
-
-
-//  numbers.insert(newInt(100);
-
-//   std::cout<< std::min(100,50) << std::endl;
-    // std::string s = "hello";
-    // std::cout << s << std::endl;
-  // std::vector<std::string> strings;
-  // strings.push_back("hello");
-  // strings.push_back("world");
-
-  //  for (const std::string& s : strings)
-  //  {
-  //     std::cout << s << " ";
-  //  }
-
-  // char buffer[] = "Another direct copy";
-
-  // int a = sizeof(buffer);
+  Info info;
+  info.setMessage("Hello");
 
+  CallbackData<Info> callbackData(info);
+  monitor.doCallback(callbackData);
 
 }
 
+
+
+
+
+//  Callback callback(&(*b),C
+
+
+//  SmartPointer<B> b1 = b;
+//  b1->foo();
+//  b->foo();
+
+//  String str="Hello";
+//  b->setFoo(str);
+//  str="Goodbye";
+//  String str2=b->getFoo();
+//  str2="world";
+
 void readFile()
 {
   //  MemoryMappedFile memoryMappedFile("/home/pi/Boneyard/ctest/main.cpp",MemoryMappedFile::CreationFlags::ReadOnly);

sstp/clientsocketsender.cpp

@@ -1,5 +1,8 @@
 #include <sstp/clientsocketsender.hpp>
 
+/// @brief Establish a connection to the socket specified by ipAddress and port
+/// @param ipAddress The ipAddress
+/// @param port  The port
 ClientSocketSender::ClientSocketSender(String ipAddress, int port)
 : mIPAddress(ipAddress), mPort(port)
 {
@@ -26,11 +29,15 @@ ClientSocketSender::ClientSocketSender(String ipAddress, int port)
     }
 }
 
+
+/// @brief Close the connection on destruction
 ClientSocketSender::~ClientSocketSender()
 {
   close();
 }
 
+/// @brief Closes the connection
+/// @param  
 void ClientSocketSender::close(void)
 {
   if(-1!=mSocket)
@@ -40,6 +47,9 @@ void ClientSocketSender::close(void)
   }
 }
   
+/// @brief Send the specified file through the connection
+/// @param pathFileName The file to send
+/// @return Returns true if successful
 bool ClientSocketSender::sendFile(String &pathFileName)
 {
   Profiler profiler;

sstp/clientsocketsender.hpp

@@ -1,5 +1,5 @@
-#ifndef _LISTENER_CLIENTSOCKETSENDER_HPP_
-#define _LISTENER_CLIENTSOCKETSENDER_HPP_
+#ifndef _SSTP_CLIENTSOCKETSENDER_HPP_
+#define _SSTP_CLIENTSOCKETSENDER_HPP_
 #include <stdio.h>
 #include <iostream>
 #include <sys/types.h>
@@ -21,8 +21,7 @@ class ClientSocketSender
   bool sendFile(String &pathFileName);
   bool isOkay(void);
   private:
-//    static constexpr int BUFFER_LENGTH=65536;
-    static constexpr int BUFFER_LENGTH=1048576;
+    static constexpr int BUFFER_LENGTH=1048576; // This buffer length is used for both reading the file and also the packet transmission length 
     void close(void);
     bool sendPacketIndicator(DWORD bytesToSend);
     bool sendPacket(Array<char> &buffer,DWORD bytesToSend);

sstp/main.cpp

@@ -26,41 +26,60 @@ void handleClient(Block<String> &commands);
 /// @return 
 int main(int argc, char **argv)
 {
+  int returnCode(0);
   Profiler profiler;
+  String version = "0.1.0.1";   // major version, minor version, patch, build
 
-  if(argc<2)
+  std::cout << "sstp version " << version.str() << std::endl;  
+  try
   {
-    std::cout << "sstp SERVERMODE {port} | CLIENTMODE {serveripaddress} {serverport} {pathfileName}." << std::endl;
-    std::cout << "SERVERMODE will listen on the specified port for a connection and receive the specified file." << std::endl;
-    std::cout << "CLIENTMODE willl connect to the specified address and port and send the specfied file." << std::endl;
-    return 1;
-  }
-  Block<String> arguments;
-  for(int index=0;index<argc;index++)
-  {
-    String item(argv[index]);
-    arguments.insert(item);
-  }
+    if(argc<2)
+    {
+      std::cout << "sstp SERVERMODE {port} | CLIENTMODE {serveripaddress} {serverport} {pathfileName}." << std::endl;
+      std::cout << "SERVERMODE will listen on the specified port for a connection and receive the specified file." << std::endl;
+      std::cout << "CLIENTMODE willl connect to the specified address and port and send the specfied file." << std::endl;
+      return 1;
+    }
+    Block<String> arguments;
+    for(int index=0;index<argc;index++)
+    {
+      String item(argv[index]);
+      arguments.insert(item);
+    }
 
-  std::cout << argv[1] << std::endl;
-  if(arguments[1]=="SERVERMODE")
-  {
-    handleServer(arguments);
+    std::cout << argv[1] << std::endl;
+    if(arguments[1]=="SERVERMODE")
+    {
+      handleServer(arguments);
+    }
+    else if(arguments[1]=="CLIENTMODE")
+    {
+      handleClient(arguments);
+    }  
+    else
+    {
+      std::cout << "Unknown command " << arguments[1] << std::endl;
+      returnCode=-1;
+    }
   }
-  else if(arguments[1]=="CLIENTMODE")
+  catch(Exception& exception)
   {
-    handleClient(arguments);
-  }  
-  else
-  {
-    std::cout << "Unknown command " << arguments[1] << std::endl;
+    std::cout << exception.toString() << std::endl;
+    returnCode=-1;
+  }
+  catch(...)
+  {
+    std::cout << "An unhandled exception was encountered" << std::endl;
+    returnCode=-1;
   }
-  return 0;
  
   std::cout << "Done, total took " << Utility::formatNumber(profiler.end()) << "(ms)" << std::endl;
+  return returnCode;
 }
 
 /// @brief [0]=program [1]=SERVERMODE [2]={port}
+/// @Note Currently this method will never return.  The application is terminate with CTRL-C.  Ideally, we would exit is some cleaner fashion
+/// perhaps by implementing a CTRL-C hook and then destroying the SocketServer properly by calling it's destructor.  See SocketServer::~SocketServer()
 /// @param commands 
 void handleServer(Block<String> &commands)
 {
@@ -74,7 +93,7 @@ void handleServer(Block<String> &commands)
   int port = commands[2].toInt();
   std::cout << commands[1] << ":" << commands[2] << std::endl;
   SocketServer socketServer(commands[2].toInt());
-  socketServer.listen();
+  socketServer.listen();    
   std::cout << "Done, total took " << Utility::formatNumber(profiler.end()) << "(ms)" << std::endl;
 }
 

sstp/socketconnectionreceiver.cpp

@@ -2,15 +2,41 @@
 #include <common/utility.hpp>
 #include <common/stringbuffer.hpp>
 
+
+SocketConnectionReceiver::SocketConnectionReceiver()
+: mSocket(-1), mIsRunnable(true)
+{
+}
+
+
+/// @brief After a connection has been accepted the SocketConnectionReceiver is initialized with the incoming socket
+/// @param socket 
+/// @param internalSocketAddress 
 SocketConnectionReceiver::SocketConnectionReceiver(int socket, sockaddr_in internalSocketAddress)
-: mSocket(socket), mInternalSocketAddress(internalSocketAddress)
+: mSocket(socket), mInternalSocketAddress(internalSocketAddress), mIsRunnable(true)
 {
 }
 
+/// @brief Initialize a SocketConnectionReceiver.
+/// @param socket 
+/// @param internalSocketAddress 
+void SocketConnectionReceiver::initialize(int socket, sockaddr_in internalSocketAddress)
+{
+  close();
+  mSocket=socket;
+  mInternalSocketAddress = internalSocketAddress;
+}
+
+
+/// @brief The destructor will close the socket
 SocketConnectionReceiver::~SocketConnectionReceiver()
-{
+{ 
+  isRunnable(false);
+  close();
 }
 
+/// @brief Close the socket and set the mSocket variable to -1
+/// @param  
 void SocketConnectionReceiver::close(void)
 {
   if(-1==mSocket)return;
@@ -19,10 +45,12 @@ void SocketConnectionReceiver::close(void)
   mSocket=-1;
 }
 
+/// @brief The threadFunction will handle the lifetime of the socket connection.  When a QUIT is received the socket will be closed and the thread method will exit
+/// @param data 
 void SocketConnectionReceiver::threadFunction(int data)
 {
   String line;
-  while(true)
+  while(mIsRunnable)
   {
     readLine(line);
     if(0==line.length())
@@ -30,7 +58,11 @@ void SocketConnectionReceiver::threadFunction(int data)
       std::cout << "Received an empty command" << std::endl;
       break;
     }
-    if(line=="QUIT" || line=="quit")break;
+    if(line=="QUIT" || line=="quit")
+    {
+      handleQuit();
+      break;
+    }
     Block<String> commands = line.split('|');
     if(0==commands.size())continue;
     commands[0].upper();
@@ -49,9 +81,9 @@ void SocketConnectionReceiver::threadFunction(int data)
 
 /// @brief The client wants to put a file.  put {filename} {lengthbytes}
 /// @param commands [0]=PUT, [1]=filename, [2]=total length
-/// This will read PCKT {length}.
-/// The connection will continue reading and writing until it receives PCKT 0
-/// @return 
+/// This message contains PUT|{filename}|{lengthbytes} followed by as many PCKT|{length} packets as needed to read the entire file contents and save to disk
+/// The connection will continue reading packets and saving data to disk until it receives PCKT 0 which signals the end of transmission
+/// @return true or false
 bool SocketConnectionReceiver::handlePut(Block<String> &commands)
 {
   Profiler profiler;
@@ -61,6 +93,7 @@ bool SocketConnectionReceiver::handlePut(Block<String> &commands)
   String fileName;
   size_t fileLength;
   size_t totalBytesRead=0;
+  size_t totalPacketsRead=0;
 
   fileName = commands[1];
   fileLength = commands[commands.size()-1].toLong();
@@ -93,6 +126,7 @@ bool SocketConnectionReceiver::handlePut(Block<String> &commands)
     receiveBuffer.size(bufferLength);
     size_t bytes_read = read(receiveBuffer);
     totalBytesRead+=bytes_read;
+    totalPacketsRead++;
     if(bufferLength!=bytes_read)
     {
       std::cout << "Send/Receive size mismatch.  The client indicated a data length of " << Utility::formatNumber(bufferLength) << " but a data length of " << Utility::formatNumber(bytes_read) << " was received";
@@ -105,17 +139,19 @@ bool SocketConnectionReceiver::handlePut(Block<String> &commands)
     {
       double elapsedTimeSeconds = profiler.elapsed()/1000.00;
       double bytesPerSecond = totalBytesRead / elapsedTimeSeconds;
-      String strBytesPerSecond = Utility::bytesTransferredToString(bytesPerSecond);
-      std::cout << "Transferred " << Utility::formatNumber(totalBytesRead) << " of " << Utility::formatNumber(fileLength) << " " << percent << " percent " << strBytesPerSecond << std::endl;
+      String strBytesPerSecond = Utility::byteCountToString(bytesPerSecond);
+      std::cout << "Transferred " << Utility::byteCountToString(totalBytesRead,false) << " of " << Utility::byteCountToString(fileLength,false) << " " << percent << " percent " << strBytesPerSecond << std::endl;
     }
-
   }
-  std::cout << "Transfer complete" << std::endl;
-  std::cout << "Received " << Utility::formatNumber(totalBytesRead) << " in " << Utility::formatNumber(profiler.end()) << "(ms)" << std::endl;
   writeFile.close();
+  std::cout << "Transfer complete.  Total packets received " << Utility::formatNumber(totalPacketsRead) << std::endl;
+  std::cout << "Received " << Utility::byteCountToString(totalBytesRead,false) << " in " << Utility::formatNumber(profiler.end()) << "(ms)" << std::endl;
   return totalBytesRead==fileLength;
 }
 
+/// @brief Read a PCKT message from the socket and return the length.  This message is of the form PCKT|{length} and the method returns the second parameter (length)
+/// @param  
+/// @return 
 size_t SocketConnectionReceiver::expectPacket(void)
 {
   Block<String> subCommands;
@@ -128,7 +164,7 @@ size_t SocketConnectionReceiver::expectPacket(void)
     sb.append("Received an invalid PCKT command");
     String str=sb.toString();
     std::cout << str << std::endl;
-    throw new InvalidOperationException(str);
+    throw InvalidOperationException(str);
   }
   if(!(subCommands[0]=="PCKT"))
   {
@@ -138,12 +174,15 @@ size_t SocketConnectionReceiver::expectPacket(void)
     sb.append("Expected PCKT but received ").append(subCommands[0]);
     String str = sb.toString();
     std::cout << str << std::endl;
-    throw new InvalidOperationException(str);
+    throw InvalidOperationException(str);
   }
   size_t bufferLength = subCommands[1].toULong();
   return bufferLength;
 }
 
+/// @brief Read a '\r\n' terminated string from the socket.  Return the number of bytes read
+/// @param line The string to read data into
+/// @return 
 size_t SocketConnectionReceiver::readLine(String &line)
 {
     size_t bytes_read = 0;
@@ -169,6 +208,9 @@ size_t SocketConnectionReceiver::readLine(String &line)
     return total_bytes;
 }
 
+/// @brief Read bytes from a socket into the provided buffer.
+/// @param buffer The buffer must be pre-allocated to a given length.  The read operation will continue until all bytes in the buffer have been read
+/// @return 
 size_t SocketConnectionReceiver::read(Array<char> &buffer)
 {
     size_t bytes_read = 0;
@@ -185,3 +227,10 @@ size_t SocketConnectionReceiver::read(Array<char> &buffer)
     }
     return total_bytes_read;
 }
+
+/// @brief Handle a QUIT message... which just displays 
+/// @param  
+void SocketConnectionReceiver::handleQuit(void)
+{
+  std::cout << "Received QUIT" << std::endl;
+}

sstp/socketconnectionreceiver.hpp

@@ -1,5 +1,5 @@
-#ifndef _LISTENER_SOCKETCONNECTIONRECEIVER_HPP_
-#define _LISTENER_SOCKETCONNECTIONRECEIVER_HPP_
+#ifndef _SSTP_SOCKETCONNECTIONRECEIVER_HPP_
+#define _SSTP_SOCKETCONNECTIONRECEIVER_HPP_
 #include <stdio.h>
 #include <iostream>
 #include <sys/types.h>
@@ -16,13 +16,18 @@
 class SocketConnectionReceiver
 {
   public:
+    SocketConnectionReceiver();
     SocketConnectionReceiver(int socket, sockaddr_in inernalSocketAddress);
     virtual ~SocketConnectionReceiver();
+    void initialize(int socket, sockaddr_in inernalSocketAddress);
     void close(void);
   private:
     static constexpr size_t BUFFER_LENGTH=65536;   // this is the buffer length for the socket  
+    void isRunnable(bool isRunnable);
+    bool isRunnable(void);    
     void threadFunction(int data);
     bool handlePut(Block<String> &commands);
+    void handleQuit(void);
     size_t readLine(String &line);
     size_t expectPacket(void);
     size_t read(Array<char> &buffer);    
@@ -31,6 +36,19 @@ class SocketConnectionReceiver
     friend class SocketServer;
     char mBuffer[BUFFER_LENGTH] = {0};  
     int mSocket;
+    bool mIsRunnable;
     sockaddr_in mInternalSocketAddress;
 };
+
+inline
+void SocketConnectionReceiver::isRunnable(bool isRunnable)
+{
+  mIsRunnable=isRunnable;
+}
+
+inline
+bool SocketConnectionReceiver::isRunnable(void)
+{
+  return mIsRunnable;
+}
 #endif

sstp/socketserver.cpp

@@ -37,17 +37,45 @@ SocketServer::SocketServer(int port)
   mIsOkay=true;
 }
 
+/// @brief Close down the listener
 SocketServer::~SocketServer()
 {
-  std::cout << "~SocketServer()" << std::endl;
-  close();
+  shutdownConnectionReceivers();
+  join();    // Then join all socket threads
+  close();   // close the listener socket
+  
 }
 
+/// @brief Join all threads
+/// @param  
+void SocketServer::join(void)
+{
+  for (std::thread& executionThread : mExecutionThreads)
+  {
+    if (executionThread.joinable())
+    { 
+        executionThread.join();
+    } 
+  } 
+}
+
+/// @brief Remove object references to the connection receivers.  This will force socket threads to exit and close connections
+void SocketServer::shutdownConnectionReceivers()
+{
+  mSocketConnectionReceivers.remove();  
+}
+
+
+/// @brief returns true if we have a valid socket connection otherwise false
+/// @return 
 bool SocketServer::isOkay(void)
 {
   return mIsOkay;
 }
 
+/// @brief This is the listener.  It will wait for incoming connections.
+/// When an incoming connection is received it will create a SocketConnectionReceiver object and call it's threadFunction to handle further interactions
+/// such as transmitting a file.
 void SocketServer::listen(void)
 {
   while(isOkay())
@@ -70,11 +98,19 @@ void SocketServer::listen(void)
       close();
       return;
     }
-    SocketConnectionReceiver socketConnectionReceiver(socket, internalSocketAddress);
-    mExecutionThreads.push_back(std::thread(&SocketConnectionReceiver::threadFunction, &socketConnectionReceiver, 0));
+    mSocketConnectionReceivers.insert(SmartPointer<SocketConnectionReceiver>());
+    SmartPointer<SocketConnectionReceiver> &pSocketConnectionReceiver = mSocketConnectionReceivers[mSocketConnectionReceivers.size()-1];
+    pSocketConnectionReceiver = ::new SocketConnectionReceiver(socket, internalSocketAddress);
+    pSocketConnectionReceiver.disposition(PointerDisposition::Delete);
+    mExecutionThreads.push_back(std::thread(&SocketConnectionReceiver::threadFunction, *pSocketConnectionReceiver, 0));
+
+//    SocketConnectionReceiver socketConnectionReceiver(socket, internalSocketAddress);
+//    mExecutionThreads.push_back(std::thread(&SocketConnectionReceiver::threadFunction, &socketConnectionReceiver, 0));
   }
 }
 
+/// @brief Shut down the listener socket
+/// @param  
 void SocketServer::close(void)
 {
   if(-1!=mSocketFileDescriptor)

sstp/socketserver.hpp

@@ -13,6 +13,9 @@
 #include <common/profiler.hpp>
 #include <common/block.hpp>
 #include <common/fileio.hpp>
+#include <common/pointer.hpp>
+
+class SocketConnectionReceiver;
 
 class SocketServer
 {
@@ -24,11 +27,15 @@ class SocketServer
     bool isOkay(void);
   private:
     static constexpr int MAX_CONNECTIONS=10;   // The maximum connections to be queued at a time
+    void shutdownConnectionReceivers();    
+    void join(void);
+
     bool mIsOkay;
     int mListenPort;
     int mSocketFileDescriptor;
     struct sockaddr_in mInternalSocketAddress;
     socklen_t mAddressLength = sizeof(mInternalSocketAddress);
     std::vector<std::thread> mExecutionThreads;
+    Block<SmartPointer<SocketConnectionReceiver>> mSocketConnectionReceivers;
 };
 #endif