Changeset 7837

Timestamp:

Feb 7, 2009, 12:11:58 AM (12 years ago)

Author:

charles

Message:

(trunk libT) update to the newest versions of miniupnp and libnatpmp

Location:

trunk

Files:

• libtransmission/upnp.c (modified) (2 diffs)
• third-party/libnatpmp/README (modified) (1 diff)
• third-party/miniupnp/Changelog.txt (modified) (1 diff)
• third-party/miniupnp/README (modified) (1 diff)
• third-party/miniupnp/minisoap.c (modified) (3 diffs)
• third-party/miniupnp/minissdpc.c (modified) (2 diffs)
• third-party/miniupnp/miniupnpc.c (modified) (7 diffs)
• third-party/miniupnp/miniwget.c (modified) (4 diffs)
• third-party/miniupnp/upnpcommands.c (modified) (6 diffs)
• third-party/miniupnp/upnpcommands.h (modified) (4 diffs)

trunk/libtransmission/upnp.c

@@ -134 +134 @@
         UPNP_DeletePortMapping( handle->urls.controlURL,
                                 handle->data.servicetype,
-                                portStr, "TCP" );
+                                portStr, "TCP", NULL );
         tr_ninf( getKey( ),
                  _(
@@ -166 +166 @@
                                        handle->data.servicetype,
                                        portStr, portStr, handle->lanaddr,
-                                       desc, "TCP" );
+                                       desc, "TCP", NULL );
             handle->isMapped = !err;
         }

trunk/third-party/libnatpmp/README

@@ -1 +1 @@
 libnatpmp is written by Thomas Bernard.
 Its homepage is http://miniupnp.tuxfamily.org/libnatpmp.html
-This code is from the libnatpmp-20081006 snapshot
+This code is from the libnatpmp-20090129 snapshot
 

trunk/third-party/miniupnp/Changelog.txt

@@ -1 @@
-$Id: Changelog.txt,v 1.72 2008/09/25 18:02:50 nanard Exp $
+$Id: Changelog.txt,v 1.77 2008/12/18 17:47:32 nanard Exp $
 miniUPnP client Changelog.
+
+2008/12/18:
+  cleanup in Makefile (thanks to Paul de Weerd)
+  minissdpc.c : win32 compatibility
+  miniupnpc.c : changed xmlns prefix from 'm' to 'u'
+  Removed NDEBUG (using DEBUG)
+
+2008/10/14:
+  Added the ExternalHost argument to DeletePortMapping()
+
+2008/10/11:
+  Added the ExternalHost argument to AddPortMapping()
+  Put a correct User-Agent: header in HTTP requests.
+
+VERSION 1.2 :
+
+2008/10/07:
+  Update docs
 
 2008/09/25:

trunk/third-party/miniupnp/README

@@ -1 +1 @@
 MiniUPnP is written by Thomas Bernard.
 Its homepage is http://miniupnp.free.fr/
-This is from the miniupnpc-1.2 tarball (7 Oct 2008)
+This is from miniupnpc-20090129.tar.gz

trunk/third-party/miniupnp/minisoap.c

@@ -1 @@
-/* $Id: minisoap.c,v 1.15 2008/02/17 17:57:07 nanard Exp $ */
+/* $Id: minisoap.c,v 1.16 2008/10/11 16:39:29 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
@@ -20 +20 @@
 #endif
 #include "minisoap.h"
+#include "miniupnpcstrings.h"
 
 /* only for malloc */
@@ -93 +94 @@
 /*                       "POST %s HTTP/1.0\r\n"*/
                            "Host: %s%s\r\n"
-                                           "User-Agent: POSIX, UPnP/1.0, miniUPnPc/1.0\r\n"
+                                           "User-Agent: " OS_STRING ", UPnP/1.0, MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
                            "Content-Length: %d\r\n"
                                            "Content-Type: text/xml\r\n"

trunk/third-party/miniupnp/minissdpc.c

@@ -1 @@
-/* $Id: minissdpc.c,v 1.6 2008/10/06 23:08:39 nanard Exp $ */
+/* $Id: minissdpc.c,v 1.7 2008/12/18 17:45:48 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas BERNARD
@@ -11 +11 @@
 #include <unistd.h>
 #include <sys/types.h>
+#ifdef WIN32
+#include <winsock2.h>
+#include <Ws2tcpip.h>
+#include <io.h>
+#else
 #include <sys/socket.h>
 #include <sys/un.h>
+#endif
 
 #include "minissdpc.h"

trunk/third-party/miniupnp/miniupnpc.c

@@ -1 @@
-/* $Id: miniupnpc.c,v 1.55 2008/09/25 18:02:50 nanard Exp $ */
+/* $Id: miniupnpc.c,v 1.57 2008/12/18 17:46:36 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas BERNARD
@@ -9 +9 @@
 #include <string.h>
 #ifdef WIN32
+/* Win32 Specific includes and defines */
 #include <winsock2.h>
 #include <Ws2tcpip.h>
 #include <io.h>
 #define snprintf _snprintf
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#define strncasecmp _memicmp
+#else
 #define strncasecmp memicmp
+#endif
 #define MAXHOSTNAMELEN 64
 #else
+/* Standard POSIX includes */
 #include <unistd.h>
 #include <sys/socket.h>
@@ -40 +46 @@
 
 #define SOAPPREFIX "s"
+#define SERVICEPREFIX "u"
+#define SERVICEPREFIX2 'u'
 
 /* root description parsing */
@@ -54 +62 @@
         parser.attfunc = 0;
         parsexml(&parser);
-#ifndef NDEBUG
+#ifdef DEBUG
         printIGD(data);
 #endif
@@ -151 +159 @@
                                                   SOAPPREFIX ":encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
                                                   "<" SOAPPREFIX ":Body>"
-                                                  "<m:%s xmlns:m=\"%s\">"
-                                                  "</m:%s>"
+                                                  "<" SERVICEPREFIX ":%s xmlns:" SERVICEPREFIX "=\"%s\">"
+                                                  "</" SERVICEPREFIX ":%s>"
                                                   "</" SOAPPREFIX ":Body></" SOAPPREFIX ":Envelope>"
                                                   "\r\n", action, service, action);
@@ -167 +175 @@
                                                 SOAPPREFIX ":encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
                                                 "<" SOAPPREFIX ":Body>"
-                                                "<m:%s xmlns:m=\"%s\">",
+                                                "<" SERVICEPREFIX ":%s xmlns:" SERVICEPREFIX "=\"%s\">",
                                                 action, service);
                 p = soapbody + soapbodylen;
@@ -199 +207 @@
                 *(p++) = '<';
                 *(p++) = '/';
-                *(p++) = 'm';
+                *(p++) = SERVICEPREFIX2;
                 *(p++) = ':';
                 pe = action;

trunk/third-party/miniupnp/miniwget.c

@@ -1 @@
-/* $Id: miniwget.c,v 1.19 2007/11/02 14:16:19 nanard Exp $ */
+/* $Id: miniwget.c,v 1.21 2008/12/18 17:45:18 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
@@ -32 +32 @@
 #endif
 
+#include "miniupnpcstrings.h"
+
 /* miniwget2() :
  * */
@@ -97 +99 @@
                              "Host: %s:%d\r\n"
                                  "Connection: Close\r\n"
+                                 "User-Agent: " OS_STRING ", UPnP/1.0, MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
+
                                  "\r\n",
                     path, host, port);
@@ -138 +142 @@
                 }
                 *size = allreadyread;
-#ifndef NDEBUG
+#ifdef DEBUG
                 printf("%d bytes read\n", *size);
 #endif

trunk/third-party/miniupnp/upnpcommands.c

@@ -1 @@
-/* $Id: upnpcommands.c,v 1.19 2008/02/18 13:27:23 nanard Exp $ */
+/* $Id: upnpcommands.c,v 1.22 2008/12/18 17:45:18 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
- * Copyright (c) 2005 Thomas Bernard
+ * Copyright (c) 2005-2008 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
@@ -304 +304 @@
                                         const char * inClient,
                                         const char * desc,
-                                        const char * proto)
+                                        const char * proto,
+                    const char * remoteHost)
 {
         struct UPNParg * AddPortMappingArgs;
@@ -318 +319 @@
         AddPortMappingArgs = calloc(9, sizeof(struct UPNParg));
         AddPortMappingArgs[0].elt = "NewRemoteHost";
+        AddPortMappingArgs[0].val = remoteHost;
         AddPortMappingArgs[1].elt = "NewExternalPort";
         AddPortMappingArgs[1].val = extPort;
@@ -352 +354 @@
 int
 UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
-                       const char * extPort, const char * proto)
+                       const char * extPort, const char * proto,
+                       const char * remoteHost)
 {
         /*struct NameValueParserData pdata;*/
@@ -367 +370 @@
         DeletePortMappingArgs = calloc(4, sizeof(struct UPNParg));
         DeletePortMappingArgs[0].elt = "NewRemoteHost";
+        DeletePortMappingArgs[0].val = remoteHost;
         DeletePortMappingArgs[1].elt = "NewExternalPort";
         DeletePortMappingArgs[1].val = extPort;
@@ -485 +489 @@
         int ret = UPNPCOMMAND_UNKNOWN_ERROR;
         simpleUPnPcommand(-1, controlURL, servicetype, "GetPortMappingNumberOfEntries", 0, buffer, &bufsize);
-#ifndef NDEBUG
+#ifdef DEBUG
         DisplayNameValueList(buffer, bufsize);
 #endif

trunk/third-party/miniupnp/upnpcommands.h

@@ -1 @@
-/* $Id: upnpcommands.h,v 1.14 2008/09/25 18:02:50 nanard Exp $ */
+/* $Id: upnpcommands.h,v 1.16 2008/10/14 18:05:28 nanard Exp $ */
 /* Miniupnp project : http://miniupnp.free.fr/
  * Author : Thomas Bernard
@@ -87 +87 @@
 
 /* UPNP_AddPortMapping()
+ * if desc is NULL, it will be defaulted to "libminiupnpc"
+ * remoteHost is usually NULL because IGD don't support it.
  *
  * Return values :
@@ -115 +117 @@
                                         const char * inClient,
                                         const char * desc,
-                    const char * proto);
+                    const char * proto,
+                    const char * remoteHost);
 
 /* UPNP_DeletePortMapping()
+ * Use same argument values as what was used for AddPortMapping().
+ * remoteHost is usually NULL because IGD don't support it.
  * Return Values :
  * 0 : SUCCESS
@@ -127 +132 @@
 LIBSPEC int
 UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
-                       const char * extPort, const char * proto);
+                       const char * extPort, const char * proto,
+                       const char * remoteHost);
 
 /* UPNP_GetPortMappingNumberOfEntries()