Changeset 97 in Main for trunk

Timestamp:

Sep 19, 2024, 11:33:18 PM (8 weeks ago)

Author:

Nishi

Message:

fix select

File:

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

trunk/Server/server.c

@@ -42 +42 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
+#endif
+
+#ifdef __HAIKU__
+#include <OS.h>
 #endif
 
@@ -392 +396 @@
 }
 
-#ifdef __MINGW32__
 struct pass_entry {
         int sock;
@@ -400 +403 @@
 };
 
+#ifdef __MINGW32__
 unsigned int WINAPI tw_server_pass(void* ptr) {
+#elif defined(__HAIKU__)
+int32_t tw_server_pass(void* ptr) {
         int sock = ((struct pass_entry*)ptr)->sock;
         bool ssl = ((struct pass_entry*)ptr)->ssl;
@@ -802 +808 @@
                                         int sock = accept(sockets[i], (struct sockaddr*)&claddr, &clen);
                                         cm_log("Server", "New connection accepted");
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(__HAIKU__)
                                         struct pass_entry* e = malloc(sizeof(*e));
                                         e->sock = sock;
@@ -808 +814 @@
                                         e->port = config.ports[i];
                                         e->addr = claddr;
+#endif
+#ifdef __MINGW32__
                                         int j;
                                         for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
@@ -826 +834 @@
                                                 }
                                         }
+#elif defined(__HAIKU__)
+                                        thread_id thr = spawn_Thread(tw_server_pass, "Tewi HTTPd", 60, e);
 #else
                                         pid_t pid = fork();
@@ -832 +842 @@
                                                 for(j = 0; j < sockcount; j++) close_socket(sockets[j]);
                                                 tw_server_pass(sock, config.ports[i] & (1ULL << 32), config.ports[i], claddr);
-#ifdef __HAIKU__
-                                                exit(0);
-#else
                                                 _exit(0);
-#endif
                                         } else {
                                                 close_socket(sock);