Increase socket buffer size

* Unify the buffer size * TXT RRs are likely to include more contents * Uncompressed cache result costs more room
lifenjoiner · Sep 26, 2024 · 60a3f94 · 60a3f94
1 parent b518503
commit 60a3f94
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 35 deletions.
diff --git a/hosts.c b/hosts.c
@@ -7,8 +7,6 @@
 #include "domainstatistic.h"
 #include "mmgr.h"
 
-#define CONTEXT_DATA_LENGTH  2048
-
 extern BOOL Ipv6_Enabled;
 
 static BOOL BlockIpv6WhenIpv4Exists = FALSE;
@@ -134,14 +132,14 @@ Hosts_SocketLoop(void *Unused)
 
     struct timeval  TimeLimit = LongTime;
 
-    #define LEFT_LENGTH_SL (CONTEXT_DATA_LENGTH - sizeof(IHeader))
+    #define LEFT_LENGTH_SL (SOCKET_CONTEXT_LENGTH - sizeof(IHeader))
 
-    char    InnerBuffer[CONTEXT_DATA_LENGTH];
+    char    InnerBuffer[SOCKET_CONTEXT_LENGTH];
     MsgContext *InnerMsgCtx = (MsgContext *)InnerBuffer;
     IHeader *InnerHeader = (IHeader *)InnerBuffer;
     /* char    *InnerEntity = InnerBuffer + sizeof(IHeader); */
 
-    char OuterBuffer[CONTEXT_DATA_LENGTH];
+    char OuterBuffer[SOCKET_CONTEXT_LENGTH];
     /* MsgContext *OuterMsgCtx = (MsgContext *)OuterBuffer; */
     IHeader *OuterHeader = (IHeader *)OuterBuffer;
     char    *OuterEntity = OuterBuffer + sizeof(IHeader);
@@ -165,7 +163,7 @@ Hosts_SocketLoop(void *Unused)
     Puller.Add(&Puller, InnerSocket, NULL, 0);
     Puller.Add(&Puller, OuterSocket, NULL, 0);
 
-    if( ModuleContext_Init(&Context, CONTEXT_DATA_LENGTH) != 0 )
+    if( ModuleContext_Init(&Context, SOCKET_CONTEXT_LENGTH) != 0 )
     {
         ret = -431;
         goto EXIT_1;
@@ -219,7 +217,7 @@ Hosts_SocketLoop(void *Unused)
             NewIdentifier = rand();
 
             if( HostsUtils_GenerateQuery(OuterBuffer,
-                                         CONTEXT_DATA_LENGTH,
+                                         SOCKET_CONTEXT_LENGTH,
                                          OuterSocket,
                                          &OuterAddress,
                                          MsgContext_IsFromTCP(InnerMsgCtx),
@@ -242,7 +240,7 @@ Hosts_SocketLoop(void *Unused)
 
             OuterHeader->Parent = (IHeader *)MsgCtxStored;
 
-            MMgr_Send(OuterBuffer, CONTEXT_DATA_LENGTH);
+            MMgr_Send(OuterBuffer, SOCKET_CONTEXT_LENGTH);
 
         } else if( Pulled == OuterSocket )
         {
@@ -274,7 +272,7 @@ Hosts_SocketLoop(void *Unused)
             }
 
             if( HostsUtils_CombineRecursedResponse((MsgContext *)InnerBuffer,
-                                                   CONTEXT_DATA_LENGTH,
+                                                   SOCKET_CONTEXT_LENGTH,
                                                    OuterEntity,
                                                    State,
                                                    OuterHeader->Domain

diff --git a/hostsutils.c b/hostsutils.c
@@ -3,8 +3,6 @@
 #include "dnsgenerator.h"
 #include "goodiplist.h"
 
-#define CONTEXT_DATA_LENGTH 2048
-
 static int HostsUtils_GetCName_Callback(int Number,
                                         HostsRecordType Type,
                                         const char *Data,

diff --git a/iheader.h b/iheader.h
@@ -37,14 +37,14 @@ struct _IHeader{
 
 /* The **variable** context item structure:
 
-#define CONTEXT_DATA_LENGTH 2048
-
 struct _MsgContext{
     IHeader h;
-    char    Entity[CONTEXT_DATA_LENGTH - sizeof(IHeader)];
+    char    Entity[SOCKET_CONTEXT_LENGTH - sizeof(IHeader)];
 };
 */
 
+#define SOCKET_CONTEXT_LENGTH   4096
+
 #define IHEADER_TAIL(ptr)   (void *)((IHeader *)(ptr) + 1)
 
 void IHeader_Reset(IHeader *h);

diff --git a/tcpfrontend.c b/tcpfrontend.c
@@ -15,15 +15,13 @@ WINAPI
 #endif
 TcpFrontend_Work(void *Unused)
 {
-    /* Buffer */
-    #define BUF_LENGTH  2048
     char *ReceiveBuffer;
     IHeader *Header;
 
-    #define LEFT_LENGTH  (BUF_LENGTH - sizeof(IHeader))
+    #define LEFT_LENGTH  (SOCKET_CONTEXT_LENGTH - sizeof(IHeader))
     char *Entity;
 
-    ReceiveBuffer = SafeMalloc(BUF_LENGTH);
+    ReceiveBuffer = SafeMalloc(SOCKET_CONTEXT_LENGTH);
     if( ReceiveBuffer == NULL )
     {
         ERRORMSG("No enough memory, 26.\n");
@@ -103,7 +101,7 @@ TcpFrontend_Work(void *Unused)
                                  Agent
                                  );
 
-                    MMgr_Send(ReceiveBuffer, BUF_LENGTH);
+                    MMgr_Send(ReceiveBuffer, SOCKET_CONTEXT_LENGTH);
 
                     if( IsNewConnected )
                     {

diff --git a/tcpm.c b/tcpm.c
@@ -19,8 +19,6 @@ extern BOOL Ipv6_Enabled;
 #define TIMEOUT_ms_RECV 2000
 #define TIMEOUT_ms_ALIVE    100
 
-#define CONTEXT_DATA_LENGTH 2048
-
 extern int TCPM_Keep_Alive;
 static const struct timeval TimeOut_Const = {TIMEOUT, 0};
 
@@ -543,11 +541,11 @@ TcpM_Works(TcpM *m)
 {
     int Err;
 
-    char ReceiveBuffer[CONTEXT_DATA_LENGTH];
+    char ReceiveBuffer[SOCKET_CONTEXT_LENGTH];
     MsgContext *MsgCtx;
     IHeader *Header;
 
-    #define LEFT_LENGTH  (CONTEXT_DATA_LENGTH - sizeof(IHeader))
+    #define LEFT_LENGTH  (SOCKET_CONTEXT_LENGTH - sizeof(IHeader))
     char *Entity;
 
     SocketPuller *p = &(m->Puller);
@@ -589,7 +587,7 @@ TcpM_Works(TcpM *m)
 
             State = recvfrom(s,
                              ReceiveBuffer, /* Receiving a header */
-                             CONTEXT_DATA_LENGTH,
+                             SOCKET_CONTEXT_LENGTH,
                              0,
                              NULL,
                              NULL
@@ -750,7 +748,7 @@ int TcpM_Init(TcpM *m, const char *Services, BOOL Parallel, const char *SocksPro
         return -7;
     }
 
-    if( ModuleContext_Init(&(m->Context), CONTEXT_DATA_LENGTH) != 0 )
+    if( ModuleContext_Init(&(m->Context), SOCKET_CONTEXT_LENGTH) != 0 )
     {
         return -12;
     }

diff --git a/udpfrontend.c b/udpfrontend.c
@@ -16,15 +16,13 @@ WINAPI
 #endif
 UdpFrontend_Work(void *Unused)
 {
-    /* Buffer */
-    #define BUF_LENGTH  2048
     char *ReceiveBuffer;
     IHeader *Header;
 
-    #define LEFT_LENGTH  (BUF_LENGTH - sizeof(IHeader))
+    #define LEFT_LENGTH  (SOCKET_CONTEXT_LENGTH - sizeof(IHeader))
     char *Entity;
 
-    ReceiveBuffer = SafeMalloc(BUF_LENGTH);
+    ReceiveBuffer = SafeMalloc(SOCKET_CONTEXT_LENGTH);
     if( ReceiveBuffer == NULL )
     {
         ERRORMSG("No enough memory, 26.\n");
@@ -102,7 +100,7 @@ UdpFrontend_Work(void *Unused)
                      Agent
                      );
 
-        MMgr_Send(ReceiveBuffer, BUF_LENGTH);
+        MMgr_Send(ReceiveBuffer, SOCKET_CONTEXT_LENGTH);
     }
     SafeFree(ReceiveBuffer);
 }

diff --git a/udpm.c b/udpm.c
@@ -8,8 +8,6 @@
 #include "domainstatistic.h"
 #include "timedtask.h"
 
-#define CONTEXT_DATA_LENGTH  2048
-
 static void SweepWorks(MsgContext *MsgCtx, int Number, UdpM *Module)
 {
     IHeader *h = (IHeader *)MsgCtx;
@@ -79,11 +77,11 @@ UdpM_Works(UdpM *m)
 
     struct sockaddr *addr;
 
-    char ReceiveBuffer[CONTEXT_DATA_LENGTH];
+    char ReceiveBuffer[SOCKET_CONTEXT_LENGTH];
     MsgContext *MsgCtx;
     IHeader *Header;
 
-    #define LEFT_LENGTH  (CONTEXT_DATA_LENGTH - sizeof(IHeader))
+    #define LEFT_LENGTH  (SOCKET_CONTEXT_LENGTH - sizeof(IHeader))
     char *Entity;
 
     fd_set  ReadSet, ReadySet;
@@ -395,7 +393,7 @@ int UdpM_Init(UdpM *m, const char *Services, BOOL Parallel)
         m->Parallels.addrlen = 0;
     }
 
-    if( ModuleContext_Init(&(m->Context), CONTEXT_DATA_LENGTH) != 0 )
+    if( ModuleContext_Init(&(m->Context), SOCKET_CONTEXT_LENGTH) != 0 )
     {
         ret = -143;
         goto EXIT_3;