Changeset 3921 for trunk/libtransmission/peer-msgs.c

Timestamp:

Nov 21, 2007, 8:03:53 PM (15 years ago)

Author:

charles

Message:

some progress on the overall statistics, though probably not visible to end users yet

File:

• trunk/libtransmission/peer-msgs.c (modified) (8 diffs)

trunk/libtransmission/peer-msgs.c

@@ -33 +33 @@
 #include "peer-msgs.h"
 #include "ratecontrol.h"
+#include "stats.h"
 #include "trevent.h"
 #include "utils.h"
@@ -784 +785 @@
 
     /* does the peer prefer encrypted connections? */
-    sub = tr_bencDictFind( &val, "e" );
-    if( tr_bencIsInt( sub ) )
+    if(( sub = tr_bencDictFindType( &val, "e", TYPE_INT )))
         msgs->info->encryption_preference = sub->val.i
                                       ? ENCRYPTION_PREFERENCE_YES
@@ -791 +791 @@
 
     /* check supported messages for utorrent pex */
-    sub = tr_bencDictFind( &val, "m" );
-    if( tr_bencIsDict( sub ) ) {
-        sub = tr_bencDictFind( sub, "ut_pex" );
-        if( tr_bencIsInt( sub ) ) {
+    if(( sub = tr_bencDictFindType( &val, "m", TYPE_DICT ))) {
+        if(( sub = tr_bencDictFindType( sub, "ut_pex", TYPE_INT ))) {
             msgs->peerSupportsPex = 1;
             msgs->ut_pex_id = (uint8_t) sub->val.i;
@@ -802 +800 @@
 
     /* get peer's listening port */
-    sub = tr_bencDictFind( &val, "p" );
-    if( tr_bencIsInt( sub ) ) {
+    if(( sub = tr_bencDictFindType( &val, "p", TYPE_INT ))) {
         msgs->info->port = htons( (uint16_t)sub->val.i );
         dbgmsg( msgs, "msgs->port is now %hu", msgs->info->port );
@@ -824 +821 @@
     tr_peerIoReadBytes( msgs->io, inbuf, tmp, msglen );
 
-    if( tr_bencLoad( tmp, msglen, &val, NULL ) || !tr_bencIsDict( &val ) ) {
+    if( tr_bencLoad( tmp, msglen, &val, NULL ) || ( val.type != TYPE_DICT ) ) {
         dbgmsg( msgs, "GET can't read extended-pex dictionary" );
         tr_free( tmp );
@@ -830 +827 @@
     }
 
-    sub = tr_bencDictFind( &val, "added" );
-    if( tr_bencIsStr(sub) && ((sub->val.s.i % 6) == 0)) {
+    if(( sub = tr_bencDictFindType( &val, "added", TYPE_STR ))) {
         const int n = sub->val.s.i / 6 ;
         dbgmsg( msgs, "got %d peers from uT pex", n );
@@ -1043 +1039 @@
     tr_rcTransferred( tor->download, byteCount );
     tr_rcTransferred( tor->handle->download, byteCount );
-}
-
+    tr_statsAddDownloaded( msgs->handle, byteCount );
+}
 
 static int
@@ -1267 +1263 @@
     tr_rcTransferred( tor->upload, byteCount );
     tr_rcTransferred( tor->handle->upload, byteCount );
+    tr_statsAddUploaded( msgs->handle, byteCount );
 }