Improvement: Add a space character between URL and other tokens in the packet log format.
@@ -1243,12 +1243,19 @@ void AddLogBufToStr(BUF *b, char *name, char *value)
void MakeSafeLogStr(char *str)
{
UINT i, len;
+ bool is_http = false;
// Validate arguments
if (str == NULL)
{
return;
}
+ if (str[0] == 'h' && str[1] == 't' && str[2] == 't' && str[3] == 'p' &&
+ ((str[4] == 's' && str[5] == ':') || (str[4] == ':')))
+ {
+ is_http = true;
+ }
+
EnPrintableAsciiStr(str, '?');
len = StrLen(str);
@@ -1259,11 +1266,14 @@ void MakeSafeLogStr(char *str)
str[i] = '.';
}
else if (str[i] == ' ')
+ {
+ if (is_http == false)
{
str[i] = '_';
}
}
}
+}
// Procedure for converting a packet log entry to a string
char *PacketLogParseProc(RECORD *rec)
@@ -2007,8 +2017,6 @@ void ReplaceForCsv(char *str)
return;
}
- // If there are blanks, trim it
- Trim(str);
len = StrLen(str);
for (i = 0;i < len;i++)
