Changeset 774 for trunk

Timestamp:

Aug 14, 2006, 10:42:32 PM (16 years ago)

Author:

joshe

Message:

Retrieve peer address as a string via tr_torrentPeers().

Location:

trunk/libtransmission

Files:

• peer.c (modified) (1 diff)
• peer.h (modified) (1 diff)
• transmission.c (modified) (2 diffs)
• transmission.h (modified) (2 diffs)

trunk/libtransmission/peer.c

@@ -307 +307 @@
 
 /***********************************************************************
+ * tr_peerAddress
+ ***********************************************************************
+ * 
+ **********************************************************************/
+struct in_addr * tr_peerAddress( tr_peer_t * peer )
+{
+    return &peer->addr;
+}
+
+/***********************************************************************
  * tr_peerHash
  ***********************************************************************

trunk/libtransmission/peer.h

@@ -53 +53 @@
 void        tr_peerBlame         ( tr_torrent_t *, tr_peer_t *,
                                    int piece, int success );
+struct in_addr * tr_peerAddress  ( tr_peer_t * );
 
 #endif

trunk/libtransmission/transmission.c

@@ -495 +495 @@
     {
         tr_peer_t * peer;
+        struct in_addr * addr;
         int i = 0;
         for( i = 0; i < tor->peerCount; i++ )
@@ -500 +501 @@
             peer = tor->peers[i];
             
+            addr = tr_peerAddress( peer );
+            if( NULL != addr )
+            {
+                inet_ntop( AF_INET, addr, peers[i].addr,
+                           sizeof( peers[i].addr ) );
+            }
             peers[i].client = tr_clientForId(tr_peerId(peer));
             peers[i].isDownloading = tr_peerIsDownloading(peer);

trunk/libtransmission/transmission.h

@@ -45 +45 @@
 #endif
 
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
 #define TR_DEFAULT_PORT   9090
 #define TR_NOERROR        0
@@ -322 +326 @@
 struct tr_peer_stat_s
 {
+    char    addr[INET_ADDRSTRLEN];
     char *  client;