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

libnm-glib: fix handling of 'nameservers' property in NMIP6Config

Browse Source
This commit is contained in:
Jiří Klimeš
2010-06-28 19:05:40 +02:00
parent d83872f46d
commit aa104f9950
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm-glib/Makefile.am
View File

@@ -132,7 +132,7 @@ libnm_glib_la_LIBADD = \
$(GUDEV_LIBS) $(GUDEV_LIBS)
libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib.ver \ libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib.ver \
-version-info "6:0:4" -version-info "6:1:4"
noinst_PROGRAMS = libnm-glib-test noinst_PROGRAMS = libnm-glib-test

6
libnm-glib/nm-ip6-config.c
View File

@@ -92,7 +92,7 @@ demarshal_ip6_nameserver_array (NMObject *object, GParamSpec *pspec, GValue *val
if (!_nm_ip6_address_array_demarshal (value, (GSList **) field)) if (!_nm_ip6_address_array_demarshal (value, (GSList **) field))
return FALSE; return FALSE;
if (!strcmp (pspec->name, NM_IP6_CONFIG_NAMESERVERS)) if (pspec && !strcmp (pspec->name, NM_IP6_CONFIG_NAMESERVERS))
_nm_object_queue_notify (object, NM_IP6_CONFIG_NAMESERVERS); _nm_object_queue_notify (object, NM_IP6_CONFIG_NAMESERVERS);
return TRUE; return TRUE;
@@ -188,6 +188,7 @@ const GSList *
nm_ip6_config_get_nameservers (NMIP6Config *config) nm_ip6_config_get_nameservers (NMIP6Config *config)
{ {
NMIP6ConfigPrivate *priv; NMIP6ConfigPrivate *priv;
GParamSpec *pspec;
GValue value = {0,}; GValue value = {0,};
g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL);
@@ -203,7 +204,8 @@ nm_ip6_config_get_nameservers (NMIP6Config *config)
return NULL; return NULL;
} }
demarshal_ip6_nameserver_array (NM_OBJECT (config), NULL, &value, &priv->nameservers); pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (config)), NM_IP6_CONFIG_NAMESERVERS);
demarshal_ip6_nameserver_array (NM_OBJECT (config), pspec, &value, &priv->nameservers);
g_value_unset (&value); g_value_unset (&value);
return priv->nameservers; return priv->nameservers;

12
libnm-glib/nm-types.c
View File

@@ -359,7 +359,7 @@ _nm_ip6_address_array_demarshal (GValue *value, GSList **dest)
{ {
GPtrArray *array; GPtrArray *array;
if (!G_VALUE_HOLDS (value, DBUS_TYPE_G_UINT_ARRAY)) if (!G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR))
return FALSE; return FALSE;
if (*dest) { if (*dest) {
@@ -373,12 +373,12 @@ _nm_ip6_address_array_demarshal (GValue *value, GSList **dest)
int i; int i;
for (i = 0; i < array->len; i++) { for (i = 0; i < array->len; i++) {
struct in6_addr *addr = g_ptr_array_index (array, i); GByteArray *bytearray = (GByteArray *) g_ptr_array_index (array, i);
struct in6_addr *dup; struct in6_addr *addr;
dup = g_malloc0 (sizeof (struct in6_addr)); addr = g_malloc0 (sizeof (struct in6_addr));
memcpy (dup, addr, sizeof (struct in6_addr)); memcpy (addr->s6_addr, bytearray->data, bytearray->len);
*dest = g_slist_append (*dest, dup); *dest = g_slist_append (*dest, addr);
} }
} }