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

libnm-util: fix IPv6 address array -> string transform

Browse Source 
Only used for debugging, but it's nice to see the actual address
instead of a transform error.
This commit is contained in:
Dan Williams
2010-04-30 15:29:53 -07:00
parent 93d1d81938
commit cc0c2783b6
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libnm-util/nm-utils.c
View File

@@ -861,10 +861,11 @@ nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValu
g_string_append (printable, "{ "); g_string_append (printable, "{ ");
elements = (GValueArray *) g_ptr_array_index (ptr_array, i++); elements = (GValueArray *) g_ptr_array_index (ptr_array, i++);
if ( (elements->n_values != 2) if ( (elements->n_values != 3)
|| (G_VALUE_TYPE (g_value_array_get_nth (elements, 0)) != DBUS_TYPE_G_UCHAR_ARRAY) || (G_VALUE_TYPE (g_value_array_get_nth (elements, 0)) != DBUS_TYPE_G_UCHAR_ARRAY)
|| (G_VALUE_TYPE (g_value_array_get_nth (elements, 1)) != G_TYPE_UINT)) { || (G_VALUE_TYPE (g_value_array_get_nth (elements, 1)) != G_TYPE_UINT)
g_string_append (printable, "invalid"); || (G_VALUE_TYPE (g_value_array_get_nth (elements, 2)) != DBUS_TYPE_G_UCHAR_ARRAY)) {
g_string_append (printable, "invalid }");
continue; continue;
} }
@@ -872,7 +873,7 @@ nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValu
tmp = g_value_array_get_nth (elements, 0); tmp = g_value_array_get_nth (elements, 0);
ba_addr = g_value_get_boxed (tmp); ba_addr = g_value_get_boxed (tmp);
if (ba_addr->len != 16) { if (ba_addr->len != 16) {
g_string_append (printable, "invalid"); g_string_append (printable, "invalid }");
continue; continue;
} }
addr = (struct in6_addr *) ba_addr->data; addr = (struct in6_addr *) ba_addr->data;
@@ -885,7 +886,7 @@ nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValu
tmp = g_value_array_get_nth (elements, 1); tmp = g_value_array_get_nth (elements, 1);
prefix = g_value_get_uint (tmp); prefix = g_value_get_uint (tmp);
if (prefix > 128) { if (prefix > 128) {
g_string_append (printable, "invalid"); g_string_append (printable, "invalid }");
continue; continue;
} }
g_string_append_printf (printable, "px = %u", prefix); g_string_append_printf (printable, "px = %u", prefix);
@@ -895,7 +896,7 @@ nm_utils_convert_ip6_addr_struct_array_to_string (const GValue *src_value, GValu
tmp = g_value_array_get_nth (elements, 2); tmp = g_value_array_get_nth (elements, 2);
ba_addr = g_value_get_boxed (tmp); ba_addr = g_value_get_boxed (tmp);
if (ba_addr->len != 16) { if (ba_addr->len != 16) {
g_string_append (printable, "invalid"); g_string_append (printable, "invalid }");
continue; continue;
} }
addr = (struct in6_addr *) ba_addr->data; addr = (struct in6_addr *) ba_addr->data;