[ossec-dev] ossec-hids: ar-forward.c (HEAD) manager.c (HEAD) syslog.c (HEAD) syslogtcp.c (HEAD) [dcid]

[OSSEC CVS <cvs-commit@xxxxxxxxx>]

Module name:	ossec-hids
Changes by:	dcid	06/09/11 23:04:36

Modified files:
	ar-forward.c manager.c syslog.c syslogtcp.c

Log message:
Description: Lots, lots of changes. Increasing maximum size payload from 1024 to 6k (it applies for remote messages, logs, etc). Still need a more careful testing and review.
Reviewed by: dcid (initial review only)
Bug:

Index: ar-forward.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/ar-forward.c,v
diff -u -r1.17 -r1.18
--- ar-forward.c	28 Aug 2006 18:45:27 -0000	1.17
+++ ar-forward.c	12 Sep 2006 02:04:36 -0000	1.18
@@ -33,9 +33,9 @@
     int agent_id = 0;
     int ar_location = 0;
     
-    char msg_to_send[OS_MAXSTR +1];
+    char msg_to_send[OS_SIZE_1024 +1];
     
-    char msg[OS_MAXSTR +1];
+    char msg[OS_SIZE_1024 +1];
     char *location = NULL;
     char *ar_location_str = NULL;
     char *ar_agent_id = NULL;
@@ -48,12 +48,12 @@
         ErrorExit(QUEUE_ERROR, ARGV0, ARQUEUE);
     }
 
-    memset(msg, '\0', OS_MAXSTR +1);
+    memset(msg, '\0', OS_SIZE_1024 +1);
 
     /* Daemon loop */
     while(1)
     {
-        if(OS_RecvUnix(arq, OS_MAXSTR, msg))
+        if(OS_RecvUnix(arq, OS_SIZE_1024, msg))
         {
             /* Always zeroing the location */
             ar_location = 0;
@@ -129,7 +129,7 @@
             
             
             /*** Creating the new message ***/
-            snprintf(msg_to_send, OS_MAXSTR, "%s%s%s", 
+            snprintf(msg_to_send, OS_SIZE_1024, "%s%s%s", 
                                              CONTROL_HEADER,
                                              EXECD_HEADER,
                                              tmp_str);

Index: manager.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/manager.c,v
diff -u -r1.29 -r1.30
--- manager.c	29 Aug 2006 19:35:42 -0000	1.29
+++ manager.c	12 Sep 2006 02:04:36 -0000	1.30
@@ -217,8 +217,8 @@
 int send_file_toagent(int agentid, char *name, char *sum)
 {
     int i = 0;
-    char file[OS_MAXSTR +1];
-    char buf[OS_MAXSTR +1];
+    char file[OS_SIZE_1024 +1];
+    char buf[OS_SIZE_1024 +1];
     char crypt_msg[OS_MAXSTR +1];
 
     int msg_size;
@@ -233,7 +233,7 @@
     }
     
     
-    snprintf(file, OS_MAXSTR, "%s/%s",SHAREDCFG_DIR, name);
+    snprintf(file, OS_SIZE_1024, "%s/%s",SHAREDCFG_DIR, name);
 
     fp = fopen(file, "r");
     if(!fp)
@@ -244,7 +244,7 @@
 
 
     /* Sending the file name first */
-    snprintf(buf, OS_MAXSTR, "%s%s%s %s\n", 
+    snprintf(buf, OS_SIZE_1024, "%s%s%s %s\n", 
                              CONTROL_HEADER, FILE_UPDATE_HEADER, sum, name);
 
     msg_size = CreateSecMSG(&keys, buf, crypt_msg, agentid);
@@ -268,7 +268,7 @@
     sleep(1);
 
     /* Sending the file content */
-    while(fgets(buf, OS_MAXSTR , fp) != NULL)
+    while(fgets(buf, OS_SIZE_1024 , fp) != NULL)
     {
         msg_size = CreateSecMSG(&keys, buf, crypt_msg, agentid);
 
@@ -301,7 +301,7 @@
     sleep(1);
     
     /* Sending the message to close the file */
-    snprintf(buf, OS_MAXSTR, "%s%s", CONTROL_HEADER, FILE_CLOSE_HEADER);
+    snprintf(buf, OS_SIZE_1024, "%s%s", CONTROL_HEADER, FILE_CLOSE_HEADER);
 
     msg_size = CreateSecMSG(&keys, buf, crypt_msg, agentid);
     if(msg_size == 0)
@@ -337,7 +337,7 @@
     int i;
 
     char *uname;
-    char agent_file[OS_MAXSTR +1];
+    char agent_file[OS_SIZE_1024 +1];
     char msg_ack[OS_FLSIZE +1];
 
     FILE *fp;
@@ -375,7 +375,7 @@
 
 
     /* Writting to the agent file */
-    snprintf(agent_file, OS_MAXSTR, "%s/%s-%s",
+    snprintf(agent_file, OS_SIZE_1024, "%s/%s-%s",
                          AGENTINFO_DIR,
                          keys.name[agentid],
                          keys.ips[agentid]);
@@ -479,11 +479,11 @@
 void *wait_for_msgs(void *none)
 {
     int id, i;
-    char msg[OS_MAXSTR +2];
+    char msg[OS_SIZE_1024 +2];
     
 
     /* Initializing the memory */
-    memset(msg, '\0', OS_MAXSTR +2);
+    memset(msg, '\0', OS_SIZE_1024 +2);
 
     
     /* should never leave this loop */
@@ -539,7 +539,7 @@
             if((_changed[i] == 1)&&(_msg[i]))
             {
                 /* Copying the message to be analyzed */
-                strncpy(msg, _msg[i], OS_MAXSTR);
+                strncpy(msg, _msg[i], OS_SIZE_1024);
                 _changed[i] = 0;
 
                 if(modified_agentid >= i)

Index: syslog.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/syslog.c,v
diff -u -r1.9 -r1.10
--- syslog.c	28 Aug 2006 18:45:27 -0000	1.9
+++ syslog.c	12 Sep 2006 02:04:36 -0000	1.10
@@ -48,7 +48,7 @@
  */
 void HandleSyslog()
 {
-    char buffer[OS_MAXSTR +2];
+    char buffer[OS_SIZE_1024 +2];
     char srcip[IPSIZE +1];
 
     char *buffer_pt = NULL;
@@ -64,7 +64,7 @@
 
 
     /* Initializing some variables */
-    memset(buffer, '\0', OS_MAXSTR +2);
+    memset(buffer, '\0', OS_SIZE_1024 +2);
 
     
     /* Connecting to the message queue
@@ -80,7 +80,7 @@
     while(1)
     {
         /* Receiving message  */
-        recv_b = recvfrom(logr.sock, buffer, OS_MAXSTR, 0, 
+        recv_b = recvfrom(logr.sock, buffer, OS_SIZE_1024, 0, 
                 (struct sockaddr *)&peer_info, &peer_size);
 
         /* Nothing received */

Index: syslogtcp.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/syslogtcp.c,v
diff -u -r1.2 -r1.3
--- syslogtcp.c	28 Aug 2006 18:45:27 -0000	1.2
+++ syslogtcp.c	12 Sep 2006 02:04:36 -0000	1.3
@@ -78,7 +78,7 @@
         if(!buffer_pt)
         {
             /* Buffer is full */
-            if((sb_size - r_sz) <= 1)
+            if((sb_size - r_sz) <= 2)
             {
                 merror("%s: Full buffer receiving from: '%s'", ARGV0, srcip);
                 sb_size = OS_MAXSTR;
@@ -101,9 +101,9 @@
 
         /* Storing everything on the storage_buffer */
         /* Checking if buffer will be  full */
-        if((sb_size - r_sz) <= 1)
+        if((sb_size - r_sz) <= 2)
         {
-            merror("%s: Full buffer receiving from: '%s'", ARGV0, srcip);
+            merror("%s: Full buffer receiving from: '%s'.", ARGV0, srcip);
             sb_size = OS_MAXSTR;
             storage_buffer[0] = '\0';
             tmp_buffer[0] = '\0';