From 5c60a475e7a65c95ca3cb5c936b915b4bd0e7735 Mon Sep 17 00:00:00 2001 From: Pin Date: Sun, 30 Jan 2022 15:32:35 -0500 Subject: [PATCH] small build changes --- .gitignore | 8 ++++++++ Makefile | 15 +++++++++++---- cmd/server.c | 3 ++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index beb459e..9fd7e64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,14 @@ +# C *.out *.gch vgcore.* +# Build bin/ .cache/ + +# Local compile_commands.json +.doc + +# Service +certs/ diff --git a/Makefile b/Makefile index 90df5b7..ab05a76 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,10 @@ OUTPUT = -o ${OUTPUT_DIR}/PROG INSTALL_OUTPUT = ${OUTPUT_DIR}/PROG build: output_dir - gcc -Wall -pthread ${LIBRARIES} ${SOURCES} ${OUTPUT:PROG=server} + gcc -Wall ${LIBRARIES} ${SOURCES} ${OUTPUT:PROG=server} debug: output_dir - gcc -Wall -g -pthread ${LIBRARIES} ${SOURCES} ${OUTPUT:PROG=server} + gcc -Wall -g ${LIBRARIES} ${SOURCES} ${OUTPUT:PROG=server} install: mv ${INSTALL_OUTPUT:PROG=server} /usr/bin/ @@ -16,6 +16,13 @@ install: output_dir: mkdir -p ${OUTPUT_DIR} -clean: - rm -rf $(OUTPUT_DIR) **.h.gch +CERT_DIR = ./certs/ +genCerts: + mkdir -p ${CERT_DIR} + openssl req -new -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 \ + -x509 -nodes -days 365 -out ${CERT_DIR}cert.pem -keyout ${CERT_DIR}cert.pem \ + -subj "/C=US/ST=Some-State/L=[]/O=[]/CN=localhost" + +clean: + rm -rf $(OUTPUT_DIR) ${CERT_DIR} **.h.gch diff --git a/cmd/server.c b/cmd/server.c index 278a6c4..321cd84 100644 --- a/cmd/server.c +++ b/cmd/server.c @@ -69,7 +69,7 @@ int handleRequest(char buffer[], int socket) { // Grabbing relevant information out of request checkerr = parseHTTPRequest(buffer, &r); if (checkerr != 0) { // Checking for HTTP parsing error - perror("Error parsing"); + printf("Error parsing: exit code %d\n", checkerr); return return404Request(socket); } // Return response to socket @@ -101,6 +101,7 @@ int main(int argc, char const *argv[]) { } read(new_socket, buffer, 1024); handleRequest(buffer, new_socket); + close(new_socket); } exit(EXIT_SUCCESS);