--- embedaddon/miniupnpd/genconfig.sh	2012/02/21 23:16:02	1.1
+++ embedaddon/miniupnpd/genconfig.sh	2012/05/29 12:55:57	1.1.1.2
@@ -1,8 +1,8 @@
 #! /bin/sh
-# $Id: genconfig.sh,v 1.1 2012/02/21 23:16:02 misho Exp $
+# $Id: genconfig.sh,v 1.1.1.2 2012/05/29 12:55:57 misho Exp $
 # miniupnp daemon
 # http://miniupnp.free.fr or http://miniupnp.tuxfamily.org/
-# (c) 2006-2010 Thomas Bernard
+# (c) 2006-2011 Thomas Bernard
 # This software is subject to the conditions detailed in the
 # LICENCE file provided within the distribution
 
@@ -28,17 +28,25 @@ if [ -f /etc/platform ]; then
 	fi
 fi
 
+# OpenWRT special case
+if [ -f ./os.openwrt ]; then
+	OS_NAME=OpenWRT
+	OS_VERSION=$(cat ./os.openwrt)
+fi
+
 ${RM} ${CONFIGFILE}
 
 echo "/* MiniUPnP Project" >> ${CONFIGFILE}
 echo " * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/" >> ${CONFIGFILE}
-echo " * (c) 2006-2010 Thomas Bernard" >> ${CONFIGFILE}
+echo " * (c) 2006-2011 Thomas Bernard" >> ${CONFIGFILE}
 echo " * generated by $0 on `date` */" >> ${CONFIGFILE}
 echo "#ifndef $CONFIGMACRO" >> ${CONFIGFILE}
 echo "#define $CONFIGMACRO" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 echo "#include <inttypes.h>" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
+echo "#define MINIUPNPD_VERSION \"`cat VERSION`\"" >> ${CONFIGFILE}
+echo "" >> ${CONFIGFILE}
 echo "#define UPNP_VERSION	\"$UPNP_VERSION\"" >> ${CONFIGFILE}
 
 # OS Specific stuff
@@ -61,6 +69,7 @@ case $OS_NAME in
 		fi
 		echo "#define USE_PF 1" >> ${CONFIGFILE}
 		FW=pf
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		OS_URL=http://www.openbsd.org/
 		;;
 	FreeBSD)
@@ -70,18 +79,25 @@ case $OS_NAME in
 		fi
 		# new way to see which one to use PF or IPF.
 		# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=957
-		# source file with handy subroutines like checkyesno
-		. /etc/rc.subr
-		# source config file so we can probe vars
-		. /etc/rc.conf
-		if checkyesno ipfilter_enable; then
-			echo "Using ipf"
-			FW=ipf
-			echo "#define USE_IPF 1" >> ${CONFIGFILE}
-		elif checkyesno pf_enable; then
-			echo "Using pf"
-			FW=pf
-			echo "#define USE_PF 1" >> ${CONFIGFILE}
+		# source file wource config file so we can probe vars
+		if [ -f /etc/rc.subr ] && [ -f /etc/rc.conf ]; then
+			# source file with handy subroutines like checkyesno
+			. /etc/rc.subr
+			# source config file so we can probe vars
+			. /etc/rc.conf
+			if checkyesno ipfilter_enable; then
+				echo "Using ipf"
+				FW=ipf
+				echo "#define USE_IPF 1" >> ${CONFIGFILE}
+			elif checkyesno pf_enable; then
+				echo "Using pf"
+				FW=pf
+				echo "#define USE_PF 1" >> ${CONFIGFILE}
+			else
+				echo "Could not detect usage of ipf or pf. Compiling for pf by default"
+				FW=pf
+				echo "#define USE_PF 1" >> ${CONFIGFILE}
+			fi
 		# TODO : Add support for IPFW
 		# echo "#define USE_IPFW 1" >> ${CONFIGFILE}
 		# FW=ipfw
@@ -90,12 +106,14 @@ case $OS_NAME in
 			FW=pf
 			echo "#define USE_PF 1" >> ${CONFIGFILE}
 		fi
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		OS_URL=http://www.freebsd.org/
 		;;
 	pfSense)
 		# we need to detect if PFRULE_INOUT_COUNTS macro is needed
 		echo "#define USE_PF 1" >> ${CONFIGFILE}
 		FW=pf
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		OS_URL=http://www.pfsense.com/
 		;;
 	NetBSD)
@@ -114,6 +132,7 @@ case $OS_NAME in
 			echo "#define USE_PF 1" >> ${CONFIGFILE}
 			FW=pf
 		fi
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		OS_URL=http://www.netbsd.org/
 		;;
 	DragonFly)
@@ -132,11 +151,12 @@ case $OS_NAME in
 			echo "#define USE_PF 1" >> ${CONFIGFILE}
 			FW=pf
 		fi
-		echo "#define USE_PF 1" >> ${CONFIGFILE}
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		OS_URL=http://www.dragonflybsd.org/
 		;;
 	SunOS)
 		echo "#define USE_IPF 1" >> ${CONFIGFILE}
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		FW=ipf
 		echo "#define LOG_PERROR 0" >> ${CONFIGFILE}
 		echo "#define SOLARIS_KSTATS 1" >> ${CONFIGFILE}
@@ -155,6 +175,12 @@ case $OS_NAME in
 			OS_VERSION=`cat /etc/debian_version`
 			OS_URL=http://www.debian.org/
 		fi
+		# same thing for Gentoo linux
+		if  [ -f /etc/gentoo-release ]; then
+			OS_NAME=Gentoo
+			OS_VERSION=`cat /etc/gentoo-release`
+			OS_URL=http://www.gentoo.org/
+		fi
 		# use lsb_release (Linux Standard Base) when available
 		LSB_RELEASE=`which lsb_release`
 		if [ 0 -eq $? ]; then
@@ -169,13 +195,24 @@ case $OS_NAME in
 					OS_URL=http://www.ubuntu.com/
 					OS_VERSION=`${LSB_RELEASE} -c -s`
 					;;
+				Gentoo)
+					OS_URL=http://www.gentoo.org/
+					;;
 			esac
 		fi
 		echo "#define USE_NETFILTER 1" >> ${CONFIGFILE}
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		FW=netfilter
 		;;
+	OpenWRT)
+		OS_URL=http://www.openwrt.org/
+		echo "#define USE_NETFILTER 1" >> ${CONFIGFILE}
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
+		FW=netfilter
+		;;
 	Darwin)
 		echo "#define USE_IPFW 1" >> ${CONFIGFILE}
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		FW=ipfw
 		OS_URL=http://developer.apple.com/macosx
 		;;
@@ -189,6 +226,13 @@ esac
 echo "Configuring compilation for [$OS_NAME] [$OS_VERSION] with [$FW] firewall software."
 echo "Please edit config.h for more compilation options."
 
+# define SUPPORT_REMOTEHOST if the FW related code really supports setting
+# a RemoteHost
+if [ \( "$FW" = "netfilter" \) -o \( "$FW" = "pf" \) -o \( "$FW" = "ipfw" \) ] ; then
+	echo "#define SUPPORT_REMOTEHOST" >> ${CONFIGFILE}
+fi
+
+echo "" >> ${CONFIGFILE}
 echo "#define OS_NAME		\"$OS_NAME\"" >> ${CONFIGFILE}
 echo "#define OS_VERSION	\"$OS_NAME/$OS_VERSION\"" >> ${CONFIGFILE}
 echo "#define OS_URL		\"${OS_URL}\"" >> ${CONFIGFILE}
@@ -209,7 +253,7 @@ echo "" >> ${CONFIGFILE}
 
 echo "/* Uncomment the following line to enable generation of" >> ${CONFIGFILE}
 echo " * filter rules with pf */" >> ${CONFIGFILE}
-echo "/*#define PF_ENABLE_FILTER_RULES*/">> ${CONFIGFILE}
+echo "#define PF_ENABLE_FILTER_RULES">> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 
 echo "/* Uncomment the following line to enable caching of results of" >> ${CONFIGFILE}
@@ -243,16 +287,43 @@ echo "/*#define HAS_DUMMY_SERVICE*/" >> ${CONFIGFILE}
 echo "#define ENABLE_L3F_SERVICE" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 
-echo "/* Experimental UPnP Events support. */" >> ${CONFIGFILE}
-echo "/*#define ENABLE_EVENTS*/" >> ${CONFIGFILE}
+echo "/* Enable IP v6 support */" >> ${CONFIGFILE}
+echo "/*#define ENABLE_IPV6*/" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 
+echo "/* Enable the support of IGD v2 specification." >> ${CONFIGFILE}
+echo " * This is not fully tested yet and can cause incompatibilities with some" >> ${CONFIGFILE}
+echo " * control points, so enable with care. */" >> ${CONFIGFILE}
+echo "/*#define IGD_V2*/" >> ${CONFIGFILE}
+echo "" >> ${CONFIGFILE}
+
+echo "#ifdef IGD_V2" >> ${CONFIGFILE}
+echo "/* Enable DeviceProtection service (IGDv2) */" >> ${CONFIGFILE}
+echo "#define ENABLE_DP_SERVICE" >> ${CONFIGFILE}
+echo "" >> ${CONFIGFILE}
+echo "/* Enable WANIPv6FirewallControl service (IGDv2). needs IPv6 */" >> ${CONFIGFILE}
+echo "#ifdef ENABLE_IPV6" >> ${CONFIGFILE}
+echo "#define ENABLE_6FC_SERVICE" >> ${CONFIGFILE}
+echo "#endif /* ENABLE_IPV6 */" >> ${CONFIGFILE}
+echo "#endif /* IGD_V2 */" >> ${CONFIGFILE}
+echo "" >> ${CONFIGFILE}
+
+echo "/* UPnP Events support. Working well enough to be enabled by default." >> ${CONFIGFILE}
+echo " * It can be disabled to save a few bytes. */" >> ${CONFIGFILE}
+echo "#define ENABLE_EVENTS" >> ${CONFIGFILE}
+echo "" >> ${CONFIGFILE}
+
 echo "/* include interface name in pf and ipf rules */" >> ${CONFIGFILE}
 echo "#define USE_IFNAME_IN_RULES" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 
 echo "/* Experimental NFQUEUE support. */" >> ${CONFIGFILE}
 echo "/*#define ENABLE_NFQUEUE*/" >> ${CONFIGFILE}
+echo "" >> ${CONFIGFILE}
+
+echo "/* Enable to make MiniUPnPd more strict about UPnP conformance" >> ${CONFIGFILE}
+echo " * and the messages it receives from control points */" >> ${CONFIGFILE}
+echo "/*#define UPNP_STRICT*/" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 
 echo "#endif" >> ${CONFIGFILE}