Changeset 349 in Main for trunk

Timestamp:

Oct 16, 2024, 5:08:08 AM (4 weeks ago)

Author:

Nishi

Message:

fix some stuff

Location:

trunk/Server

Files:

• config.c (modified) (1 diff)
• http.c (modified) (1 diff)
• main.c (modified) (1 diff)
• module.c (modified) (3 diffs)
• server.c (modified) (4 diffs)
• tw_config.h (modified) (1 diff)

trunk/Server/config.c

@@ -33 +33 @@
 
 #ifdef __NETWARE__
-#include <arpa/inet.h>
+#include <sys/socket.h>
 #endif
 #include "tw_config.h"

trunk/Server/http.c

@@ -30 +30 @@
 #elif defined(__NETWARE__)
 #include <sys/socket.h>
-#include <sys/select.h>
 #else
 #ifdef USE_POLL

trunk/Server/main.c

@@ -38 +38 @@
 #include <windows.h>
 #elif defined(__NETWARE__)
-#include <nks/thread.h>
-#include <screen.h>
 #endif
 

trunk/Server/module.c

@@ -33 +33 @@
 #include <os2.h>
 #elif defined(__NETWARE__)
-#include <dlfcn.h>
+#include <nwadv.h>
+#include <nwthread.h>
 #else
 #include <windows.h>
@@ -59 +60 @@
         lib = (void*)mod;
 #elif defined(__NETWARE__)
-        lib = dlopen(path, RTLD_LAZY);
+        *hnd = FindNLMHandle(path);
+        lib = (void*)hnd;
 #else
         lib = LoadLibraryA(path);
@@ -85 +87 @@
         return ret;
 #elif defined(__NETWARE__)
-        return dlsym(mod, sym);
+        return ImportSymbol(*(unsigned int*)mod, sym);
 #else
         return GetProcAddress(mod, sym);

trunk/Server/server.c

@@ -65 +65 @@
 #elif defined(__NETWARE__)
 #include <sys/socket.h>
-#include <arpa/inet.h>
-#include <sys/select.h>
-#include <pthread.h>
+
+#define IPPROTO_TCP 0
+#define INADDR_ANY 0
 #define htons(x) x
 #include "strptime.h"
+typedef int socklen_t;
 #else
 #ifdef USE_POLL
@@ -936 +937 @@
                                                 tw_http_error(s, sock, 403, name, port, vhost_entry);
                                         } else {
-#ifdef __NETWARE__
-                                                tw_process_page(s, sock, tw_http_status(200), mime, f, NULL, st.st_size, st.st_mtime.tv_sec, cmtime);
-#else
-                                                        tw_process_page(s, sock, tw_http_status(200), mime, f, NULL, st.st_size, st.st_mtime, cmtime);
-#endif
+                                                tw_process_page(s, sock, tw_http_status(200), mime, f, NULL, st.st_size, st.st_mtime, cmtime);
                                                 fclose(f);
                                         }
@@ -968 +965 @@
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
 #ifdef __NETWARE__
-        pthread_exit(NULL);
 #else
         _endthread();
@@ -1079 +1075 @@
                                         _beginthread(tw_server_pass, 0, 0, e);
 #elif defined(__NETWARE__)
-                                        pthread_t thr;
-                                        pthread_create(&thr, NULL, (void* (*)(void*))tw_server_pass, e);
-                                        pthread_detach(thr);
+                                        tw_server_pass(e);
 #else
                                         _beginthread(tw_server_pass, 0, e);

trunk/Server/tw_config.h

@@ -35 +35 @@
 #define NO_IPV6
 #endif
+#endif
+
+#ifdef __NETWARE__
+struct in_addr {
+        uint32_t s_addr;
+};
+struct sockaddr_in {
+        uint16_t sin_family;
+        uint16_t sin_port;
+        struct in_addr sin_addr;
+        uint8_t sin_zero[8];
+};
 #endif