Changeset 17 in Main

Timestamp:

Sep 14, 2024, 2:41:07 AM (2 months ago)

Author:

Nishi

Message:

module system kinda works

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• Module (added)
• Module/Makefile (added)
• Module/mod_example.c (added)
• Platform/generic.mk (modified) (1 diff)
• Platform/win64.mk (modified) (1 diff)
• Server/Makefile (modified) (1 diff)
• Server/config.c (modified) (3 diffs)
• Server/http.c (modified) (1 diff)
• Server/module.c (added)
• Server/server.c (modified) (1 diff)
• Server/tw_config.h (modified) (1 diff)
• Server/tw_http.h (modified) (1 diff)
• Server/tw_module.h (added)
• example.conf (modified) (1 diff)

trunk/Makefile

@@ -7 +7 @@
 FLAGS = PWD=$(PWD) PLATFORM=$(PLATFORM) PREFIX=$(PREFIX)
 
-.PHONY: all format clean ./Server ./Common
+.PHONY: all format clean ./Server ./Common ./Module
 
-all: ./Server
+all: ./Server ./Module
 
 ./Server:: ./Common
+        $(MAKE) -C $@ $(FLAGS)
+
+./Module:: ./Common
         $(MAKE) -C $@ $(FLAGS)
 
@@ -18 +21 @@
 
 format:
-        clang-format --verbose -i `find ./Server ./Common -name "*.c" -or -name "*.h"`
+        clang-format --verbose -i `find ./Server ./Common ./Module -name "*.c" -or -name "*.h"`
 
 clean:
         $(MAKE) -C ./Server $(FLAGS) clean
+        $(MAKE) -C ./Module $(FLAGS) clean
         $(MAKE) -C ./Common $(FLAGS) clean

trunk/Platform/generic.mk

@@ -7 +7 @@
 LIBS =
 EXEC =
+LIB = .so

trunk/Platform/win64.mk

@@ -7 +7 @@
 LIBS = -lws2_32
 EXEC = .exe
+LIB = .dll

trunk/Server/Makefile

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

trunk/Server/config.c

@@ -4 +4 @@
 
 #include "tw_config.h"
+#include "tw_module.h"
 
 #include <stdio.h>
@@ -38 +39 @@
         config.root.sslcert = NULL;
         config.vhost_count = 0;
+        config.server_root = cm_strdup(PREFIX);
         gethostname(config.hostname, 1024);
 }
@@ -126 +128 @@
                                                         current->sslcert = cm_strdup(r[1]);
                                                 }
+                                        } else if(cm_strcaseequ(r[0], "ServerRoot")) {
+                                                if(r[1] == NULL) {
+                                                        cm_log("Config", "Missing path at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        if(config.server_root != NULL) free(config.server_root);
+                                                        config.server_root = cm_strdup(r[1]);
+                                                }
+                                        } else if(cm_strcaseequ(r[0], "LoadModule")) {
+                                                for(i = 1; r[i] != NULL; i++) {
+                                                        void* mod = tw_module_load(r[i]);
+                                                        if(mod != NULL) {
+                                                                if(tw_module_init(mod) != 0) {
+                                                                        stop = 1;
+                                                                        break;
+                                                                }
+                                                        } else {
+                                                                stop = 1;
+                                                                break;
+                                                        }
+                                                }
                                         } else {
                                                 if(r[0] != NULL) {

trunk/Server/http.c

@@ -12 +12 @@
 #include <stdbool.h>
 #include <stdlib.h>
-#include <sys/socket.h>
+#include <string.h>
+
+#ifdef __MINGW32__
+#include <winsock2.h>
+#else
+#include <sys/select.h>
+#endif
 
 void tw_free_request(struct tw_http_request* req) {

trunk/Server/server.c

@@ -161 +161 @@
         struct tw_http_request req;
         int ret = tw_http_parse(s, sock, &req);
+        if(ret == 0) {
+        }
 cleanup:
         if(sslworks) {

trunk/Server/tw_config.h

@@ -23 +23 @@
         struct tw_config_entry vhosts[MAX_VHOSTS];
         int vhost_count;
+        char* server_root;
 };
 

trunk/Server/tw_http.h

@@ -16 +16 @@
 };
 
-struct tw_http_tool {};
-
 #ifdef SOURCE
 #include <openssl/ssl.h>

trunk/example.conf

@@ -1 +1 @@
 # $Id$
 # This is an example config
+
+LoadModule /home/nishi/SVN/tewi/trunk/Module/mod_example.so
 
 Listen 8000 8001 8002 8003 8004