Changeset 9173

Timestamp:

Sep 26, 2009, 3:36:58 AM (13 years ago)

Author:

charles

Message:

(trunk) copy-by-value changes to tr_tracker_stat

Location:

trunk

Files:

• doc/rpc-spec.txt (modified) (1 diff)
• libtransmission/announcer.c (modified) (2 diffs)
• libtransmission/rpcimpl.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)

trunk/doc/rpc-spec.txt

@@ -255 +255 @@
    trackerStats       | array of objects, each containing:   |
                       +-------------------------+------------+
+                      | announce                | string     | tr_tracker_stat
                       | downloadCount           | number     | tr_tracker_stat
                       | hasAnnounced            | boolean    | tr_tracker_stat

trunk/libtransmission/announcer.c

@@ -1644 +1644 @@
             tr_tracker_stat * st = ret + out++;
 
-            st->host = tr_strdup( tracker->host->name );
+            tr_strlcpy( st->host, tracker->host->name, sizeof( st->host ) );
+            tr_strlcpy( st->announce, tracker->announce, sizeof( st->announce ) );
             st->tier = i + 1;
             st->isActive = tracker == tier->currentTracker;
@@ -1680 +1681 @@
 void
 tr_announcerStatsFree( tr_tracker_stat * trackers,
-                       int               trackerCount )
-{
-    int i;
-    for( i=0; i<trackerCount; ++i )
-        tr_free( trackers[i].host );
+                       int trackerCount UNUSED )
+{
     tr_free( trackers );
 }

trunk/libtransmission/rpcimpl.c

@@ -375 +375 @@
     {
         const tr_tracker_stat * s = &st[i];
-        tr_benc * d = tr_bencListAddDict( list, 23 );
+        tr_benc * d = tr_bencListAddDict( list, 24 );
+        tr_bencDictAddStr ( d, "announce", s->announce );
         tr_bencDictAddInt ( d, "downloadCount", s->downloadCount );
         tr_bencDictAddBool( d, "hasAnnounced", s->hasAnnounced );
@@ -654 +655 @@
         addInfo( torrents[i], tr_bencListAdd( list ), fields );
 
-fprintf( stderr, "%s\n", tr_bencToStr( args_out, TR_FMT_JSON, NULL ) );
-
     tr_free( torrents );
     return msg;

trunk/libtransmission/transmission.h

@@ -1243 +1243 @@
 
     /* ex: legaltorrents.com */
-    char * host;
+    char host[1024];
+
+    /* the full announce URL */
+    char announce[1024];
 
     /* true if we're trying to use this tracker.