Syncing the code with what was actually in the videos.

Author: lcthw

ex48b/statserve/Makefile

@@ -1,3 +1,4 @@
+CFLAGS=-g -O2 -Wall -Wextra -I/usr/local/include -Isrc -rdynamic $(OPTFLAGS)
 LIBS=-llcthw $(OPTLIBS)
 LDFLAGS=-L/usr/local/lib $(LIBS)
 PREFIX?=/usr/local
@@ -17,6 +18,8 @@ all: $(TARGET) $(SO_TARGET) tests bin/statserve
 dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS)
 dev: all
 
+bin/statserve: $(TARGET)
+
 $(TARGET): CFLAGS += -fPIC
 $(TARGET): build $(OBJECTS)
 	ar rcs $@ $(OBJECTS)
@@ -25,8 +28,6 @@ $(TARGET): build $(OBJECTS)
 $(SO_TARGET): $(TARGET) $(OBJECTS)
 	$(CC) -shared -o $@ $(LDFLAGS) $(LIBS) $(OBJECTS)
 
-bin/statserve: $(TARGET)
-
 build:
 	@mkdir -p build
 	@mkdir -p bin

ex48b/statserve/bin/statserve.c

@@ -1,5 +1,7 @@
-#include <statserve.h>
+#include <stdio.h>
 #include <lcthw/dbg.h>
+#include "statserve.h"
+#include "net.h"
 
 
 int main(int argc, char *argv[])
@@ -14,5 +16,6 @@ int main(int argc, char *argv[])
     return 0;
 
 error:
+    
     return 1;
 }

ex48b/statserve/src/net.c

@@ -1,14 +1,20 @@
+#include <stdlib.h>
+#include <sys/select.h>
+#include <stdio.h>
 #include <lcthw/ringbuffer.h>
-#include <lcthw/bstrlib.h>
 #include <lcthw/dbg.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "net.h"
 
 struct tagbstring NL = bsStatic("\n");
 struct tagbstring CRLF = bsStatic("\r\n");
 
-
 int nonblock(int fd)
 {
     int flags = fcntl(fd, F_GETFL, 0);
@@ -22,6 +28,31 @@ int nonblock(int fd)
     return -1;
 }
 
+int client_connect(char *host, char *port)
+{
+    int rc = 0;
+    struct addrinfo *addr = NULL;
+
+    rc = getaddrinfo(host, port, NULL, &addr);
+    check(rc == 0, "Failed to lookup %s:%s", host, port);
+
+    int sock = socket(AF_INET, SOCK_STREAM, 0);
+    check(sock >= 0, "Cannot create a socket.");
+
+    rc = connect(sock, addr->ai_addr, addr->ai_addrlen);
+    check(rc == 0, "Connect failed.");
+
+    rc = nonblock(sock);
+    check(rc == 0, "Can't set nonblocking.");
+
+    freeaddrinfo(addr);
+    return sock;
+
+error:
+    freeaddrinfo(addr);
+    return -1;
+}
+
 int read_some(RingBuffer * buffer, int fd, int is_socket)
 {
     int rc = 0;
@@ -73,23 +104,28 @@ int write_some(RingBuffer * buffer, int fd, int is_socket)
     return -1;
 }
 
-
 int attempt_listen(struct addrinfo *info)
 {
-    int sockfd = 0;
+    int sockfd = -1; // default fail
     int rc = -1;
     int yes = 1;
 
+    check(info != NULL, "Invalid addrinfo.");
+
+    // create a socket with the addrinfo
     sockfd = socket(info->ai_family, info->ai_socktype,
             info->ai_protocol);
-    check_debug(sockfd != -1, "Failed to bind to address result. Trying more.");
+    check_debug(sockfd != -1, "Failed to bind to address. Trying more.");
 
+    // set the SO_REUSEADDR option on the socket
     rc = setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int));
-    check_debug(rc == 0, "Failed to set SO_REISEADDR.");
+    check_debug(rc == 0, "Failed to set SO_REUSADDR.");
 
+    // attempt to bind to it
     rc = bind(sockfd, info->ai_addr, info->ai_addrlen);
-    check_debug(rc == 0, "Failed to bind socket.");
-   
+    check_debug(rc == 0, "Failed to find socket.");
+
+    // finally listen with a backlog
     rc = listen(sockfd, BACKLOG);
     check_debug(rc == 0, "Failed to listen to socket.");
 
@@ -99,10 +135,11 @@ int attempt_listen(struct addrinfo *info)
     return -1;
 }
 
+
 int server_listen(const char *host, const char *port)
 {
     int rc = 0;
-    int sockfd = -1;
+    int sockfd = -1; // default fail value
     struct addrinfo *info = NULL;
     struct addrinfo *next_p = NULL;
     struct addrinfo addr = {
@@ -111,51 +148,26 @@ int server_listen(const char *host, const char *port)
         .ai_flags = AI_PASSIVE
     };
 
-    check(host != NULL, "Must give a valid host.");
-    check(port != NULL, "Must have a valid port.");
+    check(host != NULL, "Invalid host.");
+    check(port != NULL, "Invalid port.");
 
+    // get the address info for host and port
     rc = getaddrinfo(NULL, port, &addr, &info);
     check(rc == 0, "Failed to get address info for connect.");
- 
+
+    // cycle through the available list to find one
     for(next_p = info; next_p != NULL; next_p = next_p->ai_next)
     {
+        // attempt to listen to each one
         sockfd = attempt_listen(next_p);
         if(sockfd != -1) break;
     }
 
+    // either we found one and were able to listen or nothing.
     check(sockfd != -1, "All possible addresses failed.");
 
+error: //fallthrough
     if(info) freeaddrinfo(info);
+    // this gets set by the above to either -1 or valid
     return sockfd;
-    
-error: // fallthrough
-    if(info) freeaddrinfo(info);
-    return -1;
-}
-
-
-int client_connect(char *host, char *port)
-{
-    int rc = 0;
-    struct addrinfo *addr = NULL;
-
-    rc = getaddrinfo(host, port, NULL, &addr);
-    check(rc == 0, "Failed to lookup %s:%s", host, port);
-
-    int sock = socket(AF_INET, SOCK_STREAM, 0);
-    check(sock >= 0, "Cannot create a socket.");
-
-    rc = connect(sock, addr->ai_addr, addr->ai_addrlen);
-    check(rc == 0, "Connect failed.");
-
-    rc = nonblock(sock);
-    check(rc == 0, "Can't set nonblocking.");
-
-    freeaddrinfo(addr);
-    return sock;
-
-error:
-    freeaddrinfo(addr);
-    return -1;
 }
-

ex48b/statserve/src/net.h

@@ -1,18 +1,14 @@
-#ifndef _statserve_net_h
-#define _statserve_net_h
+#ifndef _net_h
+#define _net_h
 
-#include <netdb.h>
+#include <lcthw/ringbuffer.h>
 
 #define BACKLOG 10
 
 int nonblock(int fd);
-
+int client_connect(char *host, char *port);
 int read_some(RingBuffer * buffer, int fd, int is_socket);
-
 int write_some(RingBuffer * buffer, int fd, int is_socket);
-
-int attempt_listen(struct addrinfo *info);
-
 int server_listen(const char *host, const char *port);
 
 #endif

ex48b/statserve/src/statserve.c

@@ -1,84 +1,89 @@
-#include <lcthw/ringbuffer.h>
+#include <stdio.h>
+#include <ctype.h>
 #include <lcthw/dbg.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include "statserve.h"
-#include "net.h"
 #include <signal.h>
 #include <sys/wait.h>
-#include <stdlib.h>
+#include "net.h"
+#include <netdb.h>
 
 const int RB_SIZE = 1024 * 10;
 
-int client_handler(int fd)
+void handle_sigchild(int sig) {
+    sig = 0; // ignore it
+    while(waitpid(-1, NULL, WNOHANG) > 0) {
+    }
+}
+
+void client_handler(int client_fd)
 {
     int rc = 0;
+    // need a ringbuffer for the input
     RingBuffer *sock_rb = RingBuffer_create(RB_SIZE);
-    // child process
 
-    while(read_some(sock_rb, fd, 1) != -1) {
-        if(write_some(sock_rb, fd, 1) == -1) {
-            log_info("Client closed.");
+    // read_some in a loop
+    while(read_some(sock_rb, client_fd, 1) != -1) {
+        // write_it back off the ringbuffer
+        if(write_some(sock_rb, client_fd, 1) == -1) {
+            debug("Client closed.");
             break;
         }
     }
 
-    rc = close(fd);
-    check(rc != -1, "Failed to close fd.");
+    // close the socket
+    rc = close(client_fd);
+    check(rc != -1, "Failed to close the socket.");
 
 error: // fallthrough
     if(sock_rb) RingBuffer_destroy(sock_rb);
-    exit(0);
-}
-
-void handle_sigchld(int sig) {
-    while(waitpid(-1, NULL, WNOHANG) > 0) {
-    }
+    exit(0); // just exit the child process
 }
 
 int echo_server(const char *host, const char *port)
 {
+    int rc = 0;
     struct sockaddr_in client_addr;
     socklen_t sin_size = sizeof(client_addr);
     int server_socket = 0;
     int client_fd = 0;
-    int rc = 0;
 
     struct sigaction sa = {
-        .sa_handler = handle_sigchld, 
+        .sa_handler = handle_sigchild,
         .sa_flags = SA_RESTART | SA_NOCLDSTOP
     };
-    sigemptyset(&sa.sa_mask);
 
+    check(host != NULL, "Invalid host.");
+    check(port != NULL, "Invalid port.");
+
+    // create a sigaction that handles SIGCHLD
+    sigemptyset(&sa.sa_mask);
     rc = sigaction(SIGCHLD, &sa, 0);
     check(rc != -1, "Failed to setup signal handler for child processes.");
 
+    // listen on the given port and host
     server_socket = server_listen(host, port);
-    check(server_socket >= 0, "bind to %s:%s failed.",
-            host, port);
+    check(server_socket >= 0, "bind to %s:%s failed.", host, port);
 
-    while (1) {
-        client_fd = accept(server_socket, (struct sockaddr *)&client_addr, &sin_size);
+    while(1) {
+        // accept the connection
+        client_fd = accept(server_socket, (struct sockaddr *)&client_addr, &sin_size); 
         check(client_fd >= 0, "Failed to accept connection.");
 
-        log_info("Client connected.");
+        debug("Client connected.");
 
         rc = fork();
-        check(rc != -1, "Failed to fork!");
-
         if(rc == 0) {
-            // in the child process
-            close(server_socket);
+            // child process
+            close(server_socket); // don't need this
+            // handle the client
             client_handler(client_fd);
         } else {
             // server process
-            close(client_fd);
+            close(client_fd); // don't need this
         }
     }
 
-    return 0;
-
-error:
+error:  // fallthrough
     return -1;
 }
-

ex48b/statserve/src/statserve.h

@@ -3,5 +3,4 @@
 
 int echo_server(const char *host, const char *port);
 
-
 #endif

ex48b/statserve/tests/minunit.h

@@ -3,7 +3,7 @@
 #define _minunit_h
 
 #include <stdio.h>
-#include <dbg.h>
+#include <lcthw/dbg.h>
 #include <stdlib.h>
 
 #define mu_suite_start() char *message = NULL

ex48b/statserve/tests/statserve_tests.c

@@ -1,21 +1,17 @@
 #include "minunit.h"
-#include <statserve.h>
+#include <dlfcn.h>
+#include "statserve.h"
 
-
-char *test_statserve()
+char *test_dummy()
 {
-
-    // mu_assert(echo_server("127.0.0.1", "7899") == 0, "Failed to start echo server.");
-
     return NULL;
 }
 
-
 char *all_tests()
 {
     mu_suite_start();
 
-    mu_run_test(test_statserve);
+    mu_run_test(test_dummy);
 
     return NULL;
 }