mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk libT) #4556 "Transmission 2.40 fails to connect with UDP trackers on big endian systems" -- fixed.

This commit is contained in:
Jordan Lee 2011-10-14 00:02:36 +00:00
parent 76cf0520ba
commit 9c6e686882
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libtransmission/utils.c
View File

@ -1605,10 +1605,12 @@ tr_htonll( uint64_t x )
#ifdef HAVE_HTONLL
return htonll( x );
#else
/* fallback code by Runner and Juan Carlos Cobas at
* http://www.codeproject.com/KB/cpp/endianness.aspx */
return (((uint64_t)(htonl((int)((x << 32) >> 32))) << 32) |
(unsigned int)htonl(((int)(x >> 32))));
/* fallback code by bdonlan at
* http://stackoverflow.com/questions/809902/64-bit-ntohl-in-c/875505#875505 */
union { uint32_t lx[2]; uint64_t llx; } u;
u.lx[0] = htonl(x >> 32);
u.lx[1] = htonl(x & 0xFFFFFFFFULL);
return u.llx;
#endif
}
@ -1618,10 +1620,11 @@ tr_ntohll( uint64_t x )
#ifdef HAVE_NTOHLL
return ntohll( x );
#else
/* fallback code by Runner and Juan Carlos Cobas at
* http://www.codeproject.com/KB/cpp/endianness.aspx */
return (((uint64_t)(ntohl((int)((x << 32) >> 32))) << 32) |
(unsigned int)ntohl(((int)(x >> 32))));
/* fallback code by bdonlan at
* http://stackoverflow.com/questions/809902/64-bit-ntohl-in-c/875505#875505 */
union { uint32_t lx[2]; uint64_t llx; } u;
u.llx = x;
return ((uint64_t)ntohl(u.lx[0]) << 32) | (uint64_t)ntohl(u.lx[1]);
#endif
}