[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       14/02/23 18:20:06

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 
        src/utils/net  : upnp_stubs.c 

Log message:
        patch #8335

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.362&r2=1.363
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1594&r2=1.1595
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/upnp_stubs.c?cvsroot=mldonkey&r1=1.3&r2=1.4

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -b -r1.362 -r1.363
--- config/configure.in 23 Feb 2014 18:19:23 -0000      1.362
+++ config/configure.in 23 Feb 2014 18:20:04 -0000      1.363
@@ -871,7 +871,7 @@
 if test "$UPNP_NATPMP_FORCE" = "yes"; then
        UPNP_NATPMP=yes
        cd $PATCH_DIR
-       MINIUPNPC=miniupnpc-1.8
+       MINIUPNPC=miniupnpc-1.9
        LIBNATPMP=libnatpmp-20131126
        $WGET http://miniupnp.tuxfamily.org/files/$MINIUPNPC.tar.gz
        $WGET http://miniupnp.tuxfamily.org/files/$LIBNATPMP.tar.gz

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1594
retrieving revision 1.1595
diff -u -b -r1.1594 -r1.1595
--- distrib/ChangeLog   23 Feb 2014 18:19:23 -0000      1.1594
+++ distrib/ChangeLog   23 Feb 2014 18:20:05 -0000      1.1595
@@ -15,6 +15,7 @@
 =========
 
 2014/02/23:
+8335: Version bump miniupnpc 1.9 (ygrek)
 8334: Version bump libnatpmp 20131126 & miniupnpc 1.8 (ygrek)
 8333: Config: New configure option --enable-dev (ygrek)
 8332: New option "all" for command verify_chunks (ygrek)

Index: src/utils/net/upnp_stubs.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/upnp_stubs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/utils/net/upnp_stubs.c  7 Jul 2013 10:52:11 -0000       1.3
+++ src/utils/net/upnp_stubs.c  23 Feb 2014 18:20:05 -0000      1.4
@@ -153,7 +153,7 @@
 
     unsigned int       natpmpMapped;
     int                natpmpDiscovered;
-    ml_upnp_state      natpmpState;
+    ml_natpmp_state    natpmpState;
     time_t             renewTime;
     time_t             commandTime;
     natpmp_t           natpmp;
@@ -681,7 +681,11 @@
         snprintf( type, sizeof( type ), "%s", ( map->isTcp ? "TCP" : "UDP" ) );
         i = UPNP_GetSpecificPortMappingEntry( map->upnpUrls.controlURL,
                                               map->upnpData.first.servicetype, 
portStr,
-                                              type, intClient, intPort, NULL, 
NULL, NULL );
+                                              type,
+#if MINIUPNPC_API_VERSION >= 10
+                                              NULL, /* remoteHost */
+#endif
+                                              intClient, intPort, NULL, NULL, 
NULL );
         if( i != UPNPCOMMAND_SUCCESS )
         {
             dbg_printf( "Port %d isn't forwarded\n", map->extPort );