AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Merge pull request #1062 from dnobori/200101_impr_url_log_spacing

Browse Source 
Merge pull request #1062: Improvement: Add a space character between URL and other tokens in the packet log format.
This commit is contained in:
Ilya Shipitsin 2020-01-01 17:53:27 +05:00 committed by GitHub
commit eeec9a82f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Cedar/Logging.c
View File

@ -1243,12 +1243,19 @@ void AddLogBufToStr(BUF *b, char *name, char *value)
void MakeSafeLogStr(char *str) void MakeSafeLogStr(char *str)
{ {
UINT i, len; UINT i, len;
bool is_http = false;
// Validate arguments // Validate arguments
if (str == NULL) if (str == NULL)
{ {
return; 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, '?'); EnPrintableAsciiStr(str, '?');
len = StrLen(str); len = StrLen(str);
@ -1259,11 +1266,14 @@ void MakeSafeLogStr(char *str)
str[i] = '.'; str[i] = '.';
} }
else if (str[i] == ' ') else if (str[i] == ' ')
{
if (is_http == false)
{ {
str[i] = '_'; str[i] = '_';
} }
} }
} }
}
// Procedure for converting a packet log entry to a string // Procedure for converting a packet log entry to a string
char *PacketLogParseProc(RECORD *rec) char *PacketLogParseProc(RECORD *rec)
@ -2007,8 +2017,6 @@ void ReplaceForCsv(char *str)
return; return;
} }
// If there are blanks, trim it
Trim(str);
len = StrLen(str); len = StrLen(str);
for (i = 0;i < len;i++) for (i = 0;i < len;i++)