status-im/miniupnp
2
0
Fork 0
mirror of https://github.com/status-im/miniupnp.git synced 2025-01-18 10:22:03 +00:00
Code Issues Projects Releases Wiki Activity

add --disable-pppconn genconfig.sh option to disable WANPPPConnection

Browse Source 
fixes #176
This commit is contained in:
Thomas Bernard 2015-12-13 15:57:49 +01:00
parent 66b087b9b1
commit 9e31ceb630
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
miniupnpd/genconfig.sh
View File

@ -28,6 +28,7 @@ case "$argv" in
echo "UPnP Version invalid in option $argv" echo "UPnP Version invalid in option $argv"
exit 1 exit 1
fi ;; fi ;;
--disable-pppconn) DISABLEPPPCONN=1 ;;
--help|-h) --help|-h)
echo "Usage : $0 [options]" echo "Usage : $0 [options]"
echo " --ipv6 enable IPv6" echo " --ipv6 enable IPv6"
@ -38,6 +39,7 @@ case "$argv" in
echo " --pcp-peer enable PCP PEER operation" echo " --pcp-peer enable PCP PEER operation"
echo " --portinuse enable port in use check" echo " --portinuse enable port in use check"
echo " --uda-version=x.x set advertised UPnP version (default to ${UPNP_VERSION_MAJOR}.${UPNP_VERSION_MINOR})" echo " --uda-version=x.x set advertised UPnP version (default to ${UPNP_VERSION_MAJOR}.${UPNP_VERSION_MINOR})"
echo " --disable-pppconn disable WANPPPConnection"
exit 1 exit 1
;; ;;
*) *)
@ -453,6 +455,15 @@ echo "/*#define HAS_DUMMY_SERVICE*/" >> ${CONFIGFILE}
echo "#define ENABLE_L3F_SERVICE" >> ${CONFIGFILE} echo "#define ENABLE_L3F_SERVICE" >> ${CONFIGFILE}
echo "" >> ${CONFIGFILE} echo "" >> ${CONFIGFILE}
echo "/* define ADVERTISE_WANPPPCONN to allow buggy Control Point to use" >> ${CONFIGFILE}
echo " * WANPPPConnection instead of WANIPConnection. */" >> ${CONFIGFILE}
if [ -n "$STRICT" ] || [ -n "$DISABLEPPPCONN" ] ; then
echo "/*#define ADVERTISE_WANPPPCONN*/" >> ${CONFIGFILE}
else
echo "#define ADVERTISE_WANPPPCONN" >> ${CONFIGFILE}
fi
echo "" >> ${CONFIGFILE}
echo "/* Enable IP v6 support */" >> ${CONFIGFILE} echo "/* Enable IP v6 support */" >> ${CONFIGFILE}
if [ -n "$IPV6" ]; then if [ -n "$IPV6" ]; then
echo "#define ENABLE_IPV6" >> ${CONFIGFILE} echo "#define ENABLE_IPV6" >> ${CONFIGFILE}

4
miniupnpd/minissdp.c
View File

@ -521,12 +521,12 @@ static struct {
{"urn:schemas-upnp-org:service:WANIPConnection:", 1, uuidvalue_wcd}, {"urn:schemas-upnp-org:service:WANIPConnection:", 1, uuidvalue_wcd},
#endif /* IGD_V2 */ #endif /* IGD_V2 */
{"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:", 1, uuidvalue_wan}, {"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:", 1, uuidvalue_wan},
#ifndef UPNP_STRICT #ifdef ADVERTISE_WANPPPCONN
/* We use WAN IP Connection, not PPP connection, /* We use WAN IP Connection, not PPP connection,
* but buggy control points may try to use WanPPPConnection * but buggy control points may try to use WanPPPConnection
* anyway */ * anyway */
{"urn:schemas-upnp-org:service:WANPPPConnection:", 1, uuidvalue_wcd}, {"urn:schemas-upnp-org:service:WANPPPConnection:", 1, uuidvalue_wcd},
#endif /* UPNP_STRICT */ #endif /* ADVERTISE_WANPPPCONN */
#ifdef ENABLE_L3F_SERVICE #ifdef ENABLE_L3F_SERVICE
{"urn:schemas-upnp-org:service:Layer3Forwarding:", 1, uuidvalue_igd}, {"urn:schemas-upnp-org:service:Layer3Forwarding:", 1, uuidvalue_igd},
#endif /* ENABLE_L3F_SERVICE */ #endif /* ENABLE_L3F_SERVICE */