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

utils: more flexible reading of /proc/sys/net

Browse Source 
- changes nm_utils_get_proc_sys_net_value() to allow all values, not just 0,1
- adds nm_utils_get_proc_sys_net_value_with_bounds() for limiting valid values
This commit is contained in:
Jiří Klimeš
2011-07-12 09:08:04 +02:00
parent 23b73b1354
commit 785b6fb807
4 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/NetworkManagerUtils.c
View File

@@ -848,7 +848,7 @@ nm_utils_do_sysctl (const char *path, const char *value)
gboolean
nm_utils_get_proc_sys_net_value (const char *path,
const char *iface,
guint32 *out_value)
gint32 *out_value)
{
GError *error = NULL;
char *contents = NULL;
@@ -864,8 +864,8 @@ nm_utils_get_proc_sys_net_value (const char *path,
} else {
errno = 0;
tmp = strtol (contents, NULL, 10);
if ((errno == 0) && (tmp == 0 || tmp == 1)) {
*out_value = (guint32) tmp;
if (errno == 0) {
*out_value = (gint32) tmp;
success = TRUE;
}
g_free (contents);
@@ -874,6 +874,28 @@ nm_utils_get_proc_sys_net_value (const char *path,
return success;
}
gboolean
nm_utils_get_proc_sys_net_value_with_bounds (const char *path,
const char *iface,
gint32 *out_value,
gint32 valid_min,
gint32 valid_max)
{
gboolean result;
gint32 val;
result = nm_utils_get_proc_sys_net_value (path, iface, &val);
if (result) {
if (val >= valid_min && val <= valid_max)
*out_value = val;
else
result = FALSE;
}
return result;
}
static char *
get_new_connection_name (const GSList *existing,
const char *format,