Changeset 315 in Main for trunk/Server/server.c

Timestamp:

Oct 14, 2024, 7:01:02 PM (5 weeks ago)

Author:

Nishi

Message:

wip

File:

• trunk/Server/server.c (modified) (9 diffs)

trunk/Server/server.c

@@ -48 +48 @@
 #endif
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__) && !defined(__NETWARE__))
 #ifndef NO_GETNAMEINFO
 #include <ws2tcpip.h>
@@ -63 +63 @@
 #include "strptime.h"
 typedef int socklen_t;
+#elif defined(__NETWARE__)
+#include <sys/socket.h>
+#include <nwthread.h>
+
+typedef int socklen_t;
+#define IPPROTO_TCP 0
+#define INADDR_ANY 0
+#define htons(x) x
+#include "strptime.h"
 #else
 #ifdef USE_POLL
@@ -137 +146 @@
 #ifdef __OS2__
         soclose(sock);
+#elif defined(__NETWARE__)
+        shutdown(sock, 2);
 #elif defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
         closesocket(sock);
@@ -146 +157 @@
 int tw_server_init(void) {
         int i;
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__) && !defined(__NETWARE__))
         WSADATA wsa;
 #ifdef USE_WINSOCK1
@@ -522 +533 @@
         struct sockaddr* sa = (struct sockaddr*)&addr;
         getnameinfo(sa, sizeof(addr), address, 512, NULL, 0, NI_NUMERICHOST);
-#else
-                addrstr = inet_ntoa(addr.sin_addr);
-                strcpy(address, addrstr);
-                address[strlen(addrstr)] = 0;
+#elif defined(__NETWARE__)
+                address[0] = 0;
+#else
+        addrstr = inet_ntoa(addr.sin_addr);
+        strcpy(address, addrstr);
+        address[strlen(addrstr)] = 0;
 #endif
 #ifdef FREE_PTR
@@ -632 +645 @@
                         tw_mod_request_t mod_req = (tw_mod_request_t)tw_module_symbol(config.modules[i], "MOD_REQUEST");
 #else
-                        tw_mod_request_t mod_req = (tw_mod_request_t)tw_module_symbol(config.modules[i], "mod_request");
+                                tw_mod_request_t mod_req = (tw_mod_request_t)tw_module_symbol(config.modules[i], "mod_request");
 #endif
                         if(mod_req != NULL) {
@@ -941 +954 @@
         close_socket(sock);
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#ifdef __NETWARE__
+        ExitThread(EXIT_THREAD, 0);
+#else
         _endthread();
+#endif
 #elif defined(__HAIKU__)
                 exit_thread(0);
@@ -959 +976 @@
 #ifdef __HAIKU__
         thread_id thread;
+#elif defined(__NETWARE__)
+        int thread;
 #else
         HANDLE handle;
@@ -1046 +1065 @@
 #ifdef __OS2__
                                         _beginthread(tw_server_pass, 0, 0, e);
+#elif defined(__NETWARE__)
+                                        BeginThread(tw_server_pass, 0, 0, e);
 #else
                                         _beginthread(tw_server_pass, 0, e);