[glib] gsocket: improve sockopt handling for IPv4-wrapped-IPv6 sockets
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gsocket: improve sockopt handling for IPv4-wrapped-IPv6 sockets
- Date: Mon, 17 Dec 2012 14:02:59 +0000 (UTC)
commit df334d6e00917d2ba8d8e722f9192da65c09827e
Author: Dan Winship <danw gnome org>
Date: Wed Dec 12 16:39:02 2012 +0100
gsocket: improve sockopt handling for IPv4-wrapped-IPv6 sockets
On IPv6 sockets, set both the IPv4 and IPv6 versions of IP socket
options, in case the socket is (or might become) IPv4-wrapped. (But
ignore errors when setting the IPv4 version.)
Similarly, when joining or leaving a multicast group, pick the sockopt
to use based on the address family of the multicast address rather
than the address family of the socket.
https://bugzilla.gnome.org/show_bug.cgi?id=687092
gio/gsocket.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index e2fec92..ebb831c 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -1348,6 +1348,8 @@ g_socket_set_ttl (GSocket *socket,
}
else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
{
+ g_socket_set_option (socket, IPPROTO_IP, IP_TTL,
+ ttl, NULL);
g_socket_set_option (socket, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
ttl, &error);
}
@@ -1499,6 +1501,8 @@ g_socket_set_multicast_loopback (GSocket *socket,
}
else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
{
+ g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP,
+ loopback, NULL);
g_socket_set_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
loopback, &error);
}
@@ -1532,7 +1536,7 @@ g_socket_get_multicast_ttl (GSocket *socket)
GError *error = NULL;
gint value;
- g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
+ g_return_val_if_fail (G_IS_SOCKET (socket), 0);
if (socket->priv->family == G_SOCKET_FAMILY_IPV4)
{
@@ -1583,6 +1587,8 @@ g_socket_set_multicast_ttl (GSocket *socket,
}
else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
{
+ g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_TTL,
+ ttl, NULL);
g_socket_set_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
ttl, &error);
}
@@ -1900,13 +1906,12 @@ g_socket_multicast_group_operation (GSocket *socket,
g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
g_return_val_if_fail (socket->priv->type == G_SOCKET_TYPE_DATAGRAM, FALSE);
g_return_val_if_fail (G_IS_INET_ADDRESS (group), FALSE);
- g_return_val_if_fail (g_inet_address_get_family (group) == socket->priv->family, FALSE);
if (!check_socket (socket, error))
return FALSE;
native_addr = g_inet_address_to_bytes (group);
- if (socket->priv->family == G_SOCKET_FAMILY_IPV4)
+ if (g_inet_address_get_family (group) == G_SOCKET_FAMILY_IPV4)
{
#ifdef HAVE_IP_MREQN
struct ip_mreqn mc_req;
@@ -1944,7 +1949,7 @@ g_socket_multicast_group_operation (GSocket *socket,
result = setsockopt (socket->priv->fd, IPPROTO_IP, optname,
&mc_req, sizeof (mc_req));
}
- else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
+ else if (g_inet_address_get_family (group) == G_SOCKET_FAMILY_IPV6)
{
struct ipv6_mreq mc_req_ipv6;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]