backbone server is ready

[webserver.git] / webserver.c

diff --git a/webserver.c b/webserver.c
index 5de4db83effcc5c8c90acb7066421aba74059c2e..0110f279d315e5ce455634a33778a8f7327ceb98 100644 (file)
--- a/webserver.c
+++ b/webserver.c
@@ -1,13 +1,15 @@
 /* depend: */
 /* cflags: */
-/* linker: color.o debug.o server.o signal.o */
+/* linker: color.o debug.o http.o server.o signal.o */
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <signal.h>
 
 #include "debug.h"
+#include "http.h"
 #include "server.h"
 #include "signal.h"
 
@@ -74,7 +76,7 @@ int main (int argc, char *argv[])
      while (argc-- > 1) {
         char *arg = *(++argv);
         if (arg[0] != '-') {
-            VERBOSE (ERROR, fprintf (stderr, "%s: invalid option -- '%s'\n", progname, arg); usage (1));
+            VERBOSE (ERROR, PERROR ("%s: invalid option -- '%s'\n", progname, arg); usage (1));
             return 1;
         }
         char c = arg[1];
@@ -82,19 +84,19 @@ int main (int argc, char *argv[])
             case 'p':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
-                VERBOSE (ERROR, fprintf (stderr, "%s: missing port number\n", progname); usage (1));
+                VERBOSE (ERROR, PERROR ("%s: missing port number\n", progname); usage (1));
                 return 1;
             }
             port = atoi (arg);
             if (port <= 0) {
-                VERBOSE (ERROR, fprintf (stderr, "%s: incorrect port number (%s)\n", progname, arg); usage (1));
+                VERBOSE (ERROR, PERROR ("%s: incorrect port number (%s)\n", progname, arg); usage (1));
                 return 1;
             }
             break;
         case 'v':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
-                VERBOSE (ERROR, fprintf (stderr, "%s: missing verbose level\n", progname); usage (1));
+                VERBOSE (ERROR, PERROR ("%s: missing verbose level\n", progname); usage (1));
                 return 1;
             }
             verbose = atoi (arg);
@@ -105,14 +107,16 @@ int main (int argc, char *argv[])
         }
     }
 
-    VERBOSE (DEBUG, fprintf (stdout, "Initializing socket\n"));
+    VERBOSE (DEBUG, PRINT ("Initializing socket\n"));
     init_network_context ();
     sock = open_listening_socket (port);
     if (sock == INVALID_SOCKET) {
-        VERBOSE (ERROR, fprintf (stderr, "Can't open listening socket\n"));
+        VERBOSE (ERROR, PERROR ("Can't open listening socket\n"));
         return 1;
     }
-    VERBOSE (INFO, fprintf (stdout, "Listening socket on port %d\n", port));
+    VERBOSE (INFO, PRINT ("Listening socket on port %d\n", port));
+
+    signal (SIGTERM, &stop_server);
 
     /* main loop */
     while (1) {
@@ -122,27 +126,31 @@ int main (int argc, char *argv[])
             continue;
         }
 
-        VERBOSE (DEBUG, fprintf (stdout, "Server connected, waiting for data\n"));
+        VERBOSE (DEBUG, PRINT ("Server connected, waiting for data\n"));
 
         unsigned char *data = {0};
 
         int len = receive_data (conn, &data);
         if (len == 0) {
-            VERBOSE (WARNING, fprintf (stdout, "Connection closed by peer (rx)\n"));
+            VERBOSE (WARNING, PRINT ("Connection closed by peer (rx)\n"));
         } else if (len < 0) {
-            VERBOSE (WARNING, fprintf (stdout, "Connection in error (rx)\n"));
+            VERBOSE (WARNING, PRINT ("Connection in error (rx)\n"));
         } else {
+            VERBOSE (DEBUG, PRINT ("Received %d bytes\n", len));
 
             // processing
+            VERBOSE (DEBUG, PRINT ("Processing %s\n", data));
+            len = processing (data, len, &data);
 
             int rc = send_data (conn, data, len);
             if (rc == 0) {
-                VERBOSE (WARNING, fprintf (stdout, "Connection closed by peer (tx)\n"));
+                VERBOSE (WARNING, PRINT ("Connection closed by peer (tx)\n"));
             } else if (rc < 0) {
-                VERBOSE (WARNING, fprintf (stdout, "Connection in error (tx)\n"));
+                VERBOSE (WARNING, PRINT ("Connection in error (tx)\n"));
             }
         }
 
+        VERBOSE (DEBUG, PRINT ("Closing connection\n"));
         if (data) {
             free (data);
         }
@@ -150,7 +158,7 @@ int main (int argc, char *argv[])
         conn = INVALID_SOCKET;
     }
     
-    VERBOSE (DEBUG, fprintf (stdout, "Closing socket\n"));
+    VERBOSE (DEBUG, PRINT ("Closing socket\n"));
     close_socket (sock);
     terminate_network_context ();
 
@@ -165,8 +173,8 @@ int main (int argc, char *argv[])
 // test: webserver.exe -v 2>&1 | grep -q 'missing verbose level'
 // test: webserver.exe -p 2>&1 | grep -q 'missing port number'
 // test: webserver.exe -p -1 2>&1 | grep -q 'incorrect port number'
-// test: ( webserver.exe & pid=$!; ( sleep 1; kill -TERM $pid ) ) | grep -q 'Listening socket on port 8080'
-// test: ( webserver.exe -p 8008 & pid=$!; ( sleep 1; kill -TERM $pid ) ) | grep -q 'Listening socket on port 8008'
-// test: webserver.exe & pid=$!; sleep 1; kill -INT $pid; ps aux | grep -q [w]ebserver.exe && kill -TERM $pid || rc=1; test x$rc = x1
+// test: webserver.exe > test.log & pid=$!; sleep 1; kill -9 $pid; grep -q 'Listening socket on port 8080' test.log
+// test: webserver.exe -p 8000 > test.log & pid=$!; sleep 1; kill -9 $pid; grep -q 'Listening socket on port 8000' test.log
+// test: webserver.exe & pid=$!; sleep 1; kill -TERM $pid; ps aux | grep -q [w]ebserver.exe && kill -9 $pid || rc=1; test x$rc = x1
 
 /* vim: set ts=4 sw=4 et: */