projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/2.7'
[ossec-hids.git]
/
src
/
logcollector
/
read_snortfull.c
diff --git
a/src/logcollector/read_snortfull.c
b/src/logcollector/read_snortfull.c
index
951b2d8
..
cbb3edc
100755
(executable)
--- a/
src/logcollector/read_snortfull.c
+++ b/
src/logcollector/read_snortfull.c
@@
-1,4
+1,5
@@
-/* @(#) $Id$ */
+/* @(#) $Id: ./src/logcollector/read_snortfull.c, 2011/09/08 dcid Exp $
+ */
/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
@@
-22,15
+23,15
@@
void *read_snortfull(int pos, int *rc, int drop_it)
{
int f_msg_size = OS_MAXSTR;
void *read_snortfull(int pos, int *rc, int drop_it)
{
int f_msg_size = OS_MAXSTR;
-
+
char *one = "one";
char *two = "two";
char *one = "one";
char *two = "two";
-
+
char *p = NULL;
char *q;
char str[OS_MAXSTR + 1];
char f_msg[OS_MAXSTR +1];
char *p = NULL;
char *q;
char str[OS_MAXSTR + 1];
char f_msg[OS_MAXSTR +1];
-
+
*rc = 0;
str[OS_MAXSTR]='\0';
f_msg[OS_MAXSTR] = '\0';
*rc = 0;
str[OS_MAXSTR]='\0';
f_msg[OS_MAXSTR] = '\0';
@@
-75,7
+76,7
@@
void *read_snortfull(int pos, int *rc, int drop_it)
f_msg_size -= strlen(str)+1;
p = two;
}
f_msg_size -= strlen(str)+1;
p = two;
}
-
+
/* If it is a preprocessor message, it will not have
* the classification.
*/
/* If it is a preprocessor message, it will not have
* the classification.
*/
@@
-84,10
+85,10
@@
void *read_snortfull(int pos, int *rc, int drop_it)
strncat(f_msg, "[Classification: Preprocessor] "
"[Priority: 3] ", f_msg_size);
strncat(f_msg, ++q, f_msg_size -40);
strncat(f_msg, "[Classification: Preprocessor] "
"[Priority: 3] ", f_msg_size);
strncat(f_msg, ++q, f_msg_size -40);
-
+
/* Cleaning for next event */
p = NULL;
/* Cleaning for next event */
p = NULL;
-
+
/* Sending the message */
if(drop_it == 0)
{
/* Sending the message */
if(drop_it == 0)
{
@@
-133,7
+134,7
@@
void *read_snortfull(int pos, int *rc, int drop_it)
}
}
}
}
}
}
-
+
f_msg[0] = '\0';
f_msg_size = OS_MAXSTR;
str[0] = '\0';
f_msg[0] = '\0';
f_msg_size = OS_MAXSTR;
str[0] = '\0';