From ada935d2cae75f5c161256c6cfbf4fbf6e539be9 Mon Sep 17 00:00:00 2001
From: kille72 <mail@exotic.se>
Date: Thu, 10 May 2018 15:03:50 +0200
Subject: [PATCH] miniupnpd: Updated to 2.1

---
 .../src-rt-6.x.4708/router/miniupnpd/Changelog.txt |  4 +++-
 release/src-rt-6.x.4708/router/miniupnpd/VERSION   |  2 +-
 .../src-rt-6.x.4708/router/miniupnpd/genconfig.sh  |  4 ++--
 .../src-rt-6.x.4708/router/miniupnpd/miniupnpd.c   | 14 +++++++++++++-
 .../src-rt-6.x.4708/router/miniupnpd/pcpserver.c   |  6 +++---
 .../src-rt-6.x.4708/router/miniupnpd/pcpserver.h   | 10 +++++++++-
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/release/src-rt-6.x.4708/router/miniupnpd/Changelog.txt b/release/src-rt-6.x.4708/router/miniupnpd/Changelog.txt
index 2b98d017eb..4d87d428e7 100644
--- a/release/src-rt-6.x.4708/router/miniupnpd/Changelog.txt
+++ b/release/src-rt-6.x.4708/router/miniupnpd/Changelog.txt
@@ -1,4 +1,6 @@
-$Id: Changelog.txt,v 1.440 2018/05/03 08:27:41 nanard Exp $
+$Id: Changelog.txt,v 1.441 2018/05/08 21:34:18 nanard Exp $
+
+VERSION 2.1 : released on 2018/05/08
 
 2018/05/02:
   option to store remaining time in leasefile
diff --git a/release/src-rt-6.x.4708/router/miniupnpd/VERSION b/release/src-rt-6.x.4708/router/miniupnpd/VERSION
index cd5ac039d6..879b416e60 100644
--- a/release/src-rt-6.x.4708/router/miniupnpd/VERSION
+++ b/release/src-rt-6.x.4708/router/miniupnpd/VERSION
@@ -1 +1 @@
-2.0
+2.1
diff --git a/release/src-rt-6.x.4708/router/miniupnpd/genconfig.sh b/release/src-rt-6.x.4708/router/miniupnpd/genconfig.sh
index dce2d43c7a..dc42462d9a 100755
--- a/release/src-rt-6.x.4708/router/miniupnpd/genconfig.sh
+++ b/release/src-rt-6.x.4708/router/miniupnpd/genconfig.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: genconfig.sh,v 1.96 2018/05/03 08:27:40 nanard Exp $
+# $Id: genconfig.sh,v 1.97 2018/05/08 21:27:56 nanard Exp $
 # vim: tabstop=4 shiftwidth=4 noexpandtab
 #
 # miniupnp daemon
@@ -164,7 +164,7 @@ case $OS_NAME in
 		OS_URL=http://www.openbsd.org/
 		V6SOCKETS_ARE_V6ONLY=`sysctl -n net.inet6.ip6.v6only`
 		;;
-	FreeBSD)
+	FreeBSD | GNU/kFreeBSD)
 		VER=`grep '#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`
 		if [ $VER -ge 700049 ]; then
 			echo "#define PFRULE_INOUT_COUNTS" >> ${CONFIGFILE}
diff --git a/release/src-rt-6.x.4708/router/miniupnpd/miniupnpd.c b/release/src-rt-6.x.4708/router/miniupnpd/miniupnpd.c
index fde4b177ad..7ae346629e 100644
--- a/release/src-rt-6.x.4708/router/miniupnpd/miniupnpd.c
+++ b/release/src-rt-6.x.4708/router/miniupnpd/miniupnpd.c
@@ -1,4 +1,4 @@
-/* $Id: miniupnpd.c,v 1.229 2018/05/03 08:27:42 nanard Exp $ */
+/* $Id: miniupnpd.c,v 1.230 2018/05/08 21:28:28 nanard Exp $ */
 /* vim: tabstop=4 shiftwidth=4 noexpandtab
  * MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
@@ -2081,6 +2081,18 @@ main(int argc, char * * argv)
 	tomato_helper();
 #endif
 
+#ifdef ENABLE_PCP
+	if(GETFLAG(ENABLENATPMPMASK))
+	{
+		/* Send PCP startup announcements */
+#ifdef ENABLE_IPV6
+		PCPSendUnsolicitedAnnounce(snatpmp, addr_count, spcp_v6);
+#else /* IPv4 only */
+		PCPSendUnsolicitedAnnounce(snatpmp, addr_count);
+#endif
+	}
+#endif
+
 	/* main loop */
 	while(!quitting)
 	{
diff --git a/release/src-rt-6.x.4708/router/miniupnpd/pcpserver.c b/release/src-rt-6.x.4708/router/miniupnpd/pcpserver.c
index 7930fa5617..719ef5f78f 100644
--- a/release/src-rt-6.x.4708/router/miniupnpd/pcpserver.c
+++ b/release/src-rt-6.x.4708/router/miniupnpd/pcpserver.c
@@ -1,4 +1,4 @@
-/* $Id: pcpserver.c,v 1.47 2018/03/13 10:21:19 nanard Exp $ */
+/* $Id: pcpserver.c,v 1.48 2018/05/08 21:28:28 nanard Exp $ */
 /* MiniUPnP project
  * Website : http://miniupnp.free.fr/
  * Author : Peter Tatrai
@@ -1637,9 +1637,9 @@ int OpenAndConfPCPv6Socket(void)
 #endif /*ENABLE_IPV6*/
 
 #ifdef ENABLE_IPV6
-static void PCPSendUnsolicitedAnnounce(int * sockets, int n_sockets, int socket6)
+void PCPSendUnsolicitedAnnounce(int * sockets, int n_sockets, int socket6)
 #else /* IPv4 only */
-static void PCPSendUnsolicitedAnnounce(int * sockets, int n_sockets)
+void PCPSendUnsolicitedAnnounce(int * sockets, int n_sockets)
 #endif
 {
 	int i;
diff --git a/release/src-rt-6.x.4708/router/miniupnpd/pcpserver.h b/release/src-rt-6.x.4708/router/miniupnpd/pcpserver.h
index bac05ea619..6acdba5ace 100644
--- a/release/src-rt-6.x.4708/router/miniupnpd/pcpserver.h
+++ b/release/src-rt-6.x.4708/router/miniupnpd/pcpserver.h
@@ -1,4 +1,4 @@
-/* $Id: pcpserver.h,v 1.5 2017/12/12 11:43:31 nanard Exp $ */
+/* $Id: pcpserver.h,v 1.6 2018/05/08 21:28:28 nanard Exp $ */
 /* MiniUPnP project
  * Website : http://miniupnp.free.fr/
  * Author : Peter Tatrai
@@ -52,6 +52,14 @@ int ProcessIncomingPCPPacket(int s, unsigned char *msg_buff, int len,
  */
 int OpenAndConfPCPv6Socket(void);
 
+/*
+ * Send Unsolicited ANNOUNCE Message
+ */
+#ifdef ENABLE_IPV6
+void PCPSendUnsolicitedAnnounce(int * sockets, int n_sockets, int socket6);
+#else /* IPv4 only */
+void PCPSendUnsolicitedAnnounce(int * sockets, int n_sockets);
+#endif
 
 /*
  * To be called when Public IP address changed (IPv4)