From 36f9faebfe4350eb69ae93dad21d3727782b2523 Mon Sep 17 00:00:00 2001
From: Godmar Back <godmar@gmail.com>
Date: Mon, 23 Apr 2018 17:37:11 -0400
Subject: [PATCH] additional error handling

- fix http_parse_request to recognize too short lines
- fix wrong error handling in send_response_handler
- return not found instead of not implemented in handle_api
- fixed bug when printing out peer information in socket.c
---
 src/Makefile |  2 +-
 src/http.c   | 23 +++++++++++------------
 src/socket.c |  6 +++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 48e2b71..c81f2a7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,7 +5,7 @@ DEP_LIB_DIR=$(abspath $(DEP_BASE_DIR)/lib)
 CFLAGS=-g -pthread -std=gnu11 -Wall -Werror -Wmissing-prototypes -I$(DEP_INCLUDE_DIR)
 
 # include lib directory into runtime path to facilitate dynamic linking
-LDFLAGS=-Wl,-rpath -Wl,$(DEP_LIB_DIR)
+LDFLAGS=-pthread -Wl,-rpath -Wl,$(DEP_LIB_DIR)
 LDLIBS=-L$(DEP_LIB_DIR) -ljwt -ljansson -lcrypto -ldl
 
 HEADERS=socket.h http.h hexdump.h buffer.h bufio.h
diff --git a/src/http.c b/src/http.c
index c01515d..2fedb3e 100644
--- a/src/http.c
+++ b/src/http.c
@@ -39,7 +39,7 @@ http_parse_request(struct http_transaction *ta)
 {
     size_t req_offset;
     ssize_t len = bufio_readline(ta->client->bufio, &req_offset);
-    if (len <= 0)
+    if (len < 2)       // error, EOF, or less than 2 characters
         return false;
 
     char *request = bufio_offset2ptr(ta->client->bufio, req_offset);
@@ -181,7 +181,7 @@ start_response(struct http_transaction * ta, buffer_t *res)
 }
 
 /* Send response headers to client */
-static int
+static bool
 send_response_header(struct http_transaction *ta)
 {
     buffer_t response;
@@ -189,14 +189,14 @@ send_response_header(struct http_transaction *ta)
 
     start_response(ta, &response);
     if (bufio_sendbuffer(ta->client->bufio, &response) == -1)
-        return -1;
+        return false;
 
     buffer_appends(&ta->resp_headers, CRLF);
     if (bufio_sendbuffer(ta->client->bufio, &ta->resp_headers) == -1)
-        return -1;
+        return false;
 
     buffer_delete(&response);
-    return 0;
+    return true;
 }
 
 /* Send a full response to client with the content in resp_body. */
@@ -206,7 +206,7 @@ send_response(struct http_transaction *ta)
     // add content-length.  All other headers must have already been set.
     add_content_length(&ta->resp_headers, ta->resp_body.len);
 
-    if (send_response_header(ta) == -1)
+    if (!send_response_header(ta))
         return false;
 
     return bufio_sendbuffer(ta->client->bufio, &ta->resp_body) != -1;
@@ -297,21 +297,20 @@ handle_static_asset(struct http_transaction *ta, char *basedir)
     add_content_length(&ta->resp_headers, st.st_size);
     http_add_header(&ta->resp_headers, "Content-Type", "%s", guess_mime_type(fname));
 
-    rc = send_response_header(ta);
-    if (rc == -1)
+    bool success = send_response_header(ta);
+    if (!success)
         goto out;
 
-    rc = bufio_sendfile(ta->client->bufio, filefd, NULL, st.st_size);
+    success = bufio_sendfile(ta->client->bufio, filefd, NULL, st.st_size) == st.st_size;
 out:
     close(filefd);
-    return rc;
+    return success;
 }
 
-
 static int
 handle_api(struct http_transaction *ta)
 {
-    return send_error(ta, HTTP_NOT_IMPLEMENTED, "API not implemented");
+    return send_error(ta, HTTP_NOT_FOUND, "API not implemented");
 }
 
 /* Set up an http client, associating it with a bufio buffer. */
diff --git a/src/socket.c b/src/socket.c
index 9c80fc4..762892d 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -121,11 +121,11 @@ socket_accept_client(int accepting_socket)
         return -1;
     }
 
-    /* The following will debug with debugging your server. 
-     * Adjust as necessary.
+    /* The following will help with debugging your server.
+     * Adjust and/or remove as you see fit.
      */
     char peer_addr[1024], peer_port[10];
-    int rc = getnameinfo(&peer, sizeof peer,
+    int rc = getnameinfo(&peer, peersize,
                          peer_addr, sizeof peer_addr, peer_port, sizeof peer_port,
                          NI_NUMERICHOST | NI_NUMERICSERV);
     if (rc != 0) {