From f510a54d4009565973bca1bbcd8f0a058dc7f2af Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Thu, 20 Jun 2024 06:12:42 +0530
Subject: [PATCH] utils/tcp_server: set TCP_NODELAY

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 src/util/tcp_server.cc | 15 ++++++++++++---
 src/util/tcp_server.hh |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/util/tcp_server.cc b/src/util/tcp_server.cc
index 0091db7..ccaf730 100644
--- a/src/util/tcp_server.cc
+++ b/src/util/tcp_server.cc
@@ -1,4 +1,5 @@
 #include "tcp_server.hh"
+#include <netinet/tcp.h>
 
 #include <cstring>
 #include <format>
@@ -35,13 +36,22 @@ TcpServer::run() {
 
 void
 TcpServer::start(uint port) {
+    int opts  = 0;
     server_fd = socket(PF_INET, SOCK_STREAM, 0);
     if (server_fd == -1) {
         throw std::runtime_error("creating socket failed");
     }
 
     int option = 1;
-    setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
+
+    opts +=
+      setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
+    opts +=
+      setsockopt(server_fd, IPPROTO_TCP, TCP_NODELAY, &option, sizeof(option));
+
+    if (opts != 0) {
+        throw std::runtime_error("failed to set socket opts");
+    }
 
     std::memset(&server_addr, 0, sizeof(server_addr));
     server_addr.sin_family      = PF_INET;
@@ -68,9 +78,8 @@ TcpServer::send(std::string msg) {
 
 std::string
 TcpServer::receive(uint length) {
-    char msg[MAX_PACKET_SIZE];
     ssize_t num_bytes = recv(client_fd, msg, length, 0);
-    msg[length]       = '\0';
+    msg[num_bytes]    = '\0';
     if (num_bytes < 0) {
         throw std::runtime_error(
           std::format("failed to receive messages: {}\n", strerror(errno)));
diff --git a/src/util/tcp_server.hh b/src/util/tcp_server.hh
index 8aba099..ac85e66 100644
--- a/src/util/tcp_server.hh
+++ b/src/util/tcp_server.hh
@@ -14,10 +14,12 @@ class TcpServer {
     void start(uint port);
     void send(std::string msg);
     std::string receive(uint length);
+    std::string receive_all() { return receive(MAX_PACKET_SIZE); };
     bool client_waiting();
 
   private:
     static constexpr uint MAX_PACKET_SIZE = 4096;
+    char msg[MAX_PACKET_SIZE];
     int server_fd;
     int client_fd;
     sockaddr_in server_addr;