changeset 32501:b9ae9bcf252d

Adjust this debug statement. listener_ip is based off of the bos connection fd, not the listener_fd, so it's more useful to log info about the bos conn fd.
author Mark Doliner <mark@kingant.net>
date Mon, 13 Feb 2012 03:05:53 +0000
parents ad8d32ec1afe
children 967354280e86
files libpurple/protocols/oscar/peer.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/peer.c	Mon Feb 06 23:08:34 2012 +0000
+++ b/libpurple/protocols/oscar/peer.c	Mon Feb 13 03:05:53 2012 +0000
@@ -708,10 +708,12 @@
 	{
 		const guchar *ip_atoi = purple_network_ip_atoi(listener_ip);
 		if (ip_atoi == NULL) {
-			purple_debug_error("oscar", "Cannot send file. atoi(%s) failed.\n"
-					"Other possibly useful information: fd = %d, port = %d\n",
-					listener_ip ? listener_ip : "(null!)", conn->listenerfd,
-					listener_port);
+			purple_debug_error("oscar", "Cannot send file. "
+					"purple_network_ip_atoi(%s) returned NULL. "
+					"fd=%d. is_ssl=%d\n",
+					listener_ip ? listener_ip : "(null!)",
+					bos_conn->gsc ? bos_conn->gsc->fd : bos_conn->fd,
+					bos_conn->gsc ? 1 : 0);
 			purple_xfer_cancel_local(conn->xfer);
 			return;
 		}