Changeset 5087

Timestamp:

Feb 21, 2008, 2:38:01 PM (14 years ago)

Author:

charles

Message:

update to miniupnp-20080217

Location:

trunk/third-party/miniupnp

Files:

• minisoap.c (modified) (6 diffs)
• miniupnpc.c (modified) (2 diffs)

trunk/third-party/miniupnp/minisoap.c

@@ -1 @@
-/* $Id: minisoap.c,v 1.12 2007/12/13 17:09:03 nanard Exp $ */
+/* $Id: minisoap.c,v 1.14 2008/02/16 23:46:11 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
@@ -24 +24 @@
 #include <stdlib.h>
 
+#ifdef WIN32
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
+#else
+#define PRINT_SOCKET_ERROR(x) perror(x)
+#endif
+
 /* httpWrite sends the headers and the body to the socket
  * and returns the number of bytes sent */
@@ -37 +43 @@
          * soap request that are sent into only one packet */
         char * p;
+        /* TODO: AVOID MALLOC */
         p = malloc(headerssize+bodysize);
         memcpy(p, headers, headerssize);
@@ -42 +49 @@
         /*n = write(fd, p, headerssize+bodysize);*/
         n = send(fd, p, headerssize+bodysize, 0);
+        if(n<0) {
+          PRINT_SOCKET_ERROR("send");
+        }
+        /* disable send on the socket */
+        /* draytek routers dont seems to like that... */
+#if 0
 #ifdef WIN32
-        shutdown(fd, SD_SEND);
+        if(shutdown(fd, SD_SEND)<0) {
 #else
-        shutdown(fd, SHUT_WR);  /*SD_SEND*/
+        if(shutdown(fd, SHUT_WR)<0)     { /*SD_SEND*/
+#endif
+                PRINT_SOCKET_ERROR("shutdown");
+        }
 #endif
         free(p);
@@ -66 +82 @@
          * HTTP/1.1 needs the header Connection: close to do that.
          * This is the default with HTTP/1.0 */
+    /* Connection: Close is normally there only in HTTP/1.1 but who knows */
         headerssize = snprintf(headerbuf, sizeof(headerbuf),
 /*                       "POST %s HTTP/1.1\r\n"*/
@@ -74 +91 @@
                                            "Content-Type: text/xml\r\n"
                                            "SOAPAction: \"%s\"\r\n"
-/*                                         "Connection: Close\r\n" */
+                                           "Connection: Close\r\n"
                                            "\r\n",
                                            url, host, port, bodysize, action);

trunk/third-party/miniupnp/miniupnpc.c

@@ -1 @@
-/* $Id: miniupnpc.c,v 1.49 2007/12/19 14:58:54 nanard Exp $ */
+/* $Id: miniupnpc.c,v 1.50 2008/02/03 22:19:45 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas BERNARD
@@ -666 +666 @@
                         /* we should choose an internet gateway device.
                         * with st == urn:schemas-upnp-org:device:InternetGatewayDevice:1 */
-                        if((state >= 3) || strstr(dev->st, "InternetGatewayDevice"))
+                        descXML = miniwget_getaddr(dev->descURL, &descXMLsize,
+                                                        lanaddr, lanaddrlen);
+                        if(descXML)
                         {
-                                descXML = miniwget_getaddr(dev->descURL, &descXMLsize,
-                                                        lanaddr, lanaddrlen);
-                                if(descXML)
+                                ndev++;
+                                memset(data, 0, sizeof(struct IGDdatas));
+                                memset(urls, 0, sizeof(struct UPNPUrls));
+                                parserootdesc(descXML, descXMLsize, data);
+                                free(descXML);
+                                descXML = NULL;
+                                if(0==strcmp(data->servicetype_CIF,
+                                   "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1")
+                                   || state >= 3 )
                                 {
-                                        ndev++;
-                                        memset(data, 0, sizeof(struct IGDdatas));
-                                        memset(urls, 0, sizeof(struct UPNPUrls));
-                                        parserootdesc(descXML, descXMLsize, data);
-                                        free(descXML);
-                                        descXML = NULL;
-                                        GetUPNPUrls(urls, data, dev->descURL);
+                                  GetUPNPUrls(urls, data, dev->descURL);
 
 #ifdef DEBUG
-                                        printf("UPNPIGD_IsConnected(%s) = %d\n",
-                                           urls->controlURL,
-                                       UPNPIGD_IsConnected(urls, data));
-#endif
-                                        if((state >= 2) || UPNPIGD_IsConnected(urls, data))
-                                                return state;
-                                        FreeUPNPUrls(urls);
-                                        memset(data, 0, sizeof(struct IGDdatas));
+                                  printf("UPNPIGD_IsConnected(%s) = %d\n",
+                                     urls->controlURL,
+                                 UPNPIGD_IsConnected(urls, data));
+#endif
+                                  if((state >= 2) || UPNPIGD_IsConnected(urls, data))
+                                        return state;
+                                  FreeUPNPUrls(urls);
                                 }
+                                memset(data, 0, sizeof(struct IGDdatas));
+                        }
 #ifdef DEBUG
-                                else
-                                {
-                                        printf("error getting XML description %s\n", dev->descURL);
-                                }
-#endif
+                        else
+                        {
+                                printf("error getting XML description %s\n", dev->descURL);
                         }
+#endif
                 }
         }