Changeset 9531

Timestamp:

Nov 20, 2009, 4:38:19 AM (9 years ago)

Author:

charles

Message:

(trunk libT) #2096: add code magnet URL parser and unit tests

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (4 diffs)
• magnet-test.c (added)
• magnet.c (added)
• magnet.h (added)
• utils-test.c (modified) (3 diffs)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)
• web.c (modified) (1 diff)
• web.h (modified) (1 diff)

trunk/libtransmission/Makefile.am

@@ -28 +28 @@
     JSON_parser.c \
     list.c \
+    magnet.c \
     makemeta.c \
     metainfo.c \
@@ -74 +75 @@
     JSON_parser.h \
     list.h \
+    magnet.h \
     makemeta.h \
     metainfo.h \
@@ -109 +111 @@
     clients-test \
     json-test \
+    magnet-test \
     peer-msgs-test \
     rpc-test \
@@ -147 +150 @@
 json_test_LDFLAGS = ${apps_ldflags}
 
+magnet_test_SOURCES = magnet-test.c
+magnet_test_LDADD = ${apps_ldadd}
+magnet_test_LDFLAGS = ${apps_ldflags}
+
 rpc_test_SOURCES = rpc-test.c
 rpc_test_LDADD = ${apps_ldadd}

trunk/libtransmission/utils-test.c

@@ -9 +9 @@
 #include "crypto.h"
 
+/* #define VERBOSE */
 #undef VERBOSE
 #define NUM_LOOPS 1
@@ -282 +283 @@
 }
 
+static int
+test_hex( void )
+{
+    char hex1[41];
+    char hex2[41];
+    uint8_t sha1[20];
+    /*uint8_t sha2[20];*/
+
+    memcpy( hex1, "fb5ef5507427b17e04b69cef31fa3379b456735a", 41 );
+    tr_hex_to_sha1( sha1, hex1 );
+    tr_sha1_to_hex( hex2, sha1 );
+    check( !strcmp( hex1, hex2 ) )
+
+    return 0;
+}
+
 int
 main( void )
@@ -309 +326 @@
     tr_free( out );
 
+    if( ( i = test_hex( ) ) )
+        return i;
     if( ( i = test_lowerbound( ) ) )
         return i;

trunk/libtransmission/utils.c

@@ -903 +903 @@
 
 void
-tr_sha1_to_hex( char *          out,
-                const uint8_t * sha1 )
-{
+tr_sha1_to_hex( char * out, const uint8_t * sha1 )
+{
+    int i;
     static const char hex[] = "0123456789abcdef";
-    int               i;
-
-    for( i = 0; i < 20; i++ )
-    {
-        unsigned int val = *sha1++;
+
+    for( i=0; i<20; ++i )
+    {
+        const unsigned int val = *sha1++;
         *out++ = hex[val >> 4];
         *out++ = hex[val & 0xf];
     }
+
     *out = '\0';
+}
+
+void
+tr_hex_to_sha1( uint8_t * out, const char * in )
+{
+    int i;
+    static const char hex[] = "0123456789abcdef";
+
+    for( i=0; i<20; ++i )
+    {
+        const int hi = strchr( hex, *in++ ) - hex;
+        const int lo = strchr( hex, *in++ ) - hex;
+        *out++ = (uint8_t)( (hi<<4) | lo );
+    }
 }
 

trunk/libtransmission/utils.h

@@ -378 +378 @@
                             void * userData );
 
-void tr_sha1_to_hex( char *          out,
+void tr_sha1_to_hex( char * out,
                      const uint8_t * sha1 ) TR_GNUC_NONNULL(1,2);
+
+void tr_hex_to_sha1( uint8_t * out,
+                     const char * hex ) TR_GNUC_NONNULL(1,2);
 
 

trunk/libtransmission/web.c

@@ -685 +685 @@
     }
 }
+
+char*
+tr_http_unescape( const char * str, int len )
+{
+    char * tmp = curl_unescape( str, len );
+    char * ret = tr_strdup( tmp );
+    curl_free( tmp );
+    return ret;
+}

trunk/libtransmission/web.h

@@ -41 +41 @@
 void tr_http_escape( struct evbuffer *out, const char *str, int len, int noslashes );
 
+char* tr_http_unescape( const char * str, int len );
+
 #endif