Changeset 11 in Main

Timestamp:

Sep 13, 2024, 9:47:34 PM (2 months ago)

Author:

Nishi

Message:

multi-client

Location:

trunk/Server

Files:

• Makefile (modified) (1 diff)
• server.c (modified) (4 diffs)
• ssl.c (added)
• tw_ssl.h (added)

trunk/Server/Makefile

@@ -6 +6 @@
 .SUFFIXES: .c .o
 
-OBJS = version.o main.o config.o server.o
+OBJS = version.o main.o config.o server.o ssl.o
 
 all: tewi$(EXEC)

trunk/Server/server.c

@@ -7 +7 @@
 #include <unistd.h>
 #include <string.h>
+#include <stdbool.h>
 
 #include <cm_log.h>
@@ -12 +13 @@
 #ifdef __MINGW32__
 #include <winsock2.h>
+#include <process.h>
 #define NO_IPV6
 #else
@@ -110 +112 @@
 }
 
-void tw_server_loop(void){
+#ifdef __MINGW32__
+struct pass_entry {
+        int sock;
+        bool ssl;
+};
+
+unsigned int WINAPI tw_server_pass(void* ptr) {
+        int sock = ((struct pass_entry*)ptr)->sock;
+        bool ssl = ((struct pass_entry*)ptr)->ssl;
+#else
+void tw_server_pass(int sock, bool ssl) {
+#endif
+        close_socket(sock);
+#ifdef __MINGW32__
+        _endthreadex(0);
+#endif
+}
+
+void tw_server_loop(void) {
         struct timeval tv;
-        while(1){
+        while(1) {
                 FD_ZERO(&fdset);
                 int i;
-                for(i = 0; i < sockcount; i++){
+                for(i = 0; i < sockcount; i++) {
                         FD_SET(sockets[i], &fdset);
                 }
@@ -121 +141 @@
                 tv.tv_usec = 0;
                 int ret = select(FD_SETSIZE, &fdset, NULL, NULL, &tv);
-                if(ret == -1){
+                if(ret == -1) {
                         break;
-                }else if(ret > 0){
+                } else if(ret > 0) {
                         /* connection */
                         int i;
-                        for(i = 0; i < sockcount; i++){
-                                if(FD_ISSET(sockets[i], &fdset)){
+                        for(i = 0; i < sockcount; i++) {
+                                if(FD_ISSET(sockets[i], &fdset)) {
                                         SOCKADDR claddr;
                                         int clen = sizeof(claddr);
                                         int sock = accept(sockets[i], (struct sockaddr*)&claddr, &clen);
-                                        close_socket(sock);
+#ifdef __MINGW32__
+                                        HANDLE thread;
+                                        struct pass_entry* e = malloc(sizeof(*e));
+                                        e->sock = sock;
+                                        e->ssl = config.ports[i] & (1ULL << 32);
+                                        thread = (HANDLE)_beginthreadex(NULL, 0, tw_server_pass, e, 0, NULL);
+#else
+                                        pid_t pid = fork();
+                                        if(pid == 0) {
+                                                tw_server_pass(sock, config.ports[i] & (1ULL << 32));
+                                                _exit(0);
+                                        } else {
+                                                close_socket(sock);
+                                        }
+#endif
                                 }
                         }