Replace ioctl with fcntl, fix ioctlsocket calls (64-bit fix)

`ioctl` and `ioctlsocket` take two different types of arguments but worked in the past due to long being 32-bit. However, ioctl functionality is non-standard and should not be used in code written after **1997** in order to make sockets non-blocking. This functionality was standardized as part of fcntl.
DescentDevelopers · May 18, 2024 · aaf52fd · aaf52fd
1 parent fd3f171
commit aaf52fd
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 34 deletions.
diff --git a/Descent3/dedicated_server.cpp b/Descent3/dedicated_server.cpp
@@ -109,6 +109,7 @@
 #include <stdlib.h>
 
 #ifndef __LINUX__
+#include <fcntl.h>
 typedef int socklen_t;
 #endif
 
@@ -859,12 +860,12 @@ void InitDedicatedSocket(ushort port) {
   }
   // Make the socket non-blocking
 
-#if defined(WIN32)
-  u_long argp = 1;
-  ioctlsocket(dedicated_listen_socket, FIONBIO, &argp);
+#ifdef WIN32
+    unsigned long arg = 1;
+    ioctlsocket(dedicated_listen_socket, FIONBIO, &arg);
 #elif defined(__LINUX__)
-  int argp = 1;
-  ioctl(dedicated_listen_socket, FIONBIO, &argp);
+    fcntl(dedicated_listen_socket, F_SETFL,
+          fcntl(dedicated_listen_socket, F_GETFL, 0) | O_NONBLOCK);
 #endif
 }
 
@@ -877,13 +878,14 @@ void ListenDedicatedSocket(void) {
   if (INVALID_SOCKET != incoming_socket) {
     // Make the socket non-blocking
 
-#if defined(WIN32)
-    u_long argp = 1;
-    ioctlsocket(incoming_socket, FIONBIO, &argp);
+#ifdef WIN32
+    unsigned long arg = 1;
+    ioctlsocket(incoming_socket, FIONBIO, &arg);
 #elif defined(__LINUX__)
-    int argp = 1;
-    ioctl(incoming_socket, FIONBIO, &argp);
+    fcntl(incoming_socket, F_SETFL,
+          fcntl(incoming_socket, F_GETFL, 0) | O_NONBLOCK);
 #endif
+
     if (!Dedicated_allow_remote) {
       // Check to see if this came in from the local address
       unsigned long localhost = inet_addr("127.0.0.1");

diff --git a/ddebug/lnxmono.cpp b/ddebug/lnxmono.cpp
@@ -62,7 +62,6 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
 #include <errno.h>
 
 #define MAX_TCPLOG_LEN 2000

diff --git a/legacy/inetfile/Chttpget.cpp b/legacy/inetfile/Chttpget.cpp
@@ -130,6 +130,7 @@
 #endif
 
 #ifdef __LINUX__
+#include <fcntl.h>
 
 inline void Sleep(int millis)
 {
@@ -201,14 +202,14 @@ void ChttpGet::PrepSocket(char *URL)
 	{
 		m_State = HTTP_STATE_SOCKET_ERROR;
 		return;
-	}
-	unsigned long arg;
+  }
 
-	arg = true;
-#if defined(WIN32)
-	ioctlsocket( m_DataSock, FIONBIO, &arg );
+#ifdef WIN32
+  unsigned long arg = 1;
+  ioctlsocket(m_DataSock, FIONBIO, &arg);
 #elif defined(__LINUX__)
-	ioctl( m_DataSock, FIONBIO, &arg );
+  fcntl(m_DataSock, F_SETFL,
+        fcntl(m_DataSock, F_GETFL, 0) | O_NONBLOCK);
 #endif
 
 	char *pURL = URL;

diff --git a/legacy/mtclient/chat_api.cpp b/legacy/mtclient/chat_api.cpp
@@ -35,6 +35,7 @@
 #include "networking.h"
 #include <sys/time.h>
 #include <unistd.h>
+#include <fcntl.h>
 #endif
 
 #include "chat_api.h"
@@ -133,8 +134,7 @@ int ConnectToChatServer(char *serveraddr,char *nickname,char *trackerid)
 {
 	short chat_port;
 	char chat_server[50];
-	char *p;
-	unsigned long argp = 1;
+  char *p;
 	char signon_str[100];
 
 	//if(Socket_connected && ) return -2;
@@ -187,9 +187,11 @@ int ConnectToChatServer(char *serveraddr,char *nickname,char *trackerid)
 		}
 
 #ifdef WIN32
-	ioctlsocket( Chatsock, FIONBIO, &argp );
+    unsigned long arg = 1;
+    ioctlsocket(Chatsock, FIONBIO, &arg);
 #elif defined(__LINUX__)
-	ioctl(Chatsock,FIONBIO,&argp);
+    fcntl(Chatsock, F_SETFL,
+          fcntl(Chatsock, F_GETFL, 0) | O_NONBLOCK);
 #endif
 
 

diff --git a/lib/networking.h b/lib/networking.h
@@ -201,7 +201,6 @@ static inline void INADDR_GET_SUN_SUNB(struct in_addr *st, unsigned char *s_b1,
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/uio.h>
-#include <sys/ioctl.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <pthread.h>

diff --git a/netcon/includes/inetgetfile.h b/netcon/includes/inetgetfile.h
@@ -93,7 +93,6 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <netdb.h>
 #include <sys/time.h>
 #include <unistd.h>

diff --git a/netcon/inetfile/Chttpget.cpp b/netcon/inetfile/Chttpget.cpp
@@ -139,7 +139,7 @@
 #endif
 
 #ifdef __LINUX__
-
+#include <fcntl.h>
 #include "SDL_thread.h"
 
 inline void Sleep(int millis) {
@@ -210,13 +210,13 @@ void ChttpGet::PrepSocket(char *URL) {
     m_State = HTTP_STATE_SOCKET_ERROR;
     return;
   }
-  unsigned int arg = 1;
-
+
   #ifdef WIN32
-    u_long argWin = static_cast<u_long>(arg);
-    ioctlsocket(m_DataSock, FIONBIO, &argWin);
-  #elif defined(__linux__)
-    ioctl(m_DataSock, FIONBIO, &arg);
+  unsigned long arg = 1;
+  ioctlsocket(m_DataSock, FIONBIO, &arg);
+  #elif defined(__LINUX__)
+  fcntl(m_DataSock, F_SETFL,
+        fcntl(m_DataSock, F_GETFL, 0) | O_NONBLOCK);
   #endif
 
   char *pURL = URL;

diff --git a/networking/networking.cpp b/networking/networking.cpp
@@ -672,13 +672,12 @@ void nw_SetSocketOptions(SOCKET sock) {
   setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (LPSTR)&broadcast, sizeof(broadcast));
 
   int error;
-  unsigned long arg;
-
-  arg = TRUE;
 #ifdef WIN32
+  unsigned long arg = 1;
   error = ioctlsocket(sock, FIONBIO, &arg);
 #elif defined(__LINUX__)
-  error = ioctl(sock, FIONBIO, &arg);
+  fcntl(sock, F_SETFL,
+        fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
 #endif
   if (error == SOCKET_ERROR) {
     mprintf((0, "Unable to make socket non-blocking -- %d", WSAGetLastError()));