From 7ae5783d8532240ab7ebe351f5fb9bafddfa8bc2 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Mon, 21 Sep 2015 22:39:30 +0200
Subject: [PATCH] UPNP_VERSION_MAJOR / UPNP_VERSION_MINOR macros defined in
 config.h

---
 miniupnpd/genconfig.sh  | 20 +++++++++++++++++++-
 miniupnpd/upnpdescgen.c |  7 ++++---
 miniupnpd/upnphttp.h    |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/miniupnpd/genconfig.sh b/miniupnpd/genconfig.sh
index 5d7b3c4..ecd07c7 100755
--- a/miniupnpd/genconfig.sh
+++ b/miniupnpd/genconfig.sh
@@ -87,8 +87,26 @@ echo "" >> ${CONFIGFILE}
 echo "#include <inttypes.h>" >> ${CONFIGFILE}
 echo "" >> ${CONFIGFILE}
 echo "#define MINIUPNPD_VERSION \"`cat VERSION`\"" >> ${CONFIGFILE}
-echo "" >> ${CONFIGFILE}
 echo "#define MINIUPNPD_DATE	\"$MINIUPNPD_DATE\"" >> ${CONFIGFILE}
+echo "" >> ${CONFIGFILE}
+
+cat >> ${CONFIGFILE} <<EOF
+#ifndef XSTR
+#define XSTR(s) STR(s)
+#define STR(s) #s
+#endif /* XSTR */
+EOF
+
+echo "" >> ${CONFIGFILE}
+cat >> ${CONFIGFILE} <<EOF
+/* UPnP version reported in XML descriptions
+ * 1.0 / 1.1 / 2.0 depending on which UDA (UPnP Device Architecture) Version */
+#define UPNP_VERSION_MAJOR	2
+#define UPNP_VERSION_MINOR	0
+#define UPNP_VERSION_MAJOR_STR	XSTR(UPNP_VERSION_MAJOR)
+#define UPNP_VERSION_MINOR_STR	XSTR(UPNP_VERSION_MINOR)
+EOF
+echo "" >> ${CONFIGFILE}
 
 # OS Specific stuff
 case $OS_NAME in
diff --git a/miniupnpd/upnpdescgen.c b/miniupnpd/upnpdescgen.c
index 0b27fc5..05b748c 100644
--- a/miniupnpd/upnpdescgen.c
+++ b/miniupnpd/upnpdescgen.c
@@ -140,8 +140,8 @@ static const struct XMLElt rootDesc[] =
 #else
 	{"device", INITHELPER(5,12)},
 #endif
-	{"/major", "2"},
-	{"/minor", "0"},
+	{"/major", UPNP_VERSION_MAJOR_STR},
+	{"/minor", UPNP_VERSION_MINOR_STR},
 /* 5 */
 	{"/deviceType", DEVICE_TYPE_IGD},
 		/* urn:schemas-upnp-org:device:InternetGatewayDevice:1 or 2 */
@@ -976,7 +976,8 @@ genServiceDesc(int * len, const struct serviceDesc * s)
 	str = strcat_char(str, len, &tmplen, '>');
 
 	str = strcat_str(str, len, &tmplen,
-		"<specVersion><major>2</major><minor>0</minor></specVersion>");
+		"<specVersion><major>" UPNP_VERSION_MAJOR_STR "</major>"
+		"<minor>" UPNP_VERSION_MINOR_STR "</minor></specVersion>");
 
 	i = 0;
 	str = strcat_str(str, len, &tmplen, "<actionList>");
diff --git a/miniupnpd/upnphttp.h b/miniupnpd/upnphttp.h
index 040a90b..7c5f501 100644
--- a/miniupnpd/upnphttp.h
+++ b/miniupnpd/upnphttp.h
@@ -22,10 +22,10 @@
 #define UPNP_VERSION_STRING "UPnP/1.0"
 /* according to "UPnP Device Architecture 1.1" */
 #define UPNP_VERSION_STRING "UPnP/1.1"
-#else
 /* according to "UPnP Device Architecture 2.0" */
 #define UPNP_VERSION_STRING "UPnP/2.0"
 #endif
+#define UPNP_VERSION_STRING "UPnP/" UPNP_VERSION_MAJOR_STR "." UPNP_VERSION_MINOR_STR
 
 /* server: HTTP header returned in all HTTP responses : */
 #define MINIUPNPD_SERVER_STRING	OS_VERSION " " UPNP_VERSION_STRING " MiniUPnPd/" MINIUPNPD_VERSION