Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-25 04:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

make all the log functions/structs/enums use a single 'tr_log' namespace, such as tr_logGetQueue, tr_logAddInfo, tr_logIsLevelActive

Browse Source
This commit is contained in:
Jordan Lee
2013-01-25 23:34:20 +00:00
parent 5af4abfc82
commit f75027d5e9
56 changed files with 888 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libtransmission/net.c
View File

@@ -46,7 +46,8 @@
#include "peer-io.h" /* tr_peerIoAddrStr () FIXME this should be moved to net.h */
#include "session.h" /* tr_sessionGetPublicAddress () */
#include "tr-utp.h" /* tr_utpSendTo () */
#include "utils.h" /* tr_time (), tr_dbg () */
#include "log.h"
#include "utils.h" /* tr_time (), tr_logAddDebug () */
#ifndef IN_MULTICAST
#define IN_MULTICAST(a) (((a) & 0xf0000000) == 0xe0000000)
@@ -249,7 +250,7 @@ tr_netOpenPeerSocket (tr_session * session,
if (clientIsSeed) {
int n = 8192;
if (setsockopt (s, SOL_SOCKET, SO_RCVBUF, &n, sizeof (n)))
tr_inf ("Unable to set SO_RCVBUF on socket %d: %s", s, tr_strerror (sockerrno));
tr_logAddInfo ("Unable to set SO_RCVBUF on socket %d: %s", s, tr_strerror (sockerrno));
}
if (evutil_make_socket_nonblocking (s) < 0) {
@@ -265,7 +266,7 @@ tr_netOpenPeerSocket (tr_session * session,
sourcelen = setup_sockaddr (source_addr, 0, &source_sock);
if (bind (s, (struct sockaddr *) &source_sock, sourcelen))
{
tr_err (_("Couldn't set source address %s on %d: %s"),
tr_logAddError (_("Couldn't set source address %s on %d: %s"),
tr_address_to_string (source_addr), s, tr_strerror (errno));
return -errno;
}
@@ -281,15 +282,15 @@ tr_netOpenPeerSocket (tr_session * session,
tmperrno = sockerrno;
if ((tmperrno != ENETUNREACH && tmperrno != EHOSTUNREACH)
|| addr->type == TR_AF_INET)
tr_err (_("Couldn't connect socket %d to %s, port %d (errno %d - %s)"),
tr_logAddError (_("Couldn't connect socket %d to %s, port %d (errno %d - %s)"),
s, tr_address_to_string (addr), (int)ntohs (port), tmperrno,
tr_strerror (tmperrno));
tr_netClose (session, s);
s = -tmperrno;
}
tr_deepLog (__FILE__, __LINE__, NULL, "New OUTGOING connection %d (%s)",
s, tr_peerIoAddrStr (addr, port));
tr_logAddDeep (__FILE__, __LINE__, NULL, "New OUTGOING connection %d (%s)",
s, tr_peerIoAddrStr (addr, port));
return s;
}
@@ -366,7 +367,7 @@ tr_netBindTCPImpl (const tr_address * addr, tr_port port, bool suppressMsgs, int
else
fmt = _("Couldn't bind port %d on %s: %s (%s)");
tr_err (fmt, port, tr_address_to_string (addr), tr_strerror (err), hint);
tr_logAddError (fmt, port, tr_address_to_string (addr), tr_strerror (err), hint);
}
tr_netCloseSocket (fd);
*errOut = err;
@@ -374,7 +375,7 @@ tr_netBindTCPImpl (const tr_address * addr, tr_port port, bool suppressMsgs, int
}
if (!suppressMsgs)
tr_dbg ("Bound socket %d to port %d on %s", fd, port, tr_address_to_string (addr));
tr_logAddDebug ("Bound socket %d to port %d on %s", fd, port, tr_address_to_string (addr));
if (listen (fd, 128) == -1) {
*errOut = sockerrno;