From f3ec5cfa0574e0a050247b1b55e4097554b4a12c Mon Sep 17 00:00:00 2001
From: spiralvoice <spiralvoice>
Date: Sun, 23 Feb 2014 18:20:04 +0000
Subject: [PATCH] patch #8335

---
 config/configure.in        | 2 +-
 distrib/ChangeLog          | 1 +
 src/utils/net/upnp_stubs.c | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/configure.in b/config/configure.in
index 1d541158..52c63e69 100644
--- a/config/configure.in
+++ b/config/configure.in
@@ -871,7 +871,7 @@ fi
 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
diff --git a/distrib/ChangeLog b/distrib/ChangeLog
index 9992b1dd..67a6f5f9 100644
--- a/distrib/ChangeLog
+++ b/distrib/ChangeLog
@@ -15,6 +15,7 @@ ChangeLog
 =========
 
 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)
diff --git a/src/utils/net/upnp_stubs.c b/src/utils/net/upnp_stubs.c
index da41f9ba..41942f34 100644
--- a/src/utils/net/upnp_stubs.c
+++ b/src/utils/net/upnp_stubs.c
@@ -153,7 +153,7 @@ typedef struct ml_upnpmp_t
 
     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 @@ upnpPulse( ml_upnpmp_t * map )
         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 );
-- 
2.11.4.GIT