--- embedaddon/miniupnpd/genconfig.sh	2012/02/21 23:16:02	1.1.1.1
+++ embedaddon/miniupnpd/genconfig.sh	2013/07/22 00:34:53	1.1.1.3.2.1
@@ -1,14 +1,36 @@
 #! /bin/sh
-# $Id: genconfig.sh,v 1.1.1.1 2012/02/21 23:16:02 misho Exp $
+# $Id: genconfig.sh,v 1.1.1.3.2.1 2013/07/22 00:34:53 misho Exp $
 # miniupnp daemon
 # http://miniupnp.free.fr or http://miniupnp.tuxfamily.org/
-# (c) 2006-2010 Thomas Bernard
+# (c) 2006-2012 Thomas Bernard
 # This software is subject to the conditions detailed in the
 # LICENCE file provided within the distribution
 
+for argv; do
+case "$argv" in
+	--ipv6) IPV6=1 ;;
+	--igd2) IGD2=1 ;;
+	--strict) STRICT=1 ;;
+	--leasefile) LEASEFILE=1 ;;
+	--help|-h)
+		echo "Usage : $0 [options]"
+		echo " --ipv6      enable IPv6"
+		echo " --igd2      build an IGDv2 instead of an IGDv1"
+		echo " --strict    be more strict regarding compliance with UPnP specifications"
+		echo " --leasefile enable lease file"
+		exit 1
+		;;
+	*)
+		echo "Option not recognized : $argv"
+		echo "use -h option to display help"
+		exit 1
+		;;
+esac
+done
+
 RM="rm -f"
 CONFIGFILE="config.h"
-CONFIGMACRO="__CONFIG_H__"
+CONFIGMACRO="CONFIG_H_INCLUDED"
 
 # version reported in XML descriptions
 #UPNP_VERSION=20070827
@@ -28,17 +50,38 @@ if [ -f /etc/platform ]; then
 	fi
 fi
 
+# OpenWRT special case
+if [ -f ./os.openwrt ]; then
+	OS_NAME=OpenWRT
+	OS_VERSION=$(cat ./os.openwrt)
+fi
+
+# AstLinux special case
+if [ -f ./os.astlinux ]; then
+	OS_NAME=AstLinux
+	OS_VERSION=$(cat ./os.astlinux)
+fi
+
+# Tomato USB special case
+if [ -f ../shared/tomato_version ]; then
+	OS_NAME=Tomato
+	OS_VERSION="Tomato $(cat ../shared/tomato_version)"
+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 " * generated by $0 on `date` */" >> ${CONFIGFILE}
+echo " * (c) 2006-2012 Thomas Bernard" >> ${CONFIGFILE}
+echo " * generated by $0 on `date`" >> ${CONFIGFILE}
+echo " * using command line options $* */" >> ${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
@@ -59,8 +102,12 @@ case $OS_NAME in
 		if [ \( $MAJORVER -ge 5 \) -o \( $MAJORVER -eq 4 -a $MINORVER -ge 7 \) ]; then
 			echo "#define PF_NEWSTYLE" >> ${CONFIGFILE}
 		fi
-		echo "#define USE_PF 1" >> ${CONFIGFILE}
+		# onrdomain was introduced in OpenBSD 5.0
+		if [ $MAJORVER -ge 5 ]; then
+			echo "#define PFRULE_HAS_ONRDOMAIN" >> ${CONFIGFILE}
+		fi
 		FW=pf
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		OS_URL=http://www.openbsd.org/
 		;;
 	FreeBSD)
@@ -70,76 +117,81 @@ 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"
+		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"
+			elif checkyesno pf_enable; then
+				echo "Using pf"
+				FW=pf
+			elif checkyesno firewall_enable; then
+				echo "Using ifpw"
+				FW=ipfw
+			fi
+		fi
+		if [ -z $FW ] ; then
+			echo "Could not detect usage of ipf, pf, ipfw. Compiling for pf by default"
 			FW=pf
-			echo "#define USE_PF 1" >> ${CONFIGFILE}
-		# TODO : Add support for IPFW
-		# echo "#define USE_IPFW 1" >> ${CONFIGFILE}
-		# FW=ipfw
-		else
-			echo "Could not detect usage of ipf or pf. Compiling for pf by default"
-			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)
-		# source file with handy subroutines like checkyesno
-		. /etc/rc.subr
-		# source config file so we can probe vars
-		. /etc/rc.conf
-		if checkyesno pf; then
-			echo "#define USE_PF 1" >> ${CONFIGFILE}
-			FW=pf
-		elif checkyesno ipfilter; then
-			echo "#define USE_IPF 1" >> ${CONFIGFILE}
-			FW=ipf
-		else
+		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 pf; then
+				FW=pf
+			elif checkyesno ipfilter; then
+				FW=ipf
+			fi
+		fi
+		if [ -z $FW ] ; then
 			echo "Could not detect ipf nor pf, defaulting to pf."
-			echo "#define USE_PF 1" >> ${CONFIGFILE}
 			FW=pf
 		fi
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
 		OS_URL=http://www.netbsd.org/
 		;;
 	DragonFly)
-		# source file with handy subroutines like checkyesno
-		. /etc/rc.subr
-		# source config file so we can probe vars
-		. /etc/rc.conf
-		if checkyesno pf; then
-			echo "#define USE_PF 1" >> ${CONFIGFILE}
-			FW=pf
-		elif checkyesno ipfilter; then
-			echo "#define USE_IPF 1" >> ${CONFIGFILE}
-			FW=ipf
-		else
+		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 pf; then
+				FW=pf
+			elif checkyesno ipfilter; then
+				FW=ipf
+			fi
+		fi
+		if [ -z $FW ] ; then
 			echo "Could not detect ipf nor pf, defaulting to pf."
-			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}
+		# solaris 10 does not define u_int64_t ?
+		# but it does define uint64_t
+		echo "typedef uint64_t u_int64_t;" >> ${CONFIGFILE}
 		OS_URL=http://www.sun.com/solaris/
 		;;
 	Linux)
@@ -155,6 +207,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 +227,40 @@ 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_IFACEWATCHER 1" >> ${CONFIGFILE}
+		FW=netfilter
+		;;
+	AstLinux)
+		OS_URL=http://www.astlinux.org/
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
+		FW=netfilter
+		;;
+	Tomato)
+		OS_NAME=UPnP
+		OS_URL=http://tomatousb.org/
+		echo "" >> ${CONFIGFILE}
+		echo "#include <tomato_config.h>" >> ${CONFIGFILE}
+		echo "" >> ${CONFIGFILE}
+		echo "#ifdef LINUX26" >> ${CONFIGFILE}
+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
+		echo "#endif" >> ${CONFIGFILE}
+		echo "#ifdef TCONFIG_IPV6" >> ${CONFIGFILE}
+		echo "#define ENABLE_IPV6" >> ${CONFIGFILE}
+		echo "#endif" >> ${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
 		;;
@@ -186,9 +271,36 @@ case $OS_NAME in
 		;;
 esac
 
+case $FW in
+	pf)
+		echo "#define USE_PF 1" >> ${CONFIGFILE}
+		;;
+	ipf)
+		echo "#define USE_IPF 1" >> ${CONFIGFILE}
+		;;
+	ipfw)
+		echo "#define USE_IPFW 1" >> ${CONFIGFILE}
+		;;
+	netfilter)
+		echo "#define USE_NETFILTER 1" >> ${CONFIGFILE}
+		;;
+	*)
+		echo "Unknown Firewall/packet filtering software [$FW]"
+		echo "Please contact the author at http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/."
+		exit 1
+		;;
+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 +321,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}
@@ -232,7 +344,11 @@ echo "#define USE_DAEMON" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 
 echo "/* Uncomment the following line to enable lease file support */" >> ${CONFIGFILE}
-echo "/*#define ENABLE_LEASEFILE*/" >> ${CONFIGFILE}
+if [ -n "$LEASEFILE" ] ; then
+	echo "#define ENABLE_LEASEFILE" >> ${CONFIGFILE}
+else
+	echo "/*#define ENABLE_LEASEFILE*/" >> ${CONFIGFILE}
+fi
 echo "" >> ${CONFIGFILE}
 
 echo "/* Define one or none of the two following macros in order to make some" >> ${CONFIGFILE}
@@ -243,16 +359,67 @@ 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}
+if [ -n "$IPV6" ]; then
+	echo "#define ENABLE_IPV6" >> ${CONFIGFILE}
+else
+	echo "/*#define ENABLE_IPV6*/" >> ${CONFIGFILE}
+fi
 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}
+if [ -n "$IGD2" ]; then
+	echo "#define IGD_V2" >> ${CONFIGFILE}
+else
+	echo "/*#define IGD_V2*/" >> ${CONFIGFILE}
+fi
+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}
+if [ -n "$STRICT" ] ; then
+	echo "#define UPNP_STRICT" >> ${CONFIGFILE}
+else
+	echo "/*#define UPNP_STRICT*/" >> ${CONFIGFILE}
+fi
+echo "" >> ${CONFIGFILE}
+
+echo "/* Add the optional Date: header in all HTTP responses */" >> ${CONFIGFILE}
+if [ -n "$STRICT" ] ; then
+	echo "#define ENABLE_HTTP_DATE" >> ${CONFIGFILE}
+else
+	echo "/*#define ENABLE_HTTP_DATE*/" >> ${CONFIGFILE}
+fi
+echo "" >> ${CONFIGFILE}
+
+echo "/* disable reading and parsing of config file (miniupnpd.conf) */" >> ${CONFIGFILE}
+echo "/*#define DISABLE_CONFIG_FILE*/" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 
 echo "#endif" >> ${CONFIGFILE}