gnetworkaddress: Add g_network_address_new_loopback() constructor

This is a convenience method for creating a GNetworkAddress which is
guaranteed to return IPv4 and IPv6 loopback addresses. The program
cannot guarantee that 'localhost' will resolve to both types of
address, so programs which wish to connect to a local service over
either IPv4 or IPv6 must currently manually create an IPv4 and another
IPv6 socket, and detect which of the two are working. This new API
allows the existing GSocketConnectable machinery to be used to
automate that.

Based on a patch from Philip Withnall.

https://bugzilla.gnome.org/show_bug.cgi?id=732317
This commit is contained in:
Dan Winship
2014-11-23 12:53:03 -05:00
parent 296c710c64
commit 64f9bf96fd
4 changed files with 182 additions and 2 deletions

View File

@@ -267,6 +267,12 @@ g_network_address_parse_sockaddr (GNetworkAddress *addr)
* Creates a new #GSocketConnectable for connecting to the given
* @hostname and @port.
*
* Note that depending on the configuration of the machine, a
* @hostname of `localhost` may refer to the IPv4 loopback address
* only, or to both IPv4 and IPv6; use
* g_network_address_new_loopback() to create a #GNetworkAddress that
* is guaranteed to resolve to both addresses.
*
* Returns: (transfer full) (type GNetworkAddress): the new #GNetworkAddress
*
* Since: 2.22
@@ -281,6 +287,45 @@ g_network_address_new (const gchar *hostname,
NULL);
}
/**
* g_network_address_new_loopback:
* @port: the port
*
* Creates a new #GSocketConnectable for connecting to the local host
* over a loopback connection to the given @port. This is intended for
* use in connecting to local services which may be running on IPv4 or
* IPv6.
*
* The connectable will return IPv4 and IPv6 loopback addresses,
* regardless of how the host resolves `localhost`. By contrast,
* g_network_address_new() will often only return an IPv4 address when
* resolving `localhost`, and an IPv6 address for `localhost6`.
*
* g_network_address_get_hostname() will always return `localhost` for
* #GNetworkAddresses created with this constructor.
*
* Returns: (transfer full) (type GNetworkAddress): the new #GNetworkAddress
*
* Since: 2.44
*/
GSocketConnectable *
g_network_address_new_loopback (guint16 port)
{
GNetworkAddress *addr;
GList *addrs = NULL;
addr = g_object_new (G_TYPE_NETWORK_ADDRESS,
"hostname", "localhost",
"port", port,
NULL);
addrs = g_list_append (addrs, g_inet_address_new_loopback (AF_INET6));
addrs = g_list_append (addrs, g_inet_address_new_loopback (AF_INET));
g_network_address_set_addresses (addr, addrs, 0);
return G_SOCKET_CONNECTABLE (addr);
}
/**
* g_network_address_parse:
* @host_and_port: the hostname and optionally a port