Changeset 2034

Timestamp:

Jun 10, 2007, 10:26:59 PM (15 years ago)

Author:

joshe

Message:

Add some code for verbose UPnP logging which can be enabled at compile-time.

Location:

trunk/libtransmission

Files:

• http.c (modified) (1 diff)
• http.h (modified) (1 diff)
• platform.c (modified) (2 diffs)
• platform.h (modified) (1 diff)
• upnp.c (modified) (8 diffs)

trunk/libtransmission/http.c

@@ -529 +529 @@
         assert( HTTP_STATE_ERROR == http->state );
     }
+}
+
+void
+tr_httpGetRequest( tr_http_t * http, const char ** buf, int * len )
+{
+    *buf = http->body.buf;
+    *len = http->body.used;
 }
 

trunk/libtransmission/http.h

@@ -66 +66 @@
 void          tr_httpAddHeader( tr_http_t *, const char *, const char * );
 void          tr_httpAddBody( tr_http_t *, const char *, ... ) PRINTF( 2, 3 );
+void          tr_httpGetRequest( tr_http_t *, const char **, int * );
 tr_tristate_t tr_httpPulse( tr_http_t *, const char **, int * );
 char        * tr_httpWhatsMyAddress( tr_http_t * );

trunk/libtransmission/platform.c

@@ -36 +36 @@
 #include <pwd.h>
 
-static char * tr_getHomeDirectory()
+const char *
+tr_getHomeDirectory( void )
 {
     static char     homeDirectory[MAX_PATH_LENGTH];
@@ -66 +67 @@
     return homeDirectory;
 }
+
+#else
+
+const char *
+tr_getHomeDirectory( void )
+{
+    /* XXX */
+    return "";
+}
+
 #endif /* !SYS_BEOS && !__AMIGAOS4__ */
 

trunk/libtransmission/platform.h

@@ -45 +45 @@
 tr_thread_t;
 
+/* only for debugging purposes */
+const char * tr_getHomeDirectory( void );
+
 char * tr_getCacheDirectory();
 char * tr_getTorrentsDirectory();

trunk/libtransmission/upnp.c

@@ -24 +24 @@
 
 #include "transmission.h"
+
+/* uncomment this to log requests and responses to ~/transmission-upnp.log */
+/* #define VERBOSE_LOG */
 
 #define SSDP_ADDR               "239.255.255.250"
@@ -155 +158 @@
               char dir, int getname );
 
+#ifdef VERBOSE_LOG
+static FILE * vlog = NULL;
+#endif 
+
 tr_upnp_t *
 tr_upnpInit()
@@ -168 +175 @@
     upnp->infd     = -1;
     upnp->outfd    = -1;
+
+#ifdef VERBOSE_LOG
+    if( NULL == vlog )
+    {
+        char path[MAX_PATH_LENGTH];
+        time_t stupid_api;
+        snprintf( path, sizeof path, "%s/transmission-upnp.log",
+                  tr_getHomeDirectory());
+        vlog = fopen( path, "a" );
+        stupid_api = time( NULL );
+        fprintf( vlog, "opened log at %s\n\n", ctime( &stupid_api ) );
+    }
+#endif 
 
     return upnp;
@@ -258 +278 @@
 
     free( upnp );
+
+#ifdef VERBOSE_LOG
+    if( NULL != vlog )
+    {
+        fflush( vlog );
+    }
+#endif 
+
 }
 
@@ -346 +374 @@
     sin.sin_addr.s_addr = inet_addr( SSDP_ADDR );
     sin.sin_port        = htons( SSDP_PORT );
+
+#ifdef VERBOSE_LOG
+    fprintf( vlog, "send ssdp message, %i bytes:\n", len );
+    fwrite( buf, 1, len, vlog );
+    fputs( "\n\n", vlog );
+#endif 
 
     if( 0 > sendto( fd, buf, len, 0,
@@ -462 +496 @@
     else
     {
+#ifdef VERBOSE_LOG
+        fprintf( vlog, "receive ssdp message, %i bytes:\n", *len );
+        fwrite( buf, 1, *len, vlog );
+        fputs( "\n\n", vlog );
+#endif 
         return TR_NET_OK;
     }
@@ -810 +849 @@
 makeHttp( int method, const char * host, int port, const char * path )
 {
+    tr_http_t  * ret;
+#ifdef VERBOSE_LOG
+    const char * body;
+    int          len;
+#endif
+
     if( tr_httpIsUrl( path, -1 ) )
     {
-        return tr_httpClientUrl( method, "%s", path );
+        ret = tr_httpClientUrl( method, "%s", path );
     }
     else
     {
-        return tr_httpClient( method, host, port, "%s", path );
-    }
+        ret = tr_httpClient( method, host, port, "%s", path );
+    }
+
+#ifdef VERBOSE_LOG
+    tr_httpGetRequest( ret, &body, &len );
+    fprintf( vlog, "send http message, %i bytes:\n", len );
+    fwrite( body, 1, len, vlog );
+    fputs( "\n\n", vlog );
+#endif
+
+    return ret;
 }
 
@@ -923 +977 @@
     {
         case TR_NET_OK:
+#ifdef VERBOSE_LOG
+    fprintf( vlog, "receive http message, %i bytes:\n", hlen );
+    fwrite( headers, 1, hlen, vlog );
+    fputs( "\n\n", vlog );
+#endif
             code = tr_httpResponseCode( headers, hlen );
             if( SOAP_METHOD_NOT_ALLOWED == code && !dev->soapretry )