askiiart/tunsafe-clang15
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow # comments in config file

Browse source
This commit is contained in:
Ludvig Strigeus 2018-09-08 23:30:59 +02:00
parent e116360538
commit 99b6e2622c
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
wireguard_config.cpp
View file

@ -475,21 +475,25 @@ bool ParseWireGuardConfigFile(WireguardProcessor *wg, const char *filename, DnsR
} }
while (fgets(buf, sizeof(buf), f)) { while (fgets(buf, sizeof(buf), f)) {
size_t l = strlen(buf); size_t len = strlen(buf);
if (ContainsNonAsciiCharacter(buf, l)) { if (ContainsNonAsciiCharacter(buf, len)) {
RERROR("File is not a config file: %s", filename); RERROR("File is not a config file: %s", filename);
return false; return false;
} }
char *comment = (char*)memchr(buf, '#', len);
if (comment) {
len = comment - buf;
*comment = '\0';
}
while (len && is_space(buf[len - 1]))
buf[--len] = 0;
while (l && is_space(buf[l - 1])) if (buf[0] == '\0')
buf[--l] = 0;
if (buf[0] == '#' || buf[0] == '\0')
continue; continue;
if (buf[0] == '[') { if (buf[0] == '[') {
size_t len = strlen(buf);
if (len < sizeof(group)) { if (len < sizeof(group)) {
memcpy(group, buf, len + 1); memcpy(group, buf, len + 1);
if (!file_parser.ParseFlag(group, NULL, NULL)) { if (!file_parser.ParseFlag(group, NULL, NULL)) {
@ -511,9 +515,7 @@ bool ParseWireGuardConfigFile(WireguardProcessor *wg, const char *filename, DnsR
*sepe = 0; *sepe = 0;
// trim space after = // trim space after =
sep++; do sep++; while (is_space(*sep));
while (is_space(*sep))
sep++;
if (!file_parser.ParseFlag(group, buf, sep)) { if (!file_parser.ParseFlag(group, buf, sep)) {
RERROR("Error parsing %s.%s = %s", group, buf, sep); RERROR("Error parsing %s.%s = %s", group, buf, sep);