Some other fixes, changed return structure of sockOpen when it fails connecting.

bConnected, iErrorCode sockOpen (...)

Author: [email protected]

sockets/CFunctions.cpp

@@ -18,31 +18,36 @@
 
 #include "CFunctions.h"
 
+// bool sockOpen ( string strHost, int usPort [, bool bListen = false ] )
 int CFunctions::sockOpen(lua_State* luaVM)
 {
     if ( luaVM )
     {
         // Make sure host is a string, and port is a number
-        if (lua_type(luaVM, 1) == LUA_TSTRING && lua_type(luaVM, 2) == LUA_TNUMBER)
+        if ( lua_type ( luaVM, 1 ) == LUA_TSTRING && lua_type ( luaVM, 2 ) == LUA_TNUMBER )
         {
             // Put the host in a string, and the port in an unsigned short
-            string strHost        = lua_tostring(luaVM, 1);
+            string strHost        = lua_tostring ( luaVM, 1 );
             unsigned short usPort = static_cast < unsigned short > ( lua_tonumber ( luaVM, 2 ) );
+            //bool bListen          = ( ( lua_type ( luaVM, 3 ) == LUA_TBOOLEAN ) ? lua_toboolean ( luaVM, 3 ) : false );
 
             // Create the socket
             CSocket* pSocket = new CSocket(luaVM, strHost, usPort);
             void* pUserdata  = pSocket->GetUserdata();
 
             // The socket has got a userdata value if successfully created. It doesn't otherwise
-            if (pUserdata == NULL)
+            if ( pUserdata == NULL || pSocket->IsConnected () == false )
             {
-                SAFE_DELETE(pSocket);
-                lua_pushboolean(luaVM, false);
+                lua_pushboolean ( luaVM, false );
+                lua_pushnumber  ( luaVM, pSocket->GetLastSocketError ( ) );
+
+                // Delete the socket now.
+                SAFE_DELETE ( pSocket );
                 return 1;
             }
 
             // Add the socket to the Pulse list
-            CSocketManager::SocketAdd(pSocket);
+            CSocketManager::SocketAdd ( pSocket/*, bListen*/ );
 
             // Return the userdata
             lua_pushlightuserdata(luaVM, pUserdata);
@@ -54,6 +59,7 @@ int CFunctions::sockOpen(lua_State* luaVM)
     return 1;
 }
 
+// bool sockWrite ( userdata usSocket, string strData )
 int CFunctions::sockWrite(lua_State *luaVM)
 {
     if ( luaVM )
@@ -83,6 +89,7 @@ int CFunctions::sockWrite(lua_State *luaVM)
     return 1;
 }
 
+// bool sockClose ( userdata usSocket )
 int CFunctions::sockClose(lua_State *luaVM)
 {
     if ( luaVM )

sockets/CSocket.cpp

@@ -189,13 +189,8 @@ void CSocket::SetNonBlocking()
 
 int CSocket::GetLastSocketError()
 {
-    // Multi-platform function for getting the last socket error
-
-#ifdef WIN32
-    return WSAGetLastError();
-#else
+    // Multi-platform function for getting the last socket error (See CSocket.h)
     return errno;
-#endif
 }
 
 void CSocket::CloseSocket()
@@ -210,7 +205,8 @@ void CSocket::CloseSocket()
 #endif
 
     // Unset the socket variable, so there's no mistaking there
-    m_pSocket = NULL;
+    m_pSocket    = NULL;
+    m_bConnected = false;
 }
 
 int CSocket::HandleConnection(const int& iError)
@@ -227,8 +223,10 @@ int CSocket::HandleConnection(const int& iError)
     }
     else
     {
-        printf("Could not connect due to error: %i",iError); // TEMP DEBUG
-        return -1;
+#ifdef _DEBUG
+        printf ( "Could not connect due to error: %i\n", iError ); // TEMP DEBUG
+#endif
+        return ERR_CONNECT_FAILURE;
     }
 }
 

sockets/CSocket.h

@@ -17,6 +17,9 @@
 
 #ifdef WIN32
     #include <winsock2.h>
+
+    #undef errno
+    #define errno WSAGetLastError()
 #else
     #include <unistd.h>
     #include <sys/types.h>
@@ -35,19 +38,19 @@
 class CSocket
 {
 public:
-    CSocket           (lua_State *luaVM, const string& strHost, const unsigned short& usPort);
-    ~CSocket          ();
+    CSocket                     (lua_State *luaVM, const string& strHost, const unsigned short& usPort);
+    ~CSocket                    ();
 
-    bool Send         (const string& data);
-    bool DoPulse      ();
-    bool IsConnected  ();
+    bool Send                   (const string& data);
+    bool DoPulse                ();
+    bool IsConnected            ();
+    int  GetLastSocketError     ();
 
-    void* GetUserdata ();
+    void* GetUserdata           ();
 
 private:
     bool ProcessTargetLocation (const string& strHost, const unsigned short& usPort);
     void SetNonBlocking        ();
-    int  GetLastSocketError    ();
     void CloseSocket           ();
     int  HandleConnection      (const int& iError);
     void TriggerEvent          (const string eventName, const string arg1 = "");

sockets/ml_sockets.h

@@ -21,17 +21,18 @@
 
 // Disable Visual Studio warnings
 #ifdef WIN32
-    #pragma warning (disable : 4267) // DISABLE: conversion from 'size_t' to 'int', possible loss of data
+    #pragma warning (disable : 4267) // DISABLE: conversion from 'size_t' to 'int', possible loss of data.
     #pragma warning (disable : 4996) // DISABLE: 'strcpy': This function or variable may be unsafe.
-    #pragma warning (disable : 4244) // DISABLE: conversion from 'SOCKET' to 'int', possible loss of data
+    #pragma warning (disable : 4244) // DISABLE: conversion from 'SOCKET' to 'int', possible loss of data.
+    #pragma warning (disable : 4800) // DISABLE: 'int' : forcing value to bool 'true' or 'false' (performance warning).
 #endif
 
 #include <assert.h>
 
 /** MODULE SPECIFIC INFORMATION **/
 #define MODULE_NAME			"Sockets Module"
 #define	MODULE_AUTHOR		"Gamesnert, MCvarial & x86"
-#define MODULE_VERSION		1.2f
+#define MODULE_VERSION		1.3f
 
 // Include default MTA module SDK includes
 #include "Common.h"