Changeset 938 for trunk

Timestamp:

Sep 27, 2006, 11:23:22 PM (16 years ago)

Author:

joshe

Message:

Add more UPnP debugging messages.

File:

• trunk/libtransmission/upnp.c (modified) (8 diffs)

trunk/libtransmission/upnp.c

@@ -583 +583 @@
     *first = ii;
 
-    tr_inf( "new upnp device %s", ii->host );
+    tr_inf( "new upnp device %s, port %i, path %s",
+            ii->host, ii->port, ii->root );
 }
 
@@ -689 +690 @@
     {
         case UPNPDEV_STATE_ROOT:
-            if( TR_HTTP_STATUS_OK( code ) &&
-                !parseRoot( body, len, &dev->soap, &dev->scpd ) )
+            if( !TR_HTTP_STATUS_OK( code ) )
+            {
+                tr_dbg( "upnp device %s: fetch root failed with http code %i",
+                        dev->host, code );
+            }
+            else if( parseRoot( body, len, &dev->soap, &dev->scpd ) )
+            {
+                tr_dbg( "upnp device %s: parse root failed", dev->host );
+            }
+            else
             {
                 tr_dbg( "upnp device %s: parsed root, state root -> scpd",
@@ -699 +708 @@
 
         case UPNPDEV_STATE_SCPD:
-            if( TR_HTTP_STATUS_OK( code ) &&
-                !parseScpd( body, len, &dev->getcmd,
-                            &dev->addcmd, &dev->delcmd ) )
+            if( !TR_HTTP_STATUS_OK( code ) )
+            {
+                tr_dbg( "upnp device %s: fetch scpd failed with http code %i",
+                        dev->host, code );
+            }
+            else if( parseScpd( body, len, &dev->getcmd,
+                                &dev->addcmd, &dev->delcmd ) )
+            {
+                tr_dbg( "upnp device %s: parse scpd failed", dev->host );
+            }
+            else
             {
                 tr_dbg( "upnp device %s: parsed scpd, state scpd -> ready",
@@ -724 +741 @@
                         dev->host );
                 dev->state = UPNPDEV_STATE_GET;
+            }
+            else
+            {
+                tr_dbg( "upnp device %s: add failed with http code %i",
+                        dev->host, code );
             }
             break;
@@ -761 +783 @@
                 dev->state = UPNPDEV_STATE_ADD;
             }
+            else
+            {
+                tr_dbg( "upnp device %s: get failed with http code %i",
+                        dev->host, code );
+            }
             break;
 
@@ -772 +799 @@
                 dev->state = UPNPDEV_STATE_READY;
                 dev->looping = 0;
+            }
+            else
+            {
+                tr_dbg( "upnp device %s: del failed with http code %i",
+                        dev->host, code );
             }
             break;
@@ -888 +920 @@
         if( NULL == dev->http )
         {
-            tr_dbg( "upnp device %s: http init failed, state ? -> error",
-                    dev->host );
+            tr_dbg( "upnp device %s: http init failed, state %hhu -> error",
+                    dev->host, dev->state );
             dev->state = UPNPDEV_STATE_ERROR;
             dev->soapretry = 0;
@@ -919 +951 @@
             if( dev->soapretry )
             {
-                tr_dbg( "upnp device %s: http pulse failed, state ? -> error",
-                        dev->host );
+                tr_dbg( "upnp device %s: http pulse failed, state %hhu -> error",
+                        dev->host, dev->state );
                 dev->state = UPNPDEV_STATE_ERROR;
                 dev->soapretry = 0;