Changeset 84

Timestamp:

Feb 4, 2006, 7:27:48 AM (16 years ago)

Author:

joshe

Message:

Add a branch with some simple tracker http parsing code.
Also, treat a dictionary-less response to a stop request as valid
as long as the HTTP headers are valid.

Location:

branches/simple_http_parsing

Files:

• . (copied) (copied from trunk)
• libtransmission/tracker.c (modified) (4 diffs)
• libtransmission/utils.c (modified) (1 diff)
• libtransmission/utils.h (modified) (1 diff)

branches/simple_http_parsing/libtransmission/tracker.c

@@ -311 +311 @@
     benc_val_t   beAll;
     benc_val_t * bePeers, * beFoo;
+    uint8_t * body;
+    int bodylen;
 
     if( tc->pos == tc->size )
@@ -339 +341 @@
     tc->dateTry = tr_date();
 
-    if( tc->pos < 1 )
-    {
-        /* We got nothing */
+    if( tc->pos < 12 || ( 0 != memcmp( tc->buf, "HTTP/1.0 ", 9 ) &&
+                          0 != memcmp( tc->buf, "HTTP/1.1 ", 9 ) ) )
+    {
+        /* We don't have a complete HTTP status line */
+        tr_inf( "Tracker: incomplete HTTP status line" );
         return;
     }
 
+    if( '2' != tc->buf[9] )
+    {
+        /* we didn't get a 2xx status code */
+        tr_err( "Tracker: invalid HTTP status code: %c%c%c",
+                tc->buf[9], tc->buf[10], tc->buf[11] );
+        return;
+    }
+
+    /* find the end of the http headers */
+    body = tr_memmem( tc->buf, tc->pos, "\015\012\015\012", 4 );
+    if( NULL != body )
+    {
+        body += 4;
+    }
+    /* hooray for trackers that violate the HTTP spec */
+    else if( NULL != ( body = tr_memmem( tc->buf, tc->pos, "\015\015", 2 ) ) ||
+             NULL != ( body = tr_memmem( tc->buf, tc->pos, "\012\012", 2 ) ) )
+    {
+        body += 2;
+    }
+    else
+    {
+        tr_err( "Tracker: could not find end of HTTP headers" );
+        return;
+    }
+    bodylen = tc->pos - (body - tc->buf);
+
     /* Find the beginning of the dictionary */
-    for( i = 0; i < tc->pos - 18; i++ )
+    for( i = 0; i < bodylen - 18; i++ )
     {
         /* Hem */
-        if( !memcmp( &tc->buf[i], "d8:interval", 11 ) ||
-            !memcmp( &tc->buf[i], "d8:complete", 11 ) ||
-            !memcmp( &tc->buf[i], "d14:failure reason", 18 ) )
+        if( !memcmp( &body[i], "d8:interval", 11 ) ||
+            !memcmp( &body[i], "d8:complete", 11 ) ||
+            !memcmp( &body[i], "d14:failure reason", 18 ) )
         {
             break;
@@ -357 +388 @@
     }
 
-    if( i >= tc->pos - 18 )
-    {
+    if( i >= bodylen - 18 )
+    {
+        if( tc->stopped || 0 < tc->newPort )
+        {
+            goto nodict;
+        }
         tr_err( "Tracker: no dictionary in answer" );
-        // printf( "%s\n", tc->buf );
+        // printf( "%s\n", body );
         return;
     }
 
-    if( tr_bencLoad( &tc->buf[i], &beAll, NULL ) )
+    if( tr_bencLoad( &body[i], &beAll, NULL ) )
     {
         tr_err( "Tracker: error parsing bencoded data" );
@@ -478 +513 @@
     }
 
+nodict:
     /* Success */
     tc->started   = 0;

branches/simple_http_parsing/libtransmission/utils.c

@@ -62 +62 @@
     return rand() % sup;
 }
+
+void * tr_memmem( const void *vbig, size_t big_len,
+                  const void *vlittle, size_t little_len )
+{
+    const char *big = vbig;
+    const char *little = vlittle;
+    size_t ii, jj;
+
+    if( 0 == big_len || 0 == little_len )
+    {
+        return NULL;
+    }
+
+    for( ii = 0; ii + little_len <= big_len; ii++ )
+    {
+        for( jj = 0; jj < little_len; jj++ )
+        {
+            if( big[ii + jj] != little[jj] )
+            {
+                break;
+            }
+        }
+        if( jj == little_len )
+        {
+            return (char*)big + ii;
+        }
+    }
+
+    return NULL;
+}

branches/simple_http_parsing/libtransmission/utils.h

@@ -33 +33 @@
 
 int  tr_rand ( int );
+
+void * tr_memmem( const void *, size_t, const void *, size_t );
 
 /***********************************************************************