From e047c9fec11429b878865f2814d4bf3d9325427a Mon Sep 17 00:00:00 2001 From: Alexander Schrab Date: Fri, 24 May 2013 13:39:50 +0200 Subject: [PATCH] rtsp-client: ipv4 adress should not be marked ipv6 even if socket is ipv6 https://bugzilla.gnome.org/show_bug.cgi?id=700953 --- gst/rtsp-server/rtsp-client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index 5b5affe..8496aa0 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -2389,7 +2389,6 @@ setup_client (GstRTSPClient * client, GSocket * socket, GstRTSPUrl *url; read_socket = gst_rtsp_connection_get_read_socket (conn); - priv->is_ipv6 = g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV6; if (!(address = g_socket_get_remote_address (read_socket, error))) goto no_address; @@ -2401,9 +2400,12 @@ setup_client (GstRTSPClient * client, GSocket * socket, iaddr = g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (address)); + /* socket might be ipv6 but adress still ipv4 */ + priv->is_ipv6 = g_inet_address_get_family (iaddr) == G_SOCKET_FAMILY_IPV6; priv->server_ip = g_inet_address_to_string (iaddr); g_object_unref (address); } else { + priv->is_ipv6 = g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV6; priv->server_ip = g_strdup ("unknown"); } -- 2.7.4