luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio: Make enumerating a GNetworkAddress work more than once

Browse Source 
Previously, the code only initialized the enumerator if the address
hadn't had cached addresses. But creating an enumerator cached the
addresses, so the second one failed to work.
This commit is contained in:
Benjamin Otte 2010-12-07 17:25:01 +01:00
parent 07fd29c323
commit bd227f5219
1 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
gio/gnetworkaddress.c
View File

@ -781,7 +781,8 @@ typedef struct {
GSocketAddressEnumerator parent_instance; GSocketAddressEnumerator parent_instance;
GNetworkAddress *addr; GNetworkAddress *addr;
GList *a; GList *addresses;
GList *next;
} GNetworkAddressAddressEnumerator; } GNetworkAddressAddressEnumerator;
typedef struct { typedef struct {
@ -811,31 +812,34 @@ g_network_address_address_enumerator_next (GSocketAddressEnumerator *enumerator
G_NETWORK_ADDRESS_ADDRESS_ENUMERATOR (enumerator); G_NETWORK_ADDRESS_ADDRESS_ENUMERATOR (enumerator);
GSocketAddress *sockaddr; GSocketAddress *sockaddr;
if (!addr_enum->addr->priv->sockaddrs) if (addr_enum->addresses == NULL)
{ {
GResolver *resolver = g_resolver_get_default (); if (!addr_enum->addr->priv->sockaddrs)
GList *addresses; {
GResolver *resolver = g_resolver_get_default ();
GList *addresses;
addresses = g_resolver_lookup_by_name (resolver, addresses = g_resolver_lookup_by_name (resolver,
addr_enum->addr->priv->hostname, addr_enum->addr->priv->hostname,
cancellable, error); cancellable, error);
g_object_unref (resolver); g_object_unref (resolver);
if (!addresses) if (!addresses)
return NULL; return NULL;
g_network_address_set_addresses (addr_enum->addr, addresses); g_network_address_set_addresses (addr_enum->addr, addresses);
addr_enum->a = addr_enum->addr->priv->sockaddrs; }
addr_enum->addresses = addr_enum->addr->priv->sockaddrs;
addr_enum->next = addr_enum->addresses;
} }
if (!addr_enum->a) if (addr_enum->next == NULL)
return NULL; return NULL;
else
{ sockaddr = addr_enum->next->data;
sockaddr = addr_enum->a->data; addr_enum->next = addr_enum->next->next;
addr_enum->a = addr_enum->a->next; return g_object_ref (sockaddr);
return g_object_ref (sockaddr);
}
} }
static void static void
@ -850,24 +854,21 @@ got_addresses (GObject *source_object,
GList *addresses; GList *addresses;
GError *error = NULL; GError *error = NULL;
addresses = g_resolver_lookup_by_name_finish (resolver, result, &error);
if (!addr_enum->addr->priv->sockaddrs) if (!addr_enum->addr->priv->sockaddrs)
{ {
addresses = g_resolver_lookup_by_name_finish (resolver, result, &error);
if (error) if (error)
{ g_simple_async_result_take_error (simple, error);
g_simple_async_result_take_error (simple, error);
}
else else
{ g_network_address_set_addresses (addr_enum->addr, addresses);
g_network_address_set_addresses (addr_enum->addr, addresses);
addr_enum->a = addr_enum->addr->priv->sockaddrs;
}
} }
else if (error)
g_error_free (error);
g_object_unref (resolver); g_object_unref (resolver);
addr_enum->addresses = addr_enum->addr->priv->sockaddrs;
addr_enum->next = addr_enum->addresses;
g_simple_async_result_complete (simple); g_simple_async_result_complete (simple);
g_object_unref (simple); g_object_unref (simple);
} }
@ -886,21 +887,26 @@ g_network_address_address_enumerator_next_async (GSocketAddressEnumerator *enum
callback, user_data, callback, user_data,
g_network_address_address_enumerator_next_async); g_network_address_address_enumerator_next_async);
if (!addr_enum->addr->priv->sockaddrs) if (addr_enum->addresses == NULL)
{ {
GResolver *resolver = g_resolver_get_default (); if (!addr_enum->addr->priv->sockaddrs)
{
GResolver *resolver = g_resolver_get_default ();
g_simple_async_result_set_op_res_gpointer (simple, g_object_ref (addr_enum), g_object_unref); g_simple_async_result_set_op_res_gpointer (simple, g_object_ref (addr_enum), g_object_unref);
g_resolver_lookup_by_name_async (resolver, g_resolver_lookup_by_name_async (resolver,
addr_enum->addr->priv->hostname, addr_enum->addr->priv->hostname,
cancellable, cancellable,
got_addresses, simple); got_addresses, simple);
} return;
else }
{
g_simple_async_result_complete_in_idle (simple); addr_enum->addresses = addr_enum->addr->priv->sockaddrs;
g_object_unref (simple); addr_enum->next = addr_enum->addresses;
} }
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
} }
static GSocketAddress * static GSocketAddress *
@ -915,12 +921,12 @@ g_network_address_address_enumerator_next_finish (GSocketAddressEnumerator *enu
if (g_simple_async_result_propagate_error (simple, error)) if (g_simple_async_result_propagate_error (simple, error))
return NULL; return NULL;
else if (!addr_enum->a) else if (!addr_enum->next)
return NULL; return NULL;
else else
{ {
sockaddr = addr_enum->a->data; sockaddr = addr_enum->next->data;
addr_enum->a = addr_enum->a->next; addr_enum->next = addr_enum->next->next;
return g_object_ref (sockaddr); return g_object_ref (sockaddr);
} }
} }