receiving bytes on proxy and sending directly to client

Author: lucruzz

Makefile

@@ -1,26 +1,54 @@
 CC=gcc
+CC_FLAGS_OBJ=gcc -o
 CFLAGS=-c -g -pthread -D_GNU_SOURCE
+
 SOURCE_DIR=src
 OBJ_DIR=obj
+BIN_DIR=bin
+
 HTTP_SCRIPT=$(SOURCE_DIR)/http2.c
 HTTP_OBJ=$(OBJ_DIR)/http2.o
 
-all: bin/client bin/server
+SERVER_SCRIPT=$(SOURCE_DIR)/server.c
+SERVER_OBJ=$(OBJ_DIR)/server.o
+SERVER_BIN=$(BIN_DIR)/server
+
+CLIENT_SCRIPT=$(SOURCE_DIR)/client.c
+CLIENT_OBJ=$(OBJ_DIR)/client.o
+CLIENT_BIN=$(BIN_DIR)/client
+
+HISTORY_SCRIPT=$(SOURCE_DIR)/history.c
+HISTORY_OBJ=$(OBJ_DIR)/history.o
+
+LIST_SCRIPT=$(SOURCE_DIR)/argsList.c
+LIST_OBJ=$(OBJ_DIR)/argsList.o
+
+COMM_SCRIPT=$(SOURCE_DIR)/communication.c
+COMM_OBJ=$(OBJ_DIR)/communication.o
+
+HASH_SCRIPT=$(SOURCE_DIR)/hashServer2.c
+HASH_OBJ=$(OBJ_DIR)/hashServer2.o
+
+DIREC_SCRIPT=$(SOURCE_DIR)/directories.c
+DIREC_OBJ=$(OBJ_DIR)/directories.o
+
+
+all: $(CLIENT_BIN) $(SERVER_BIN)
 
-bin/client: obj/client.o obj/history.o obj/argsList.o obj/communication.o obj/directories.o
-	gcc -o bin/client obj/client.o obj/history.o obj/argsList.o obj/communication.o obj/directories.o -pthread
+bin/client: $(CLIENT_OBJ) $(HISTORY_OBJ) $(LIST_OBJ) $(COMM_OBJ) $(DIREC_OBJ)
+	$(CC_FLAGS_OBJ) $(CLIENT_BIN) $(CLIENT_OBJ) $(HISTORY_OBJ) $(LIST_OBJ) $(COMM_OBJ) $(DIREC_OBJ) -pthread
 
-obj/client.o: src/client.c src/history.c src/argsList.c src/communication.c
-	$(CC) $(CFLAGS) src/client.c src/history.c src/argsList.c src/communication.c src/directories.c
-	mv *.o obj/
+obj/client.o: $(CLIENT_SCRIPT) $(HISTORY_SCRIPT) $(LIST_SCRIPT) $(COMM_SCRIPT)
+	$(CC) $(CFLAGS) $(CLIENT_SCRIPT) $(HISTORY_SCRIPT) $(LIST_SCRIPT) $(COMM_SCRIPT) $(DIREC_SCRIPT)
+	mv *.o $(OBJ_DIR)/
 
-bin/server: obj/server.o obj/hashServer.o obj/communication.o $(HTTP_OBJ) obj/directories.o
-	gcc -o bin/server obj/server.o obj/hashServer.o obj/communication.o $(HTTP_OBJ) obj/directories.o -pthread
+bin/server: $(SERVER_OBJ) $(HASH_OBJ) $(COMM_OBJ) $(HTTP_OBJ) $(DIREC_OBJ)
+	$(CC_FLAGS_OBJ) $(SERVER_BIN) $(SERVER_OBJ) $(HASH_OBJ) $(COMM_OBJ) $(HTTP_OBJ) $(DIREC_OBJ) -pthread
 
-obj/server.o: src/server.c src/hashServer.c src/communication.c $(HTTP_SCRIPT) src/directories.c
-	$(CC) $(CFLAGS) src/server.c src/hashServer.c src/communication.c $(HTTP_SCRIPT) src/directories.c
-	mv *.o obj/
+obj/server.o: $(SERVER_SCRIPT) $(HASH_SCRIPT) $(COMM_SCRIPT) $(HTTP_SCRIPT) $(DIREC_SCRIPT)
+	$(CC) $(CFLAGS) $(SERVER_SCRIPT) $(HASH_SCRIPT) $(COMM_SCRIPT) $(HTTP_SCRIPT) $(DIREC_SCRIPT)
+	mv *.o $(OBJ_DIR)/
 
 clean:
-	rm clients/client1/* clients/client2/* clients/client3/* proxy/* infoPage/* obj/* bin/*
+	rm clients/client1/* clients/client2/* clients/client3/* proxy/* infoPage/* $(OBJ_DIR)/* $(BIN_DIR)/*
 	clear

bin/client

@@ -11,22 +11,30 @@
 #define TABLE_SIZE 10
 
 typedef struct LinkedList{
+    struct LinkedList * next;
     char * site;
     int content_length;
     time_t creation_time;
-    struct LinkedList * next;
 }LinkedList;
 
 typedef struct Hash{
+  LinkedList * begin; // Ponteiro para head da LinkedList
     int n_elements; // Número de elementos da lista encadeada
-    LinkedList * begin; // Ponteiro para head da LinkedList
 }Hash;
-
+/*
 int hashFunction( char * );
 LinkedList * createNode( char * , int, Hash [] );
 void removeHash( Hash [] );
 LinkedList * remove_Hash_Node ( LinkedList *, LinkedList*, int, Hash [] );
 void printHash( Hash [] );
 LinkedList * searchInHash( char * , Hash [] );
+*/
+
+int hashFunction( char * );
+LinkedList * createNode( char * , int,  Hash ** );
+void removeHash( Hash ** );
+void printHash( Hash ** );
+LinkedList * searchInHash( char * , Hash ** );
+LinkedList * remove_Hash_Node ( LinkedList * , LinkedList * , int, Hash ** );
 
 #endif

bin/server

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK
+Date: Mon, 18 Oct 2021 01:00:41 GMT
+Server: Apache/2.4.38 (Debian)
+Last-Modified: Thu, 09 Sep 2021 15:20:45 GMT
+ETag: "30372-5cb918aec6d40"
+Accept-Ranges: bytes
+Content-Length: 197490
+Vary: Accept-Encoding
+Connection: close
+Content-Type: text/html
+Set-Cookie: BACKENDID=backend_PnWtF_omega03|YWzHP|YWzHP; path=/
+

clients/client1/file1.html

@@ -0,0 +1,11 @@
+HTTP/1.1 200 OK
+Date: Mon, 18 Oct 2021 01:00:41 GMT
+Server: Apache/2.4.38 (Debian)
+Last-Modified: Thu, 09 Sep 2021 15:20:24 GMT
+ETag: "30-5cb9189abfe00"
+Accept-Ranges: bytes
+Content-Length: 48
+Connection: close
+Content-Type: text/html
+Set-Cookie: BACKENDID=backend_PnWtF_omega03|YWzHP|YWzHP; path=/
+