Changeset 1293

Timestamp:

Dec 27, 2006, 5:16:12 AM (14 years ago)

Author:

joshe

Message:

Handle urlbase properly in UPnP root file.

Location:

trunk/libtransmission

Files:

• http.c (modified) (3 diffs)
• http.h (modified) (2 diffs)
• upnp.c (modified) (8 diffs)

trunk/libtransmission/http.c

@@ -306 +306 @@
 
 int
+tr_httpIsUrl( const char * url, int len )
+{
+    if( 0 > len )
+    {
+        len = strlen( url );
+    }
+
+    /* check for protocol */
+    if( 7 > len || 0 != tr_strncasecmp( url, "http://", 7 ) )
+    {
+        return 0;
+    }
+
+    return 7;
+}
+
+int
 tr_httpParseUrl( const char * url, int len,
                  char ** host, int * port, char ** path )
@@ -318 +335 @@
     }
 
-    /* check for protocol */
-    if( 7 > len || 0 != tr_strncasecmp( url, "http://", 7 ) )
+    ii = tr_httpIsUrl( url, len );
+    if( 0 >= ii )
     {
         tr_err( "Invalid HTTP URL" );
         return 1;
     }
-    url += 7;
-    len -= 7;
+    url += ii;
+    len -= ii;
 
     /* find the hostname and port */
@@ -446 +463 @@
     tr_httpClose( http );
     return NULL;
+}
+
+tr_http_t *
+tr_httpClientUrl( int method, const char * fmt, ... )
+{
+    char      * url, * host, * path;
+    int         port;
+    va_list     ap;
+    tr_http_t * ret;
+
+    va_start( ap, fmt );
+    url = NULL;
+    vasprintf( &url, fmt, ap );
+    va_end( ap );
+
+    if( tr_httpParseUrl( url, -1, &host, &port, &path ) )
+    {
+        free( url );
+        return NULL;
+    }
+    free( url );
+
+    ret = tr_httpClient( method, host, port, "%s", path );
+    free( host );
+    free( path );
+
+    return ret;
 }
 

trunk/libtransmission/http.h

@@ -51 +51 @@
 char *      tr_httpParse( const char * data, int len, tr_http_header_t *headers );
 
+int         tr_httpIsUrl( const char *, int );
 int         tr_httpParseUrl( const char *, int, char **, int *, char ** );
 
@@ -60 +61 @@
 tr_http_t   * tr_httpClient( int, const char *, int, const char *, ... )
               PRINTF( 4, 5 );
+tr_http_t   * tr_httpClientUrl( int, const char *, ... )
+              PRINTF( 2, 3 );
 /* only add headers or body before first pulse */
 void          tr_httpAddHeader( tr_http_t *, const char *, const char * );

trunk/libtransmission/upnp.c

@@ -125 +125 @@
 static int
 parseRoot( const char *buf, int len, char ** soap, char ** scpd );
+static void
+addUrlbase( const char * base, char ** path );
 static int
 parseScpd( const char *buf, int len, tr_upnp_action_t * getcmd,
@@ -702 +704 @@
             else
             {
+                tr_dbg( "upnp device %s: found scpd \"%s\" and soap \"%s\"",
+                        dev->root, dev->scpd, dev->soap );
                 tr_dbg( "upnp device %s: parsed root, state root -> scpd",
                         dev->host );
@@ -827 +831 @@
 
 static tr_http_t *
+makeHttp( int method, const char * host, int port, const char * path )
+{
+    if( tr_httpIsUrl( path, -1 ) )
+    {
+        return tr_httpClientUrl( method, "%s", path );
+    }
+    else
+    {
+        return tr_httpClient( method, host, port, "%s", path );
+    }
+}
+
+static tr_http_t *
 devicePulseGetHttp( tr_upnp_device_t * dev, tr_fd_t * fdlimit )
 {
@@ -843 +860 @@
             if( !dev->soapretry )
             {
-                ret = tr_httpClient( TR_HTTP_GET, dev->host,
-                                     dev->port, "%s", dev->root );
+                ret = makeHttp( TR_HTTP_GET, dev->host, dev->port, dev->root );
             }
             break;
@@ -850 +866 @@
             if( !dev->soapretry )
             {
-                ret = tr_httpClient( TR_HTTP_GET, dev->host,
-                                     dev->port, "%s", dev->scpd );
+                ret = makeHttp( TR_HTTP_GET, dev->host, dev->port, dev->scpd );
             }
             break;
@@ -974 +989 @@
 {
     const char * end, * ii, * jj, * kk, * urlbase;
-    char       * joined;
+    char       * basedup;
 
     *soap = NULL;
@@ -1028 +1043 @@
     }
 
+    basedup = tr_xmlDupContents( urlbase, end );
+    addUrlbase( basedup, soap );
+    addUrlbase( basedup, scpd );
+    free( basedup );
+
     if( NULL != *soap && NULL != *scpd )
     {
-        if( '/' != **soap || '/' != **scpd )
-        {
-            urlbase = tr_xmlDupContents( urlbase, end );
-            if( NULL != urlbase )
-            {
-                if( '/' != **soap )
-                {
-                    joined = joinstrs( urlbase, "/", *soap );
-                    free( *soap );
-                    *soap = joined;
-                }
-                if( '/' != **scpd )
-                {
-                    joined = joinstrs( urlbase, "/", *scpd );
-                    free( *scpd );
-                    *scpd = joined;
-                }
-                free( (char*)urlbase );
-            }
-        }
         return 0;
     }
 
     return 1;
+}
+
+static void
+addUrlbase( const char * base, char ** path )
+{
+    const char * middle;
+    int          len;
+    char       * joined;
+
+    if( NULL == base || NULL == *path ||
+        '/' == **path || tr_httpIsUrl( *path, -1 ) )
+    {
+        return;
+    }
+
+    len = strlen( base );
+    middle = ( 0 >= len || '/' != base[len-1] ? "/" : "" );
+    joined = joinstrs( base, middle, *path );
+    free( *path );
+    *path = joined;
 }
 
@@ -1221 +1241 @@
 
     method = ( retry ? TR_HTTP_M_POST : TR_HTTP_POST );
-    http = tr_httpClient( method, host, port, "%s", path );
+    http = makeHttp( method, host, port, path );
     if( NULL != http )
     {