Ticket #2338: fix-trac-2338-style2_v2.patch

source/network/NetServer.cpp

@@ -225 +225 @@
     if (!rootDescURL.empty())
         LOGMESSAGE(L"Net server: attempting to use cached root descriptor URL: %hs", rootDescURL.c_str());
 
-    // Init the return variable for UPNP_GetValidIGD to 1 so things behave when using cached URLs.
-    int ret = 1;
+    // Init the return variable for UPNP_GetValidIGD to 0.
+    int ret = 0;
+    bool bAllocatedDescriptorURL = false;
 
     // If we have a cached URL, try that first, otherwise try getting a valid UPnP device for 10 seconds. We also get our LAN address here.
-    if (!((!rootDescURL.empty() && UPNP_GetIGDFromUrl(rootDescURL.c_str(), &urls, &data, internalIPAddress, sizeof(internalIPAddress)))
-      || ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL && (ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress))) != 0)))
+    if (!rootDescURL.empty() && UPNP_GetIGDFromUrl(rootDescURL.c_str(), &urls, &data, internalIPAddress, sizeof(internalIPAddress)))
     {
+        LOGMESSAGE(L"Net server: using cached IGD = %hs", urls.controlURL);
+        // Init the return variable for UPNP_GetValidIGD to 1 so things behave when using cached URLs.
+        ret = 1;
+    } else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL) {
+        // Else if we don't have a cached URL, or the one cached didn't respond. Try getting a valid UPnP device for 10 seconds
+    
+        // UPNP_GetValidIGD() allocates struct UPNPUrls urls on the stack for all non-zero return value.
+        if (ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress)))
+            bAllocatedDescriptorURL = true;
+    } else {
         LOGMESSAGE(L"Net server: upnpDiscover failed and no working cached URL.");
         return NULL;
     }
 
     switch (ret)
     {
+    case 0:
+        LOGMESSAGE(L"Net server: No IGD found");
+        break;
     case 1:
         LOGMESSAGE(L"Net server: found valid IGD = %hs", urls.controlURL);
         break;
@@ -295 +308 @@
     LOGMESSAGE(L"Net server: cached UPnP root descriptor URL as %hs", urls.controlURL);
 
     // Make sure everything is properly freed.
-    FreeUPNPUrls(&urls);
+    if (bAllocatedDescriptorURL)
+        FreeUPNPUrls(&urls);
+    
     freeUPNPDevlist(devlist);
 
     return NULL;