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

Timestamp:

Sep 28, 2024, 1:15:15 AM (7 weeks ago)

Author:

Nishi

Message:

psp support

File:

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

trunk/Server/server.c

@@ -431 +431 @@
 #elif defined(__HAIKU__)
 int32_t tw_server_pass(void* ptr) {
-#endif
-#if defined(__HAIKU__) || defined(__MINGW32__)
+#elif defined(_PSP)
+int tw_server_pass(void* ptr) {
+#endif
+#if defined(__HAIKU__) || defined(__MINGW32__) || defined(_PSP)
         int sock = ((struct pass_entry*)ptr)->sock;
         bool ssl = ((struct pass_entry*)ptr)->ssl;
@@ -855 +857 @@
 #endif
 
+extern int running;
+
 void tw_server_loop(void) {
         int i;
@@ -873 +877 @@
                 struct timeval tv;
 #endif
-        while(1) {
+        while(running) {
 #ifdef USE_POLL
                 int ret = poll(pollfds, sockcount, 1000);
@@ -915 +919 @@
                                         int sock = accept(sockets[i], (struct sockaddr*)&claddr, &clen);
                                         cm_log("Server", "New connection accepted");
-#if defined(__MINGW32__) || defined(__HAIKU__)
+#if defined(__MINGW32__) || defined(__HAIKU__) || defined(_PSP)
                                         struct pass_entry* e = malloc(sizeof(*e));
                                         e->sock = sock;
@@ -941 +945 @@
                                                 }
                                         }
+#elif defined(_PSP)
+                                                tw_server_pass(e);
 #elif defined(__HAIKU__)
-                                                int j;
-                                                for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
-                                                        if(threads[j].used) {
-                                                                thread_info info;
-                                                                bool kill = false;
-                                                                if(get_thread_info(threads[j].thread, &info) == B_OK) {
-                                                                } else {
-                                                                        kill = true;
-                                                                }
-                                                                if(kill) {
-                                                                        threads[j].used = false;
-                                                                }
+                                        int j;
+                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
+                                                if(threads[j].used) {
+                                                        thread_info info;
+                                                        bool kill = false;
+                                                        if(get_thread_info(threads[j].thread, &info) == B_OK) {
+                                                        } else {
+                                                                kill = true;
+                                                        }
+                                                        if(kill) {
+                                                                threads[j].used = false;
                                                         }
                                                 }
-                                                for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
-                                                        if(!threads[j].used) {
-                                                                threads[j].thread = spawn_thread(tw_server_pass, "Tewi HTTPd", 60, e);
-                                                                threads[j].used = true;
-                                                                resume_thread(threads[j].thread);
-                                                                break;
-                                                        }
+                                        }
+                                        for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {
+                                                if(!threads[j].used) {
+                                                        threads[j].thread = spawn_thread(tw_server_pass, "Tewi HTTPd", 60, e);
+                                                        threads[j].used = true;
+                                                        resume_thread(threads[j].thread);
+                                                        break;
                                                 }
+                                        }
 #else
                                         pid_t pid = fork();