Merge pull request #63 from MortezaBashsiz/dev

close socket and early return in server and agent handler

Makefile

@@ -34,7 +34,10 @@ DEPS := $(OBJS:.o=.d)
 build: all
 
 # Main task
-all: format $(TARGET) deb
+all: format $(TARGET)
+
+# Build package
+deb: deb
 
 format:
 	clang-format --style=Google -i src/*

src/agenthandler.cpp

@@ -146,12 +146,16 @@ void AgentHandler::handle() {
       } else {
         // Close the socket if no data is available
         client_->socket().close();
+        return;
       }
     } else {
       // Log if the request is not a valid HTTP request
       log_->write("[AgentHandler handle] [NOT HTTP Request] [Request] : " +
                       streambufToString(readBuffer_),
                   Log::Level::DEBUG);
+      // Close the socket if no data is available
+      client_->socket().close();
+      return;
     }
   } else {
     // Log encryption failure and close the socket
@@ -163,6 +167,8 @@ void AgentHandler::handle() {
             client_->socket().remote_endpoint().address().to_string() + ":" +
             std::to_string(client_->socket().remote_endpoint().port()) + "] ",
         Log::Level::INFO);
+    // Close the socket if no data is available
     client_->socket().close();
+    return;
   }
 }

src/serverhandler.cpp

@@ -143,6 +143,7 @@ void ServerHandler::handle() {
             } else {
               // Close the connection if no data was read.
               client_->socket().close();
+              return;
             }
           } break;
         }
@@ -151,6 +152,9 @@ void ServerHandler::handle() {
         log_->write("[ServerHandler handle] [NOT HTTP Request] [Request] : " +
                         streambufToString(readBuffer_),
                     Log::Level::DEBUG);
+        // Close the socket if no data is available
+        client_->socket().close();
+        return;
       }
     } else {
       // Log decryption failure and close the connection.
@@ -160,13 +164,18 @@ void ServerHandler::handle() {
       log_->write("[ServerHandler handle] [Decryption Failed] : " +
                       request_->toString(),
                   Log::Level::INFO);
+      // Close the socket if no data is available
       client_->socket().close();
+      return;
     }
   } else {
     // Log if the request is not from an agent.
     log_->write(
         "[ServerHandler handle] [NOT HTTP Request From Agent] [Request] : " +
             streambufToString(readBuffer_),
         Log::Level::DEBUG);
+    // Close the socket if no data is available
+    client_->socket().close();
+    return;
   }
 }