tteeoo / lc19 Goto Github PK

diff --git a/lc19.c b/lc19.c
index b3be73f..15fc13c 100644
--- a/lc19.c
+++ b/lc19.c
@@ -119,6 +119,7 @@ int main(int argc, char **argv) {
 	// Assign signal handlers
 	signal(SIGINT, handle_sigint);
 	signal(SIGHUP, handle_sighup);
+	signal(SIGCHLD, SIG_IGN);
 
 	// Parse command-line arguments
 	argp_parse(&parser, argc, argv, 0, 0, &arguments);
@@ -145,7 +146,7 @@ int main(int argc, char **argv) {
 		// Initialize incoming client
 		struct sockaddr_in addr;
 		socklen_t addrlen = sizeof(addr);
-		SSL *ssl = SSL_new(ctx);
+		SSL *ssl;
 
 		// Accept connection
 		int client;
@@ -153,10 +154,20 @@ int main(int argc, char **argv) {
 			fprintf(stderr, "Error: Failed to accept incoming connection");
 			continue;
 		}
-		printf("New: %s:%d\n", inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
-		SSL_set_fd(ssl, client);
 
-		handle(ssl, e);
+		printf("New: %s:%d\n", inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
+		switch (fork()) {
+		case 0:
+			ssl = SSL_new(ctx);
+			SSL_set_fd(ssl, client);
+			handle(ssl, e);
+			exit(0);
+			break;
+		case -1:
+			fprintf(stderr,"Error: Forking failed.\n");
+		default:
+			close(client);
+		}
 	}
 
 	close(server);

diff --git a/endpoint.c b/endpoint.c
index dbd2a5c..1b8d621 100644
--- a/endpoint.c
+++ b/endpoint.c
@@ -14,2 +14,10 @@
 
+int lines;
+
+static int comp_ep(const void *i1, const void *i2) {
+	const endpoint *ep1 = i1;
+	const endpoint *ep2 = i2;
+	return strcmp(ep1->url_path, ep2->url_path);
+}
+
 // Gets the number of lines in a file
@@ -71,16 +79,12 @@ response url_to_response(char *url, endpoint *endpoints) {
 	// Find the endpoint at the url
-	int e_index = -1;
-	for (int i = 0; endpoints[i].end; i++)  {
-		if (strcmp(url_path, endpoints[i].url_path) == 0) {
-			e_index = i;
-			break;
-		}
-	}
-	if (e_index == -1)
+	endpoint *e, key;
+	strcpy(key.url_path, url_path);
+	e = bsearch(&key, endpoints, lines, sizeof(endpoints[0]), comp_ep);
+
+	if (e == NULL)
 		return (response){ .code = 51, .mime = "Not found, à la 404" };
-	endpoint e = endpoints[e_index];
 
 	response resp = (response){ .code = 20 };
-	strcpy(resp.file_path, e.file_path);
-	strcpy(resp.mime, e.mime);
+	strcpy(resp.file_path, e->file_path);
+	strcpy(resp.mime, e->mime);
 	return resp;
@@ -125,3 +129,2 @@ void get_endpoints(endpoint *endpoints, char *path) {
 		// Copy the parsed data
-		endpoints[line_num] = (endpoint){ .end = 1 };
 		strcpy(endpoints[line_num].mime, mime);
@@ -141,3 +144,5 @@ void get_endpoints(endpoint *endpoints, char *path) {
 
-	endpoints[line_num] = (endpoint){ .end = 0 };
+	lines = line_num;
+	qsort(endpoints, lines, sizeof(endpoints[0]), comp_ep);
+
 	fclose(fp);
diff --git a/endpoint.h b/endpoint.h
index 77b9361..f2e6bcd 100644
--- a/endpoint.h
+++ b/endpoint.h
@@ -4,3 +4,2 @@ typedef struct {
 	char url_path[256];
-	int end;
 } endpoint;