(trunk libT) API cleanup of the tr_address functions to make them more consistent.

This is loosely related to #2910, but only in the sense of laying the groundwork for #2910's fix...

diff --git a/libtransmission/announcer-http.c b/libtransmission/announcer-http.c
index 9bf263cd287bbc7f4198fcf5f8895f427fdcec5e..71cd1611af332b797b1b6f8d9ad6bb6e2ac55889 100644 (file)
--- a/libtransmission/announcer-http.c
+++ b/libtransmission/announcer-http.c
@@ -138,13 +138,13 @@ listToPex( tr_benc * peerList, size_t * setme_len )
             continue;
         if( !tr_bencDictFindStr( peer, "ip", &ip ) )
             continue;
-        if( tr_pton( ip, &addr ) == NULL )
+        if( !tr_address_from_string( &addr, ip ) )
             continue;
         if( !tr_bencDictFindInt( peer, "port", &port ) )
             continue;
         if( ( port < 0 ) || ( port > USHRT_MAX ) )
             continue;
-        if( !tr_isValidPeerAddress( &addr, port ) )
+        if( !tr_address_is_valid_for_peers( &addr, port ) )
             continue;
 
         pex[n].addr = addr;

diff --git a/libtransmission/blocklist-test.c b/libtransmission/blocklist-test.c
index fa6e656cb8d66a7c1c6e35bf54ff4558c776c84f..ce859c1faf68e6dee366a454e57eb137162e4cc2 100644 (file)
--- a/libtransmission/blocklist-test.c
+++ b/libtransmission/blocklist-test.c
@@ -68,31 +68,31 @@ main( void )
     _tr_blocklistSetContent( b, tmpfile_txt );
 
     /* now run some tests */
-    check( tr_pton( "216.16.1.143", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.143" ) );
     check( !_tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.144", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.144" ) );
     check( _tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.145", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.145" ) );
     check( _tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.146", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.146" ) );
     check( _tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.147", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.147" ) );
     check( _tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.148", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.148" ) );
     check( _tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.149", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.149" ) );
     check( _tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.150", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.150" ) );
     check( _tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.151", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.151" ) );
     check( _tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.152", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.152" ) );
     check( !_tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "216.16.1.153", &addr ) );
+    check( tr_address_from_string( &addr, "216.16.1.153" ) );
     check( !_tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "217.0.0.1", &addr ) );
+    check( tr_address_from_string( &addr, "217.0.0.1" ) );
     check( !_tr_blocklistHasAddress( b, &addr ) );
-    check( tr_pton( "255.0.0.1", &addr ) );
+    check( tr_address_from_string( &addr, "255.0.0.1" ) );
 
     /* cleanup */
     _tr_blocklistFree( b );

diff --git a/libtransmission/blocklist.c b/libtransmission/blocklist.c
index c067191f816926aaf1f6053193fd5d7a8e9fce1a..0a75228871e445a9c20aebee97bd9d478eede6f5 100644 (file)
--- a/libtransmission/blocklist.c
+++ b/libtransmission/blocklist.c
@@ -197,20 +197,18 @@ _tr_blocklistIsEnabled( tr_blocklist * b )
 }
 
 void
-_tr_blocklistSetEnabled( tr_blocklist * b,
-                         int            isEnabled )
+_tr_blocklistSetEnabled( tr_blocklist * b, bool isEnabled )
 {
     b->isEnabled = isEnabled ? 1 : 0;
 }
 
 int
-_tr_blocklistHasAddress( tr_blocklist     * b,
-                         const tr_address * addr )
+_tr_blocklistHasAddress( tr_blocklist * b, const tr_address * addr )
 {
     uint32_t                     needle;
     const struct tr_ipv4_range * range;
 
-    assert( tr_isAddress( addr ) );
+    assert( tr_address_is_valid( addr ) );
 
     if( !b->isEnabled || addr->type == TR_AF_INET6 )
         return 0;
@@ -256,12 +254,12 @@ parseLine1( const char * line, struct tr_ipv4_range * range )
         return false;
 
     tr_snprintf( str, sizeof( str ), "%d.%d.%d.%d", b[0], b[1], b[2], b[3] );
-    if( tr_pton( str, &addr ) == NULL )
+    if( !tr_address_from_string( &addr, str ) )
         return false;
     range->begin = ntohl( addr.addr.addr4.s_addr );
 
     tr_snprintf( str, sizeof( str ), "%d.%d.%d.%d", e[0], e[1], e[2], e[3] );
-    if( tr_pton( str, &addr ) == NULL )
+    if( !tr_address_from_string( &addr, str ) )
         return false;
     range->end = ntohl( addr.addr.addr4.s_addr );
 
@@ -288,12 +286,12 @@ parseLine2( const char * line, struct tr_ipv4_range * range )
         return false;
 
     tr_snprintf( str, sizeof(str), "%d.%d.%d.%d", a[0], a[1], a[2], a[3] );
-    if( tr_pton( str, &addr ) == NULL )
+    if( !tr_address_from_string( &addr, str ) )
         return false;
     range->begin = ntohl( addr.addr.addr4.s_addr );
 
     tr_snprintf( str, sizeof(str), "%d.%d.%d.%d", b[0], b[1], b[2], b[3] );
-    if( tr_pton( str, &addr ) == NULL )
+    if( !tr_address_from_string( &addr, str ) )
         return false;
     range->end = ntohl( addr.addr.addr4.s_addr );
 

diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h
index b19d5ac16661dec4ce28d47c41191c49b03778c5..467cff2a8962bffdd920d9983af515f4ecc3ad92 100644 (file)
--- a/libtransmission/blocklist.h
+++ b/libtransmission/blocklist.h
@@ -34,7 +34,7 @@ void          _tr_blocklistFree        ( tr_blocklist * );
 int           _tr_blocklistIsEnabled   ( tr_blocklist            * b );
 
 void          _tr_blocklistSetEnabled  ( tr_blocklist            * b,
-                                         int                       isEnabled );
+                                         bool                      isEnabled );
 
 int           _tr_blocklistHasAddress  ( tr_blocklist            * b,
                                          const struct tr_address * addr );

diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index 39bb2958d796f8a394acd990f989512c9ab0415b..810a7c8145a1853e9d5b211b218f93d76ccf50b5 100644 (file)
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -670,7 +670,8 @@ tr_fdSocketAccept( tr_session * s, int sockfd, tr_address * addr, tr_port * port
 
     if( fd >= 0 )
     {
-        if( ( gFd->socket_count < gFd->socket_limit ) && tr_ssToAddr( addr, port, &sock ) )
+        if( ( gFd->socket_count < gFd->socket_limit )
+            && tr_address_from_sockaddr_storage( addr, port, &sock ) )
         {
             ++gFd->socket_count;
         }

diff --git a/libtransmission/net.c b/libtransmission/net.c
index 4b30a8c4331cf05f82f3b5498239d8a880812468..4fd30a73dc77231e00d4567a214cd71b77024346 100644 (file)
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -81,47 +81,42 @@ tr_net_strerror( char * buf, size_t buflen, int err )
 }
 
 const char *
-tr_ntop( const tr_address * src, char * dst, int size )
+tr_address_to_string_with_buf( const tr_address * addr, char * buf, size_t buflen )
 {
-    assert( tr_isAddress( src ) );
+    assert( tr_address_is_valid( addr ) );
 
-    if( src->type == TR_AF_INET )
-        return evutil_inet_ntop( AF_INET, &src->addr, dst, size );
+    if( addr->type == TR_AF_INET )
+        return evutil_inet_ntop( AF_INET, &addr->addr, buf, buflen );
     else
-        return evutil_inet_ntop( AF_INET6, &src->addr, dst, size );
+        return evutil_inet_ntop( AF_INET6, &addr->addr, buf, buflen );
 }
 
 /*
- * Non-threadsafe version of tr_ntop, which uses a static memory area for a buffer.
+ * Non-threadsafe version of tr_address_to_string_with_buf()
+ * and uses a static memory area for a buffer.
  * This function is suitable to be called from libTransmission's networking code,
  * which is single-threaded.
  */
 const char *
-tr_ntop_non_ts( const tr_address * src )
+tr_address_to_string( const tr_address * addr )
 {
     static char buf[INET6_ADDRSTRLEN];
-    return tr_ntop( src, buf, sizeof( buf ) );
+    return tr_address_to_string_with_buf( addr, buf, sizeof( buf ) );
 }
 
-tr_address *
-tr_pton( const char * src, tr_address * dst )
+bool
+tr_address_from_string( tr_address * dst, const char * src )
 {
-    int retval = evutil_inet_pton( AF_INET, src, &dst->addr );
-    assert( dst );
-    if( retval < 0 )
-        return NULL;
-    else if( retval == 0 )
-        retval = evutil_inet_pton( AF_INET6, src, &dst->addr );
-    else
-    {
+    bool ok;
+
+    if(( ok = evutil_inet_pton( AF_INET, src, &dst->addr ) == 1 ))
         dst->type = TR_AF_INET;
-        return dst;
-    }
 
-    if( retval < 1 )
-        return NULL;
-    dst->type = TR_AF_INET6;
-    return dst;
+    if( !ok ) /* try IPv6 */
+        if(( ok = evutil_inet_pton( AF_INET6, src, &dst->addr ) == 1 ))
+            dst->type = TR_AF_INET6;
+
+    return ok;
 }
 
 /*
@@ -132,7 +127,7 @@ tr_pton( const char * src, tr_address * dst )
  * 0  if a == b
  */
 int
-tr_compareAddresses( const tr_address * a, const tr_address * b)
+tr_address_compare( const tr_address * a, const tr_address * b)
 {
     static const int sizes[2] = { sizeof(struct in_addr), sizeof(struct in6_addr) };
 
@@ -170,9 +165,9 @@ tr_netSetCongestionControl( int s UNUSED, const char *algorithm UNUSED )
 }
 
 bool
-tr_ssToAddr( tr_address * setme_addr,
-             tr_port    * setme_port,
-             const struct sockaddr_storage * from )
+tr_address_from_sockaddr_storage( tr_address                     * setme_addr,
+                                  tr_port                        * setme_port,
+                                  const struct sockaddr_storage  * from )
 {
     if( from->ss_family == AF_INET )
     {
@@ -200,7 +195,7 @@ setup_sockaddr( const tr_address        * addr,
                 tr_port                   port,
                 struct sockaddr_storage * sockaddr)
 {
-    assert( tr_isAddress( addr ) );
+    assert( tr_address_is_valid( addr ) );
 
     if( addr->type == TR_AF_INET )
     {
@@ -239,9 +234,9 @@ tr_netOpenPeerSocket( tr_session        * session,
     socklen_t               sourcelen;
     struct sockaddr_storage source_sock;
 
-    assert( tr_isAddress( addr ) );
+    assert( tr_address_is_valid( addr ) );
 
-    if( !tr_isValidPeerAddress( addr, port ) )
+    if( !tr_address_is_valid_for_peers( addr, port ) )
         return -EINVAL;
 
     s = tr_fdSocketCreate( session, domains[addr->type], SOCK_STREAM );
@@ -269,7 +264,7 @@ tr_netOpenPeerSocket( tr_session        * session,
     if( bind( s, ( struct sockaddr * ) &source_sock, sourcelen ) )
     {
         tr_err( _( "Couldn't set source address %s on %d: %s" ),
-                tr_ntop_non_ts( source_addr ), s, tr_strerror( errno ) );
+                tr_address_to_string( source_addr ), s, tr_strerror( errno ) );
         return -errno;
     }
 
@@ -285,7 +280,7 @@ tr_netOpenPeerSocket( tr_session        * session,
         if( ( tmperrno != ENETUNREACH && tmperrno != EHOSTUNREACH )
                 || addr->type == TR_AF_INET )
             tr_err( _( "Couldn't connect socket %d to %s, port %d (errno %d - %s)" ),
-                    s, tr_ntop_non_ts( addr ), (int)ntohs( port ), tmperrno,
+                    s, tr_address_to_string( addr ), (int)ntohs( port ), tmperrno,
                     tr_strerror( tmperrno ) );
         tr_netClose( session, s );
         s = -tmperrno;
@@ -320,7 +315,7 @@ tr_netBindTCPImpl( const tr_address * addr, tr_port port, bool suppressMsgs, int
     int addrlen;
     int optval;
 
-    assert( tr_isAddress( addr ) );
+    assert( tr_address_is_valid( addr ) );
 
     fd = socket( domains[addr->type], SOCK_STREAM, 0 );
     if( fd < 0 ) {
@@ -365,7 +360,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_ntop_non_ts( addr ), tr_strerror( err ), hint );
+            tr_err( fmt, port, tr_address_to_string( addr ), tr_strerror( err ), hint );
         }
         tr_netCloseSocket( fd );
         *errOut = err;
@@ -373,7 +368,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_ntop_non_ts( addr ) );
+        tr_dbg( "Bound socket %d to port %d on %s", fd, port, tr_address_to_string( addr ) );
 
     if( listen( fd, 128 ) == -1 ) {
         *errOut = sockerrno;
@@ -612,7 +607,7 @@ isMartianAddr( const struct tr_address * a )
     static const unsigned char zeroes[16] =
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-    assert( tr_isAddress( a ) );
+    assert( tr_address_is_valid( a ) );
 
     switch( a->type )
     {
@@ -644,10 +639,10 @@ isMartianAddr( const struct tr_address * a )
 }
 
 bool
-tr_isValidPeerAddress( const tr_address * addr, tr_port port )
+tr_address_is_valid_for_peers( const tr_address * addr, tr_port port )
 {
     return ( port != 0 )
-        && ( tr_isAddress( addr ) )
+        && ( tr_address_is_valid( addr ) )
         && ( !isIPv6LinkLocalAddress( addr ) )
         && ( !isIPv4MappedAddress( addr ) )
         && ( !isMartianAddr( addr ) );

diff --git a/libtransmission/net.h b/libtransmission/net.h
index 639dff1f8580c0f01b238fc4f41d56167e182119..09e10952ae412d8f90ddf4525d47baf873320d8c 100644 (file)
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -53,7 +53,11 @@
  #define sockerrno errno
 #endif
 
-struct tr_session;
+/****
+*****
+*****  tr_address
+*****
+****/
 
 typedef enum tr_address_type
 {
@@ -77,28 +81,37 @@ typedef struct tr_address
 extern const tr_address tr_inaddr_any;
 extern const tr_address tr_in6addr_any;
 
-bool tr_ssToAddr( tr_address * setme_addr,
-                  tr_port    * setme_port,
-                  const struct sockaddr_storage * from );
+const char* tr_address_to_string( const tr_address * addr );
 
-const char *tr_ntop( const tr_address * src,
-                     char * dst,
-                     int size );
-const char *tr_ntop_non_ts( const tr_address * src );
-tr_address *tr_pton( const char * src,
-                     tr_address * dst );
-int tr_compareAddresses( const tr_address * a,
-                         const tr_address * b);
+const char* tr_address_to_string_with_buf( const tr_address  * addr,
+                                           char              * buf,
+                                           size_t              buflen );
 
-bool tr_isValidPeerAddress( const tr_address * addr, tr_port port );
+bool tr_address_from_string ( tr_address  * setme,
+                              const char  * string );
 
-static inline bool tr_isAddress( const tr_address * a ) { return ( a != NULL ) && ( a->type==TR_AF_INET || a->type==TR_AF_INET6 ); }
+bool tr_address_from_sockaddr_storage( tr_address                     * setme,
+                                       tr_port                        * port,
+                                       const struct sockaddr_storage  * src );
 
-bool tr_net_hasIPv6( tr_port );
+int tr_address_compare( const tr_address * a,
+                        const tr_address * b );
+
+bool tr_address_is_valid_for_peers( const tr_address  * addr,
+                                    tr_port             port );
+
+static inline bool
+tr_address_is_valid( const tr_address * a )
+{
+    return ( a != NULL ) && ( a->type==TR_AF_INET || a->type==TR_AF_INET6 );
+}
 
 /***********************************************************************
  * Sockets
  **********************************************************************/
+
+struct tr_session;
+
 int  tr_netOpenPeerSocket( tr_session       * session,
                            const tr_address * addr,
                            tr_port            port,
@@ -130,6 +143,8 @@ void tr_netCloseSocket( int fd );
 
 void tr_netInit( void );
 
+bool tr_net_hasIPv6( tr_port );
+
 
 /**
  * @brief get a human-representable string representing the network error.

diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index dd32ea81d71feedff87bef720e7d39a396aaf99e..bf6eff9d9260f27d30f4b1a99d5642f30fb31fd4 100644 (file)
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -591,7 +591,7 @@ tr_peerIoNewIncoming( tr_session        * session,
                       struct UTPSocket  * utp_socket )
 {
     assert( session );
-    assert( tr_isAddress( addr ) );
+    assert( tr_address_is_valid( addr ) );
 
     return tr_peerIoNew( session, parent, addr, port, NULL, true, false,
                          fd, utp_socket );
@@ -610,7 +610,7 @@ tr_peerIoNewOutgoing( tr_session        * session,
     struct UTPSocket *utp_socket = NULL;
 
     assert( session );
-    assert( tr_isAddress( addr ) );
+    assert( tr_address_is_valid( addr ) );
     assert( torrentHash );
 
     if( utp )
@@ -805,11 +805,7 @@ const char*
 tr_peerIoAddrStr( const tr_address * addr, tr_port port )
 {
     static char buf[512];
-
-    if( addr->type == TR_AF_INET )
-        tr_snprintf( buf, sizeof( buf ), "%s:%u", tr_ntop_non_ts( addr ), ntohs( port ) );
-    else
-        tr_snprintf( buf, sizeof( buf ), "[%s]:%u", tr_ntop_non_ts( addr ), ntohs( port ) );
+    tr_snprintf( buf, sizeof( buf ), "[%s]:%u", tr_address_to_string( addr ), ntohs( port ) );
     return buf;
 }
 

diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h
index f444f1763f37485a97fd0be1fd7987312024f7c2..8645c1fd814a81a7a980d5171f68c168fbddb6f6 100644 (file)
--- a/libtransmission/peer-io.h
+++ b/libtransmission/peer-io.h
@@ -150,7 +150,7 @@ tr_isPeerIo( const tr_peerIo * io )
         && ( io->magicNumber == PEER_IO_MAGIC_NUMBER )
         && ( io->refCount >= 0 )
         && ( tr_isBandwidth( &io->bandwidth ) )
-        && ( tr_isAddress( &io->addr ) );
+        && ( tr_address_is_valid( &io->addr ) );
 }
 
 /**

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index dd42a2545ad0a128a0424757f823d21018ba490d..ef857817e0e674fea106399081f8f6ef8e6ae556 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -147,7 +147,7 @@ tr_isAtom( const struct peer_atom * atom )
     return ( atom != NULL )
         && ( atom->fromFirst < TR_PEER_FROM__MAX )
         && ( atom->fromBest < TR_PEER_FROM__MAX )
-        && ( tr_isAddress( &atom->addr ) );
+        && ( tr_address_is_valid( &atom->addr ) );
 }
 #endif
 
@@ -287,7 +287,7 @@ handshakeCompareToAddr( const void * va, const void * vb )
 {
     const tr_handshake * a = va;
 
-    return tr_compareAddresses( tr_handshakeGetAddr( a, NULL ), vb );
+    return tr_address_compare( tr_handshakeGetAddr( a, NULL ), vb );
 }
 
 static int
@@ -310,7 +310,7 @@ comparePeerAtomToAddress( const void * va, const void * vb )
 {
     const struct peer_atom * a = va;
 
-    return tr_compareAddresses( &a->addr, vb );
+    return tr_address_compare( &a->addr, vb );
 }
 
 static int
@@ -345,7 +345,7 @@ getExistingTorrent( tr_peerMgr *    manager,
 static int
 peerCompare( const void * a, const void * b )
 {
-    return tr_compareAddresses( tr_peerAddress( a ), tr_peerAddress( b ) );
+    return tr_address_compare( tr_peerAddress( a ), tr_peerAddress( b ) );
 }
 
 static struct peer_atom*
@@ -1870,7 +1870,7 @@ ensureAtomExists( Torrent           * t,
 {
     struct peer_atom * a;
 
-    assert( tr_isAddress( addr ) );
+    assert( tr_address_is_valid( addr ) );
     assert( from < TR_PEER_FROM__MAX );
 
     a = getExistingAtom( t, addr );
@@ -2056,7 +2056,7 @@ tr_peerMgrAddIncoming( tr_peerMgr * manager,
 
     if( tr_sessionIsAddressBlocked( session, addr ) )
     {
-        tr_dbg( "Banned IP address \"%s\" tried to connect to us", tr_ntop_non_ts( addr ) );
+        tr_dbg( "Banned IP address \"%s\" tried to connect to us", tr_address_to_string( addr ) );
         if(socket >= 0)
             tr_netClose( session, socket );
         else
@@ -2100,7 +2100,7 @@ tr_peerMgrAddPex( tr_torrent * tor, uint8_t from,
         managerLock( t->manager );
 
         if( !tr_sessionIsAddressBlocked( t->manager->session, &pex->addr ) )
-            if( tr_isValidPeerAddress( &pex->addr, pex->port ) )
+            if( tr_address_is_valid_for_peers( &pex->addr, pex->port ) )
                 ensureAtomExists( t, &pex->addr, pex->port, pex->flags, seedProbability, from );
 
         managerUnlock( t->manager );
@@ -2233,7 +2233,7 @@ tr_pexCompare( const void * va, const void * vb )
     assert( tr_isPex( a ) );
     assert( tr_isPex( b ) );
 
-    if(( i = tr_compareAddresses( &a->addr, &b->addr )))
+    if(( i = tr_address_compare( &a->addr, &b->addr )))
         return i;
 
     if( a->port != b->port )
@@ -2333,7 +2333,7 @@ tr_peerMgrGetPeers( tr_torrent   * tor,
         const struct peer_atom * atom = atoms[i];
         if( atom->addr.type == af )
         {
-            assert( tr_isAddress( &atom->addr ) );
+            assert( tr_address_is_valid( &atom->addr ) );
             walk->addr = atom->addr;
             walk->port = atom->port;
             walk->flags = atom->flags;
@@ -2659,7 +2659,7 @@ tr_peerMgrPeerStats( const tr_torrent * tor, int * setmeCount )
         const struct peer_atom * atom = peer->atom;
         tr_peer_stat *           stat = ret + i;
 
-        tr_ntop( &atom->addr, stat->addr, sizeof( stat->addr ) );
+        tr_address_to_string_with_buf( &atom->addr, stat->addr, sizeof( stat->addr ) );
         tr_strlcpy( stat->client, ( peer->client ? peer->client : "" ),
                    sizeof( stat->client ) );
         stat->port                = ntohs( peer->atom->port );
@@ -3535,7 +3535,7 @@ compareAtomPtrsByAddress( const void * va, const void *vb )
     assert( tr_isAtom( a ) );
     assert( tr_isAtom( b ) );
 
-    return tr_compareAddresses( &a->addr, &b->addr );
+    return tr_address_compare( &a->addr, &b->addr );
 }
 
 /* best come first, worst go last */

diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index ae1028b76223de6b97e17128dbfe18daa83d7c03..910487665e2bb76fbe634bc37daa1a6b1360adce 100644 (file)
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -139,7 +139,7 @@ void tr_peerDestruct( tr_torrent * tor, struct tr_peer * peer );
 static inline bool
 tr_isPex( const tr_pex * pex )
 {
-    return pex && tr_isAddress( &pex->addr );
+    return pex && tr_address_is_valid( &pex->addr );
 }
 
 const tr_address * tr_peerAddress( const tr_peer * );

diff --git a/libtransmission/peer-msgs-test.c b/libtransmission/peer-msgs-test.c
index 0367ad37c4e67f8da78de0bcbfbeec75e9cf894b..500b1569c1b78c23c3c9ed25152c19f7f3e823db 100644 (file)
--- a/libtransmission/peer-msgs-test.c
+++ b/libtransmission/peer-msgs-test.c
@@ -44,7 +44,7 @@ main( void )
 
     for( i = 0; i < SHA_DIGEST_LENGTH; ++i )
         infohash[i] = 0xaa;
-    tr_pton( "80.4.4.200", &addr );
+    tr_address_from_string( &addr, "80.4.4.200" );
 
     numwant = 7;
     numgot = tr_generateAllowedSet( buf, numwant, pieceCount, infohash, &addr );

diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
index ecb660bb13ef14058c718484d64d9e6d09ab06b3..b25ec5aa59ce50d98fe6ef943ccf0d511906e7e0 100644 (file)
--- a/libtransmission/rpc-server.c
+++ b/libtransmission/rpc-server.c
@@ -689,7 +689,7 @@ startServer( void * vserver )
         addr.type = TR_AF_INET;
         addr.addr.addr4 = server->bindAddress;
         server->httpd = evhttp_new( server->session->event_base );
-        evhttp_bind_socket( server->httpd, tr_ntop_non_ts( &addr ), server->port );
+        evhttp_bind_socket( server->httpd, tr_address_to_string( &addr ), server->port );
         evhttp_set_gencb( server->httpd, handle_request, server );
 
     }
@@ -886,7 +886,7 @@ tr_rpcGetBindAddress( const tr_rpc_server * server )
     tr_address addr;
     addr.type = TR_AF_INET;
     addr.addr.addr4 = server->bindAddress;
-    return tr_ntop_non_ts( &addr );
+    return tr_address_to_string( &addr );
 }
 
 /****
@@ -968,7 +968,7 @@ tr_rpcInit( tr_session  * session, tr_benc * settings )
 
     found = tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_BIND_ADDRESS, &str );
     assert( found );
-    if( tr_pton( str, &address ) == NULL ) {
+    if( !tr_address_from_string( &address, str ) ) {
         tr_err( _( "%s is not a valid address" ), str );
         address = tr_inaddr_any;
     } else if( address.type != TR_AF_INET ) {

diff --git a/libtransmission/session.c b/libtransmission/session.c
index e5710be795d7d436912438f231db25b0f0faf9bb..3bf9d4180ad5f6740eed8a1680bb27adedd65685 100644 (file)
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -237,7 +237,7 @@ tr_sessionGetPublicAddress( const tr_session * session, int tr_af_type, bool * i
     }
 
     if( is_default_value && bindinfo )
-        *is_default_value = !tr_strcmp0( default_value, tr_ntop_non_ts( &bindinfo->addr ) );
+        *is_default_value = !tr_strcmp0( default_value, tr_address_to_string( &bindinfo->addr ) );
 
     return bindinfo ? &bindinfo->addr : NULL;
 }
@@ -421,8 +421,8 @@ tr_sessionGetSettings( tr_session * s, struct tr_benc * d )
     tr_bencDictAddBool( d, TR_PREFS_KEY_USPEED_ENABLED,           tr_sessionIsSpeedLimited( s, TR_UP ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_UMASK,                    s->umask );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_UPLOAD_SLOTS_PER_TORRENT, s->uploadSlotsPerTorrent );
-    tr_bencDictAddStr ( d, TR_PREFS_KEY_BIND_ADDRESS_IPV4,        tr_ntop_non_ts( &s->public_ipv4->addr ) );
-    tr_bencDictAddStr ( d, TR_PREFS_KEY_BIND_ADDRESS_IPV6,        tr_ntop_non_ts( &s->public_ipv6->addr ) );
+    tr_bencDictAddStr ( d, TR_PREFS_KEY_BIND_ADDRESS_IPV4,        tr_address_to_string( &s->public_ipv4->addr ) );
+    tr_bencDictAddStr ( d, TR_PREFS_KEY_BIND_ADDRESS_IPV6,        tr_address_to_string( &s->public_ipv6->addr ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_START,                    !tr_sessionGetPaused( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_TRASH_ORIGINAL,           tr_sessionGetDeleteSource( s ) );
 }
@@ -805,14 +805,14 @@ sessionSetImpl( void * vdata )
 
     str = TR_PREFS_KEY_BIND_ADDRESS_IPV4;
     tr_bencDictFindStr( settings, TR_PREFS_KEY_BIND_ADDRESS_IPV4, &str );
-    if( !tr_pton( str, &b.addr ) || ( b.addr.type != TR_AF_INET ) )
+    if( !tr_address_from_string( &b.addr, str ) || ( b.addr.type != TR_AF_INET ) )
         b.addr = tr_inaddr_any;
     b.socket = -1;
     session->public_ipv4 = tr_memdup( &b, sizeof( struct tr_bindinfo ) );
 
     str = TR_PREFS_KEY_BIND_ADDRESS_IPV6;
     tr_bencDictFindStr( settings, TR_PREFS_KEY_BIND_ADDRESS_IPV6, &str );
-    if( !tr_pton( str, &b.addr ) || ( b.addr.type != TR_AF_INET6 ) )
+    if( !tr_address_from_string( &b.addr, str ) || ( b.addr.type != TR_AF_INET6 ) )
         b.addr = tr_in6addr_any;
     b.socket = -1;
     session->public_ipv6 = tr_memdup( &b, sizeof( struct tr_bindinfo ) );

diff --git a/libtransmission/tr-lpd.c b/libtransmission/tr-lpd.c
index 8631f108abf4fab8280ba1836b4be3b62b50146e..361e4a43fb796dffc428fc3543b5b81735136273 100644 (file)
--- a/libtransmission/tr-lpd.c
+++ b/libtransmission/tr-lpd.c
@@ -532,7 +532,7 @@ static int tr_lpdConsiderAnnounce( tr_pex* peer, const char* const msg )
             /* we found a suitable peer, add it to the torrent */
             tr_peerMgrAddPex( tor, TR_PEER_FROM_LPD, peer, -1 );
             tr_tordbg( tor, "Learned %d local peer from LPD (%s:%u)",
-                1, tr_ntop_non_ts( &peer->addr ), peerPort );
+                1, tr_address_to_string( &peer->addr ), peerPort );
 
             /* periodic reconnectPulse() deals with the rest... */
 

diff --git a/libtransmission/tr-utp.c b/libtransmission/tr-utp.c
index 5b65c75ddc915ee71b46f4455bee582af1f76ebb..2d78e67bf242e9051147195aa84ef6d9a770cb9b 100644 (file)
--- a/libtransmission/tr-utp.c
+++ b/libtransmission/tr-utp.c
@@ -113,7 +113,7 @@ incoming(void *closure, struct UTPSocket *s)
     }
 
     UTP_GetPeerName(s, from, &fromlen);
-    if( !tr_ssToAddr( &addr, &port, &from_storage ) )
+    if( !tr_address_from_sockaddr_storage( &addr, &port, &from_storage ) )
     {
         tr_nerr("UTP", "Unknown socket family");
         UTP_Close(s);

diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index 5a3a0862bf15d7504698614fdb4673fc281bf0ae..b56c22bf551889187967eddca269834da3cf6efb 100644 (file)
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -998,10 +998,10 @@ tr_urlIsValid( const char * url, int url_len )
 }
 
 bool
-tr_addressIsIP( const char * address )
+tr_addressIsIP( const char * str )
 {
-    tr_address tempAddr;
-    return tr_pton(address, &tempAddr) != NULL;
+    tr_address tmp;
+    return tr_address_from_string( &tmp, str );
 }
 
 int

diff --git a/libtransmission/web.c b/libtransmission/web.c
index 75860a7b507e1dbfe48d01314e3b8128c5e67756..5aaabaae63fe073467b7aa68f6a8ccf2d28b8f7b 100644 (file)
--- a/libtransmission/web.c
+++ b/libtransmission/web.c
@@ -181,9 +181,9 @@ createEasy( tr_session * s, struct tr_web_task * task )
     curl_easy_setopt( e, CURLOPT_WRITEFUNCTION, writeFunc );
 
     if((( addr = tr_sessionGetPublicAddress( s, TR_AF_INET, &is_default_value ))) && !is_default_value )
-        curl_easy_setopt( e, CURLOPT_INTERFACE, tr_ntop_non_ts( addr ) );
+        curl_easy_setopt( e, CURLOPT_INTERFACE, tr_address_to_string( addr ) );
     else if ((( addr = tr_sessionGetPublicAddress( s, TR_AF_INET6, &is_default_value ))) && !is_default_value )
-        curl_easy_setopt( e, CURLOPT_INTERFACE, tr_ntop_non_ts( addr ) );
+        curl_easy_setopt( e, CURLOPT_INTERFACE, tr_address_to_string( addr ) );
 
     if( task->cookies != NULL )
         curl_easy_setopt( e, CURLOPT_COOKIE, task->cookies );