mirror
/
network-manager-wireguard-upstream
mirror of https://github.com/max-moser/network-manager-wireguard.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #15 from Druco/hotfix/AllowedIPs_space 

Fix so Allowed IPs can have a "," and a " " between elements.
pull/17/head^2
Max 2018-10-14 21:10:49 +02:00 committed by GitHub
parent f2689562b6 d30e395274
commit a58078b227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shared/import-export.c
View File

@ -1222,7 +1222,11 @@ create_config_string (NMConnection *connection, GError **error)
ip_list = g_strsplit_set (allowed_ips, " \t,", 0); ip_list = g_strsplit_set (allowed_ips, " \t,", 0);
ips = g_array_new(TRUE, TRUE, sizeof(char *)); ips = g_array_new(TRUE, TRUE, sizeof(char *));
for (ip_iter = ip_list; ip_iter && *ip_iter; ip_iter++) { for (ip_iter = ip_list; ip_iter && *ip_iter; ip_iter++) {
g_array_append_val(ips, *ip_iter); // Using the g_strsplit_set call above can create zero length array elements if
// there is multiple separators such as both a comma and a space so we need to
// ignore any 0 length strings
if (0 != strlen(*ip_iter))
g_array_append_val(ips, *ip_iter);
} }
allowed_ips = concatenate_strings(ips, ", "); allowed_ips = concatenate_strings(ips, ", ");