Changeset 5087 for trunk/third-party/miniupnp/minisoap.c

Timestamp:

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

Author:

charles

Message:

update to miniupnp-20080217

File:

• trunk/third-party/miniupnp/minisoap.c (modified) (6 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);