Importnant update:

- Add callback functions for change in socket states

SelectableCore.cpp

@@ -259,6 +259,19 @@ bool  CSelectableCore::ClearHandle( THandle * Handle )
 }
 //---------------------------------------------------------------------------
 
+bool CSelectableCore::SetCallback( THandle * Handle, EConnectState pState, FHandleCallback pCallback )
+{
+    // Validate
+    if (!Handle) {
+        return false;
+    }
+
+    // Set callback
+    Handle->StateCallback[ (int)pState ] = pCallback;
+    return true;
+}
+//---------------------------------------------------------------------------
+
 bool CSelectableCore::SetAutoManage( THandle * Handle, bool AutoManage, int ReopenTime )
 {
     // Validate
@@ -348,7 +361,7 @@ int CSelectableCore::OpenPort( THandle * Handle )
     }
 
     // Set state
-    Handle->State = csOpen;
+    ChangeState( Handle, csOpen );
     return Handle->FD;
 }
 
@@ -440,7 +453,7 @@ int CSelectableCore::OpenForkPipe( THandle * Handle )
     }
 
     // Set state
-    Handle->State = csOpen;
+    ChangeState( Handle, csOpen );
     return Handle->FD;
 }
 
@@ -480,7 +493,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
         if (Log)  Log->Message( DebugLevel, dlMedium, "%s: Handle '%s' - Failed to create Server socket [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
 
         // Set state
-        Handle->State = csFailed;
+        ChangeState( Handle, csFailed );
         return -1;
     };
 
@@ -492,7 +505,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
         if (Log)  Log->Message( DebugLevel, dlMedium, "%s: Handle '%s' - Could not set socket options [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
 
         // Set state
-        Handle->State = csFailed;
+        ChangeState( Handle, csFailed );
         return -1;
     }
 
@@ -507,7 +520,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
         if (Log)  Log->Message( DebugLevel, dlMedium, "%s: Handle '%s' - Could not set KeepAlive options [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
 
         // Set state
-        Handle->State = csFailed;
+        ChangeState( Handle, csFailed );
         return -1;
     }
 
@@ -524,7 +537,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
         // Set state
         close( Handle->FD );
         Handle->FD = -1;
-        Handle->State = csFailed;
+        ChangeState( Handle, csFailed );
         return -1;
     };
 
@@ -537,7 +550,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
         // Set state
         close( Handle->FD );
         Handle->FD = -1;
-        Handle->State = csFailed;
+        ChangeState( Handle, csFailed );
         return -1;
     };
 
@@ -550,7 +563,7 @@ int CSelectableCore::OpenServerSocket( THandle * Handle )
     }
 
     // Set state
-    Handle->State = csOpen;
+    ChangeState( Handle, csOpen );
     return Handle->FD;
 }
 //---------------------------------------------------------------------------
@@ -639,7 +652,7 @@ int CSelectableCore::OpenRemoteClientSocket( THandle * Handle )
             if (Log)  Log->Message( DebugLevel, dlMedium, "%s: Handle '%s' - Remote Client connection open [%s]", Name, Handle->Name, Handle->Address );
 
             // Update state
-            Handle->State = csOpen;
+            ChangeState( Handle, csOpen );
             return Handle->FD;
         }
     }
@@ -673,7 +686,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
             if (Log)  Log->Message( DebugLevel, dlMedium, "%s: Handle '%s' - Failed to create Client socket [%s:%d] (%s)", Name, Handle->Name, Handle->Address, Handle->PortNo, strerror(errno) );
 
             // Set Status
-            Handle->State = csFailed;
+            ChangeState( Handle, csFailed );
             return -1;
         };
 
@@ -694,7 +707,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
             // Set State
             close( Handle->FD );
             Handle->FD = -1;
-            Handle->State = csFailed;
+            ChangeState( Handle, csFailed );
             return -1;
         }
     }
@@ -715,7 +728,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
         }
 
         // Set status
-        Handle->State = csOpen;
+        ChangeState( Handle, csOpen );
         return Handle->FD;
     }
     else if ((errno == EAGAIN) || (errno == EWOULDBLOCK) || (errno == EINPROGRESS) || (errno == EALREADY))
@@ -729,7 +742,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
         }
 
         // Set status
-        Handle->State = csWaitingtoOpen;
+        ChangeState( Handle, csWaitingtoOpen );
         return Handle->FD;
     }
     else
@@ -744,7 +757,7 @@ int CSelectableCore::OpenClientSocket( THandle * Handle )
 
         // Close socket
         close( Handle->FD );
-        Handle->State = csFailed;
+        ChangeState( Handle, csFailed );
 
         // Start re-open timer
         SetStartTime( &(Handle->ReopenStart) );
@@ -821,7 +834,7 @@ bool CSelectableCore::Close( THandle * Handle, bool CloseChildren )
 
     // Close Handle
     Fail = (close( Handle->FD ))? true : false;
-    Handle->State = ((Fail)? csFailed   : csClosed);
+    ChangeState( Handle, ((Fail)? csFailed   : csClosed) );
 
     // Start re-open timer
     SetStartTime( &(Handle->ReopenStart) );