colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemd: merge branch 'systemd' into master

Browse Source
This commit is contained in:
Thomas Haller
2015-08-12 12:53:13 +02:00
parent 3ae6f9d793 8f4e617526
commit edb0cc235a
20 changed files with 1125 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dhcp-manager/nm-dhcp-systemd.c
View File

@@ -222,7 +222,8 @@ lease_to_ip4_config (const char *iface,
guint16 mtu;
int r, num;
guint64 end_time;
uint8_t *data;
const uint8_t *data;
gsize data_len;
gboolean metered = FALSE;
g_return_val_if_fail (lease != NULL, NULL);
@@ -355,9 +356,9 @@ lease_to_ip4_config (const char *iface,
g_string_free (l, TRUE);
}
num = sd_dhcp_lease_get_vendor_specific (lease, &data);
if (num > 0)
metered = !!memmem (data, num, "ANDROID_METERED", STRLEN ("ANDROID_METERED"));
r = sd_dhcp_lease_get_vendor_specific (lease, &data, &data_len);
if (r >= 0)
metered = !!memmem (data, data_len, "ANDROID_METERED", STRLEN ("ANDROID_METERED"));
nm_ip4_config_set_metered (ip4_config, metered);
return ip4_config;