Changeset 16 in Main for trunk/Server

Timestamp:

Sep 14, 2024, 12:09:52 AM (2 months ago)

Author:

Nishi

Message:

can parse http now

Location:

trunk/Server

Files:

• Makefile (modified) (1 diff)
• config.c (modified) (1 diff)
• http.c (added)
• main.c (modified) (2 diffs)
• server.c (modified) (4 diffs)
• ssl.c (modified) (1 diff)
• tw_http.h (added)
• tw_server.h (modified) (1 diff)
• version.c (modified) (1 diff)

trunk/Server/Makefile

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

trunk/Server/config.c

@@ -1 +1 @@
 /* $Id$ */
+
+#define SOURCE
 
 #include "tw_config.h"

trunk/Server/main.c

@@ -1 +1 @@
 /* $Id$ */
+
+#define SOURCE
 
 #include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
+#include <signal.h>
 
 #include <openssl/opensslv.h>
@@ -50 +53 @@
         }
         cm_log("Daemon", "Ready");
+#ifndef __MINGW32__
+        signal(SIGCHLD, SIG_IGN);
+#endif
         tw_server_loop();
 }

trunk/Server/server.c

@@ -1 +1 @@
 /* $Id$ */
+
+#define SOURCE
 
 #include "tw_server.h"
@@ -5 +7 @@
 #include "tw_ssl.h"
 #include "tw_config.h"
+#include "tw_http.h"
 
 #include <unistd.h>
@@ -111 +114 @@
         }
         return 0;
+}
+
+size_t tw_read(SSL* ssl, int s, void* data, size_t len) {
+        if(ssl == NULL) {
+                return recv(s, data, len, 0);
+        } else {
+                return SSL_read(ssl, data, len);
+        }
+}
+
+size_t tw_write(SSL* ssl, int s, void* data, size_t len) {
+        if(ssl == NULL) {
+                return send(s, data, len, 0);
+        } else {
+                return SSL_write(ssl, data, len);
+        }
 }
 
@@ -140 +159 @@
                 sslworks = true;
         }
+        struct tw_http_request req;
+        int ret = tw_http_parse(s, sock, &req);
 cleanup:
-        if(sslworks){
+        if(sslworks) {
                 SSL_shutdown(s);
         }

trunk/Server/ssl.c

@@ -1 +1 @@
 /* $Id$ */
+
+#define SOURCE
 
 #include "tw_ssl.h"

trunk/Server/tw_server.h

@@ -4 +4 @@
 #define __TW_SERVER_H__
 
+#include <openssl/ssl.h>
+
 int tw_server_init(void);
 void tw_server_loop(void);
+size_t tw_read(SSL* ssl, int s, void* data, size_t len);
+size_t tw_write(SSL* ssl, int s, void* data, size_t len);
 
 #endif

trunk/Server/version.c

@@ -1 +1 @@
 /* $Id$ */
+
+#define SOURCE
 
 #include "tw_version.h"