This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 53f7fdf601cfdf0f8462f70406391ecf1d53a844 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 29 11:36:26 2019 +0200 src/x2goclient-network-ssh.c: use IPv6 and IPv4 address spec parsing function(s). --- src/x2goclient-network-ssh.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index 0a17168..47f56bf 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -307,9 +307,35 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetworkS ret = x2goclient_network_ssh_parse_sockspec_unix_socket (sockspec); if (!ret) { - /* Must be not a UNIX socket, continue checking for IPv6 addresses. */ + g_log (NULL, G_LOG_LEVEL_INFO, "Failed to parse socket specification as UNIX socket.\n" + "Continuing with IPv6 parsing."); + GError *tmp_err = NULL; ret = x2goclient_network_ssh_parse_sockspec_ip (sockspec, TRUE, &tmp_err); + + if (tmp_err) { + g_assert (!ret); + + g_log (NULL, G_LOG_LEVEL_WARNING, "Socket specification looked like an IPv6 socket, but parsing as such failed: %s", tmp_err->message); + + g_clear_error (&tmp_err); + } + } + + if (!ret) { + g_log (NULL, G_LOG_LEVEL_INFO, "Failed to parse socket specification as IPv6 socket.\n" + "Continuing with IPv4 parsing."); + + GError *tmp_err = NULL; + ret = x2goclient_network_ssh_parse_sockspec_ip (sockspec, FALSE, &tmp_err); + + if (tmp_err) { + g_assert (!ret); + + g_log (NULL, G_LOG_LEVEL_WARNING, "Socket specification looked like an IPv4 socket, but parsing as such failed: %s", tmp_err->message); + + g_clear_error (&tmp_err); + } } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git