From: Laurent Mazet Date: Mon, 15 May 2023 22:07:21 +0000 (+0200) Subject: initial web server (only echo) X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=163f56b172e812ca6c98b0b6f26e71c006a769dd;p=webserver.git initial web server (only echo) --- diff --git a/debug.h b/debug.h index 46442d4..c78bb18 100644 --- a/debug.h +++ b/debug.h @@ -22,7 +22,9 @@ (level == INFO) ? FG_BLUE : \ (level == DEBUG) ? FG_GREEN : COLOR_DEFAULT) -/* vim: set ts=4 sw=4 et: */ +#define PRINT(statement...) do { fprintf (stdout, statement); fflush (stdout); } while (0) +#define PERROR(statement...) do { fprintf (stderr, statement); fflush (stderr); } while (0) + /* gobal variables */ extern int verbose; diff --git a/server.c b/server.c index cc7f4cd..56b07cc 100644 --- a/server.c +++ b/server.c @@ -75,7 +75,7 @@ socket_t open_listening_socket (int port) { int val = 1; - VERBOSE (DEBUG, fprintf (stdout, "Opening socket\n")); + VERBOSE (DEBUG, PRINT ("Opening socket\n")); //socket_t sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); socket_t sock = socket (AF_INET, SOCK_STREAM, 0); if (sock == INVALID_SOCKET) { @@ -89,38 +89,38 @@ socket_t open_listening_socket (int port) addr.sin_port = htons (port); addr.sin_addr.s_addr = htonl (INADDR_ANY); - VERBOSE (DEBUG, fprintf (stdout, "Binding socket\n")); + VERBOSE (DEBUG, PRINT ("Binding socket\n")); //setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof (val)); int rc = bind (sock, (struct sockaddr *)&addr, sizeof (addr)); if (rc == SOCKET_ERROR) { - VERBOSE (ERROR, fprintf (stderr, "error: bind %d\n", ERRNO)); + VERBOSE (ERROR, PERROR ("error: bind %d\n", ERRNO)); rc = closesocket (sock); if (rc == SOCKET_ERROR) { - VERBOSE (ERROR, fprintf (stderr, "error: close %d\n", ERRNO)); + VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO)); } return -1; } - VERBOSE (DEBUG, fprintf (stdout, "Configuring socket\n")); + VERBOSE (DEBUG, PRINT ("Configuring socket\n")); #ifndef _WIN32 /* Posix */ fcntl (sock, F_SETFL, O_NONBLOCK); #endif rc = setsockopt (sock, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof (val)); if (rc < 0) { - VERBOSE (ERROR, fprintf (stderr, "error: %s\n", "setsockopt/TCP_NODELAY")); + VERBOSE (ERROR, PERROR ("error: %s\n", "setsockopt/TCP_NODELAY")); closesocket (sock); if (rc == SOCKET_ERROR) { - VERBOSE (ERROR, fprintf (stderr, "error: close %d\n", ERRNO)); + VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO)); } return -1; } rc = listen (sock, BACKLOG); if (rc < 0) { - VERBOSE (ERROR, fprintf (stderr, "error: %s\n", "listen")); + VERBOSE (ERROR, PERROR ("error: %s\n", "listen")); closesocket (sock); if (rc == SOCKET_ERROR) { - VERBOSE (ERROR, fprintf (stderr, "error: close %d\n", ERRNO)); + VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO)); } return -1; } @@ -143,10 +143,10 @@ socket_t accept_incoming_connection (socket_t sock) int val = 1; int rc = setsockopt (connection, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof (val)); if (rc < 0) { - VERBOSE (ERROR, fprintf (stderr, "error: %s\n", "setsockopt/TCP_NODELAY")); + VERBOSE (ERROR, PERROR ("error: %s\n", "setsockopt/TCP_NODELAY")); closesocket (connection); if (rc == SOCKET_ERROR) { - VERBOSE (ERROR, fprintf (stderr, "error: close %d\n", ERRNO)); + VERBOSE (ERROR, PERROR ("error: close %d\n", ERRNO)); } return INVALID_SOCKET; } @@ -160,7 +160,7 @@ void close_socket (socket_t sock) { int rc = closesocket (sock); if (rc == SOCKET_ERROR) { - VERBOSE (ERROR, fprintf (stderr, "error: %d\n", ERRNO)); + VERBOSE (ERROR, PERROR ("error: %d\n", ERRNO)); } } diff --git a/webserver.c b/webserver.c index 7a5090a..b0b7aeb 100644 --- a/webserver.c +++ b/webserver.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "debug.h" #include "server.h" @@ -74,7 +75,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 +83,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 +106,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,28 +125,29 @@ 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 { // processing - VERBOSE (DEBUG, fprintf (stdout, "Received:\n%s\n", data)); + VERBOSE (DEBUG, PRINT ("Received:\n%s\n", 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); } @@ -151,7 +155,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 (); @@ -166,8 +170,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: */