initial web server (only echo)

[webserver.git] / server.c

diff --git a/server.c b/server.c
index cc7f4cd2bf50ee432b686483ba18c726121719da..56b07cc07051476846f81fdf622e440d50023af3 100644 (file)
--- 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));
     }
 }