- Fixed sockOpen problems (Also sockOpen return values too).

sebasdevelopment@gmail.com · sebasdevelopment@gmail.com · commit 9999d1eea29d · 2011-04-30T17:06:22.000Z
- Added "bool sockIsConnected ( userdata usSocket )".
- Changed structure of CSocketManager.
diff --git a/sockets/CFunctions.cpp b/sockets/CFunctions.cpp
@@ -34,16 +34,23 @@ int CFunctions::sockOpen(lua_State* luaVM)
             // Create the socket
             CSocket* pSocket = new CSocket(luaVM, strHost, usPort);
             void* pUserdata  = pSocket->GetUserdata();
+            int iError       = pSocket->GetLastSocketError ( );
 
             // The socket has got a userdata value if successfully created. It doesn't otherwise
-            if ( pUserdata == NULL || pSocket->IsConnected () == false )
+            if ( pUserdata == NULL /*|| pSocket->IsConnected () == false*/ )
             {
+                SAFE_DELETE ( pSocket );
+
+                /*
+                 * (x86) TODO: Make static error codes, because error
+                 *             codes between Win and Linux are different.
+                 *             Put it in an array inside SocketErrors.h
+                 * --
+                 */
                 lua_pushboolean ( luaVM, false );
-                lua_pushnumber  ( luaVM, pSocket->GetLastSocketError ( ) );
+                lua_pushnumber  ( luaVM, iError );
 
-                // Delete the socket now.
-                SAFE_DELETE ( pSocket );
-                return 1;
+                return 2;
             }
 
             // Add the socket to the Pulse list
@@ -89,6 +96,35 @@ int CFunctions::sockWrite(lua_State *luaVM)
     return 1;
 }
 
+// bool sockIsConnected ( userdata usSocket )
+int CFunctions::sockIsConnected ( lua_State *luaVM )
+{
+    if ( luaVM )
+    {
+        // Make sure the socket is an userdata value
+        if ( lua_type ( luaVM, 1 ) == LUA_TLIGHTUSERDATA )
+        {
+            // Prepare vars
+            void* pUserdata  = lua_touserdata ( luaVM, 1 );
+            CSocket* pSocket = NULL;
+
+            // Get the socket
+            if ( CSocketManager::GetSocket ( pSocket, pUserdata ) )
+            {
+                // Remove it
+                if ( pSocket )
+                {
+                    lua_pushboolean ( luaVM, pSocket->IsConnected ( ) );
+                    return 1;
+                }
+            }
+        }
+    }
+
+    lua_pushboolean ( luaVM, false );
+    return 1;
+}
+
 // bool sockClose ( userdata usSocket )
 int CFunctions::sockClose(lua_State *luaVM)
 {
@@ -105,10 +141,11 @@ int CFunctions::sockClose(lua_State *luaVM)
             if (CSocketManager::GetSocket(pSocket, pUserdata))
             {
                 // Remove it
-                CSocketManager::SocketRemove(pSocket);
-
-                lua_pushboolean(luaVM, true);
-                return 1;
+                if ( CSocketManager::SocketRemove(pSocket) )
+                {
+                    lua_pushboolean(luaVM, true);
+                    return 1;
+                }
             }
         }
     }
diff --git a/sockets/CFunctions.h b/sockets/CFunctions.h
@@ -30,9 +30,10 @@ extern ILuaModuleManager10 *pModuleManager;
 class CFunctions
 {
 public:
-    static int sockOpen  (lua_State* luaVM);
-    static int sockWrite (lua_State* luaVM);
-    static int sockClose (lua_State* luaVM);
+    static int sockOpen         (lua_State* luaVM);
+    static int sockWrite        (lua_State* luaVM);
+    static int sockIsConnected  (lua_State* luaVM);
+    static int sockClose        (lua_State* luaVM);
 
     static void AddEvent (lua_State* luaVM, const string& strEventName);
 };
diff --git a/sockets/CSocket.cpp b/sockets/CSocket.cpp
@@ -163,16 +163,16 @@ bool CSocket::ProcessTargetLocation(const string& strHost, const unsigned short&
     else
     {
         Hostent = gethostbyname(strHost.c_str());
-        if (Hostent == NULL)
-        {
-            return false;
-        }
-        else
+        if (Hostent != NULL)
         {
             memcpy(&(m_sSockAddr.sin_addr), Hostent->h_addr_list[0], 4);
             return true;
         }
+
+        Hostent = NULL;
     }
+
+    return false;
 }
 
 void CSocket::SetNonBlocking()
diff --git a/sockets/CSocketManager.cpp b/sockets/CSocketManager.cpp
@@ -9,15 +9,15 @@
 #include "CSocketManager.h"
 
 // Vector for holding all sockets
-vector <CSocket*> vecSockets;
+vector <sSocketsStorage*> vecSockets;
 
 void CSocketManager::DoPulse()
 {
     // Loop through all sockets
     for (unsigned int i = 0; i < vecSockets.size(); ++i)
     {
         // Get the socket by the ID
-        CSocket* pSocket = vecSockets[i];
+        CSocket* pSocket = (CSocket *)vecSockets[i]->m_pSocket;
 
         // Do a pulse at the socket
         if (!pSocket->DoPulse())
@@ -28,23 +28,24 @@ void CSocketManager::DoPulse()
     }
 }
 
-void CSocketManager::SocketAdd(CSocket*& pSocket)
+void CSocketManager::SocketAdd(CSocket*& pSocket, bool bListen )
 {
     // Add the socket to the loop stuff
-    vecSockets.push_back(pSocket);
+    sSocketsStorage* pSocketStorage = new sSocketsStorage ( pSocket, bListen );
+    vecSockets.push_back ( pSocketStorage );
 }
 
 bool CSocketManager::SocketRemove(CSocket*& pSocket)
 {
     // Check if an socket was actually specified
-    if (pSocket == NULL)
+    if ( pSocket == NULL )
         return false;
 
     // Loop through all sockets
     for (unsigned int i = 0; i < vecSockets.size(); ++i)
     {
         // If the current is the one we're looking for...
-        if (vecSockets[i] == pSocket)
+        if ((CSocket *)vecSockets[i]->m_pSocket == pSocket)
         {
             // Remove it from the vector and delete it, then return true
             vecSockets.erase(vecSockets.begin() + i);
@@ -66,10 +67,10 @@ bool CSocketManager::GetSocket(CSocket*& pSocket, void* pUserdata)
     for (unsigned int i = 0; i < vecSockets.size(); ++i)
     {
         // Compare the current socket's userdata with the one we're looking for
-        if (vecSockets[i]->GetUserdata() == pUserdata)
+        if ( (CSocket *)vecSockets[i]->m_pSocket->GetUserdata() == pUserdata )
         {
             // If it's the one we want, assign pSocket to it and return true
-            pSocket = vecSockets[i];
+            pSocket = (CSocket *)vecSockets[i]->m_pSocket;
             return true;
         }
     }
@@ -81,5 +82,5 @@ void CSocketManager::HandleStop()
 {
     // Triggered at module stop. Simply destroys all sockets
     for (unsigned int i = 0; i < vecSockets.size(); ++i)
-        SAFE_DELETE(vecSockets[i]);
+        SAFE_DELETE((CSocket *)vecSockets[i]->m_pSocket);
 }
diff --git a/sockets/CSocketManager.h b/sockets/CSocketManager.h
@@ -14,14 +14,26 @@ class CSocket;
 #include <vector>
 #include "ml_sockets.h"
 
+struct sSocketsStorage
+{
+    CSocket*    m_pSocket;
+    bool        m_bListen;
+
+    sSocketsStorage ( CSocket* pSocket, bool bListen = false )
+    {
+        m_pSocket = pSocket;
+        m_bListen = bListen;
+    }
+};
+
 class CSocketManager
 {
 public:
-    static void DoPulse();
+    static void DoPulse     ();
     
-    static void SocketAdd   (CSocket*& pSocket);
-    static bool SocketRemove(CSocket*& pSocket);
-    static bool GetSocket   (CSocket*& pSocket, void* pUserdata);
+    static void SocketAdd   ( CSocket*& pSocket, bool bListen = false );
+    static bool SocketRemove( CSocket*& pSocket );
+    static bool GetSocket   ( CSocket*& pSocket, void* pUserdata );
 
     static void HandleStop  ();
 };
diff --git a/sockets/ml_sockets.cpp b/sockets/ml_sockets.cpp
@@ -58,6 +58,7 @@ MTAEXPORT void RegisterFunctions ( lua_State * luaVM )
         // Register functions
         pModuleManager->RegisterFunction ( luaVM, "sockOpen",  CFunctions::sockOpen );
         pModuleManager->RegisterFunction ( luaVM, "sockWrite", CFunctions::sockWrite );
+        pModuleManager->RegisterFunction ( luaVM, "sockIsConnected", CFunctions::sockIsConnected );
         pModuleManager->RegisterFunction ( luaVM, "sockClose", CFunctions::sockClose );
 
         // Add events

Original file line number	Diff line number	Diff line change
`@@ -163,16 +163,16 @@ bool CSocket::ProcessTargetLocation(const string& strHost, const unsigned short&`
`163`	`163`	`else`
`164`	`164`	`{`
`165`	`165`	`Hostent = gethostbyname(strHost.c_str());`
`166`		`- if (Hostent == NULL)`
`167`		`- {`
`168`		`- return false;`
`169`		`- }`
`170`		`- else`
	`166`	`+ if (Hostent != NULL)`
`171`	`167`	`{`
`172`	`168`	`memcpy(&(m_sSockAddr.sin_addr), Hostent->h_addr_list[0], 4);`
`173`	`169`	`return true;`
`174`	`170`	`}`
	`171`	`+`
	`172`	`+ Hostent = NULL;`
`175`	`173`	`}`
	`174`	`+`
	`175`	`+ return false;`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`void CSocket::SetNonBlocking()`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,15 @@`
`9`	`9`	`#include "CSocketManager.h"`
`10`	`10`
`11`	`11`	`// Vector for holding all sockets`
`12`		`-vector <CSocket*> vecSockets;`
	`12`	`+vector <sSocketsStorage*> vecSockets;`
`13`	`13`
`14`	`14`	`void CSocketManager::DoPulse()`
`15`	`15`	`{`
`16`	`16`	`// Loop through all sockets`
`17`	`17`	`for (unsigned int i = 0; i < vecSockets.size(); ++i)`
`18`	`18`	`{`
`19`	`19`	`// Get the socket by the ID`
`20`		`- CSocket* pSocket = vecSockets[i];`
	`20`	`+ CSocket* pSocket = (CSocket *)vecSockets[i]->m_pSocket;`
`21`	`21`
`22`	`22`	`// Do a pulse at the socket`
`23`	`23`	`if (!pSocket->DoPulse())`
`@@ -28,23 +28,24 @@ void CSocketManager::DoPulse()`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-void CSocketManager::SocketAdd(CSocket*& pSocket)`
	`31`	`+void CSocketManager::SocketAdd(CSocket*& pSocket, bool bListen )`
`32`	`32`	`{`
`33`	`33`	`// Add the socket to the loop stuff`
`34`		`- vecSockets.push_back(pSocket);`
	`34`	`+ sSocketsStorage* pSocketStorage = new sSocketsStorage ( pSocket, bListen );`
	`35`	`+ vecSockets.push_back ( pSocketStorage );`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`bool CSocketManager::SocketRemove(CSocket*& pSocket)`
`38`	`39`	`{`
`39`	`40`	`// Check if an socket was actually specified`
`40`		`- if (pSocket == NULL)`
	`41`	`+ if ( pSocket == NULL )`
`41`	`42`	`return false;`
`42`	`43`
`43`	`44`	`// Loop through all sockets`
`44`	`45`	`for (unsigned int i = 0; i < vecSockets.size(); ++i)`
`45`	`46`	`{`
`46`	`47`	`// If the current is the one we're looking for...`
`47`		`- if (vecSockets[i] == pSocket)`
	`48`	`+ if ((CSocket *)vecSockets[i]->m_pSocket == pSocket)`
`48`	`49`	`{`
`49`	`50`	`// Remove it from the vector and delete it, then return true`
`50`	`51`	`vecSockets.erase(vecSockets.begin() + i);`
`@@ -66,10 +67,10 @@ bool CSocketManager::GetSocket(CSocket& pSocket, void pUserdata)`
`66`	`67`	`for (unsigned int i = 0; i < vecSockets.size(); ++i)`
`67`	`68`	`{`
`68`	`69`	`// Compare the current socket's userdata with the one we're looking for`
`69`		`- if (vecSockets[i]->GetUserdata() == pUserdata)`
	`70`	`+ if ( (CSocket *)vecSockets[i]->m_pSocket->GetUserdata() == pUserdata )`
`70`	`71`	`{`
`71`	`72`	`// If it's the one we want, assign pSocket to it and return true`
`72`		`- pSocket = vecSockets[i];`
	`73`	`+ pSocket = (CSocket *)vecSockets[i]->m_pSocket;`
`73`	`74`	`return true;`
`74`	`75`	`}`
`75`	`76`	`}`
`@@ -81,5 +82,5 @@ void CSocketManager::HandleStop()`
`81`	`82`	`{`
`82`	`83`	`// Triggered at module stop. Simply destroys all sockets`
`83`	`84`	`for (unsigned int i = 0; i < vecSockets.size(); ++i)`
`84`		`- SAFE_DELETE(vecSockets[i]);`
	`85`	`+ SAFE_DELETE((CSocket *)vecSockets[i]->m_pSocket);`
`85`	`86`	`}`