L: added DOS_PROTECTION

missing argv params
W: not tested

Author: andreabac3

general/include/definitions.h

@@ -19,7 +19,8 @@
 #define CONNECTION_QUEUE 5000
 #define MAX_CONNECTIONS_ALLOWED 1
 #define BUFFER_SIZE 2048
-
+// DOS_PROTECTION is a switcher used in socket.c, when it is true we close the connection immediately without read the whole message, else we read the entire message and we response with error.
+int DOS_PROTECTION;
 #define SEND_BUFFER_SIZE 512
 char cwd[BUFFER_SIZE];
 #if defined(__unix__) || defined(__APPLE__)

general/include/socket.h

@@ -17,7 +17,7 @@ FILE *sendFileToClient(int fd);
 
 int fsize(FILE *fp);
 
-void socket_read_request(struct ThreadArgs *args, char **buf);
+int socket_read_request(struct ThreadArgs *args, char **buf);
 
 void socket_resolve_selector(struct ThreadArgs *args, char *buf, char **path);
 

general/lib/socket/socket.c

@@ -13,6 +13,7 @@
 #include <windows_pipe.h>
 #include <windows_utils.h>
 
+
 #endif
 
 #if defined(__unix__) || defined(__APPLE__)
@@ -34,6 +35,7 @@
 #include "socket.h"
 #include "utils.h"
 #include "files_interaction.h"
+#include "definitions.h"
 
 
 int write_to_log(struct PipeArgs *data);
@@ -180,7 +182,7 @@ void socket_resolve_selector(struct ThreadArgs *args, char *buf, char **path) {
  * */
 
 
-void socket_read_request(struct ThreadArgs *args, char **buf) {
+int socket_read_request(struct ThreadArgs *args, char **buf) {
 
     int ptr = 0;
     ssize_t got_bytes = 0;
@@ -200,7 +202,7 @@ void socket_read_request(struct ThreadArgs *args, char **buf) {
             clean_request(NULL, *buf, args);
         }
 
-        if (0 == ptr &&  0 == got_bytes) {
+        if (0 == ptr &&  0 == got_bytes) { // empty body case
             clean_request(NULL, *buf, args);
         }
 
@@ -210,10 +212,13 @@ void socket_read_request(struct ThreadArgs *args, char **buf) {
         }
         ptr += got_bytes;
         if (ptr >= BUFFER_SIZE) {
-            // clean_request(NULL, *buf, args);
             printf("%s %d\n", "effettuo il drain", ptr);
+
+            // DOS_PROTECTION is a switcher used in socket.c, when it is true we close the connection immediately without read the whole message, else we read the entire message and we response with error.
+            if (DOS_PROTECTION) clean_request(NULL, *buf, args);
             socket_drain_tcp(args->fd);
-            break;
+            return -2;
+            //socket_send_error_to_client();
         }
         if (ut_get_line(*buf, ptr)) {
             break;

linux/lib/socket/linux_socket.c

@@ -301,10 +301,10 @@ void *handle_request(void *params) {
     printf("%s\n", "------- new handle request ---------------");
 //    printf("args: %d\n", args->fd);
 
-    socket_read_request(args, &buf); // fill the buffer with the request
+    int ret = socket_read_request(args, &buf); // fill the buffer with the request
 
     socket_resolve_selector(args, buf, &path); // parse the request
-
+    if (ret == -2) socket_send_error_to_client(path, buf, args);
     printf("going to socket_manage_files - full required path: %s \n", path);
     socket_manage_files(path, buf, args); // send response
     printf("going to clean_request exiting handle_request\n");

main.c

@@ -84,7 +84,7 @@ void run_in_daemon() {
 
 
 int main(int argc, char *argv[]) {
-
+    DOS_PROTECTION = 0;
     printf("%s\n", "Gopher start ...");
     printf("PID: %d\n", getpid());