pidgin: 4b5c688e: Adjust this debug statement. listener_i...
markdoliner at pidgin.im
markdoliner at pidgin.im
Sun Feb 12 22:10:54 EST 2012
----------------------------------------------------------------------
Revision: 4b5c688e1486f88c95bbe6946367a00b2d1e02dd
Parent: f0388e54998489dbe4b6133796f77459f20fe884
Author: markdoliner at pidgin.im
Date: 02/12/12 22:05:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4b5c688e1486f88c95bbe6946367a00b2d1e02dd
Changelog:
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.
Changes against parent f0388e54998489dbe4b6133796f77459f20fe884
patched libpurple/protocols/oscar/peer.c
-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/peer.c dcf11f829d74f5904d72185eb6bcc38a922ad3fb
+++ libpurple/protocols/oscar/peer.c 0e19198622f14fb139bdff8e711d7d931f2e74ca
@@ -708,10 +708,12 @@ peer_connection_establish_listener_cb(in
{
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;
}
More information about the Commits
mailing list