From ee0815ac85d755942f420d67c1d3590eb2dd12c5 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Fri, 28 Sep 2012 11:05:34 +0200
Subject: [PATCH] miniupnpd: UPC must be a 12 decimal digit code

---
 miniupnpd/Changelog.txt     |  1 +
 miniupnpd/upnpdescgen.c     | 14 +++++++-------
 miniupnpd/upnpdescstrings.h |  8 +++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/miniupnpd/Changelog.txt b/miniupnpd/Changelog.txt
index a1eb84f..79b519d 100644
--- a/miniupnpd/Changelog.txt
+++ b/miniupnpd/Changelog.txt
@@ -3,6 +3,7 @@ $Id: Changelog.txt,v 1.309 2012/09/27 16:01:10 nanard Exp $
 2012/09/27:
   Fixes with DISABLE_CONFIG_FILE
   and UPNP_STRICT
+  UPC must be a 12 decimal digit code
 
 2012/09/20:
   Cleaning code in ipfw (Jardel Weyrich)
diff --git a/miniupnpd/upnpdescgen.c b/miniupnpd/upnpdescgen.c
index b7b53a5..ec42f76 100644
--- a/miniupnpd/upnpdescgen.c
+++ b/miniupnpd/upnpdescgen.c
@@ -1,4 +1,4 @@
-/* $Id: upnpdescgen.c,v 1.67 2012/04/30 14:03:52 nanard Exp $ */
+/* $Id: upnpdescgen.c,v 1.69 2012/09/27 12:01:58 nanard Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * (c) 2006-2012 Thomas Bernard
@@ -202,7 +202,7 @@ static const struct XMLElt rootDesc[] =
 	{"/modelURL", WANDEV_MODELURL},
 	{"/serialNumber", serialnumber},
 	{"/UDN", uuidvalue},
-	{"/UPC", WANDEV_UPC},
+	{"/UPC", WANDEV_UPC},	/* UPC (=12 digit barcode) is optional */
 /* 30 */
 	{"serviceList", INITHELPER(32,1)},
 	{"deviceList", INITHELPER(38,1)},
@@ -230,7 +230,7 @@ static const struct XMLElt rootDesc[] =
 	{"/modelURL", WANCDEV_MODELURL},
 	{"/serialNumber", serialnumber},
 	{"/UDN", uuidvalue},
-	{"/UPC", WANCDEV_UPC},
+	{"/UPC", WANCDEV_UPC},	/* UPC (=12 digit Barcode) is optional */
 #ifdef ENABLE_6FC_SERVICE
 	{"serviceList", INITHELPER(51,2)},
 #else
@@ -423,15 +423,15 @@ static const struct action WANIPCnActions[] =
 	{"SetConnectionType", SetConnectionTypeArgs}, /* R */
 	{"GetConnectionTypeInfo", GetConnectionTypeInfoArgs}, /* R */
 	{"RequestConnection", 0}, /* R */
-	{"RequestTermination", 0}, /* O */
+	/*{"RequestTermination", 0},*/ /* O */
 	{"ForceTermination", 0}, /* R */
 	/*{"SetAutoDisconnectTime", 0},*/ /* O */
 	/*{"SetIdleDisconnectTime", 0},*/ /* O */
 	/*{"SetWarnDisconnectDelay", 0}, */ /* O */
 	{"GetStatusInfo", GetStatusInfoArgs}, /* R */
-	/*GetAutoDisconnectTime*/
-	/*GetIdleDisconnectTime*/
-	/*GetWarnDisconnectDelay*/
+	/*GetAutoDisconnectTime*/ /* O */
+	/*GetIdleDisconnectTime*/ /* O */
+	/*GetWarnDisconnectDelay*/ /* O */
 	{"GetNATRSIPStatus", GetNATRSIPStatusArgs}, /* R */
 	{"GetGenericPortMappingEntry", GetGenericPortMappingEntryArgs}, /* R */
 	{"GetSpecificPortMappingEntry", GetSpecificPortMappingEntryArgs}, /* R */
diff --git a/miniupnpd/upnpdescstrings.h b/miniupnpd/upnpdescstrings.h
index d2b2868..2525a21 100644
--- a/miniupnpd/upnpdescstrings.h
+++ b/miniupnpd/upnpdescstrings.h
@@ -1,4 +1,4 @@
-/* $Id: upnpdescstrings.h,v 1.6 2012/02/04 23:05:21 nanard Exp $ */
+/* $Id: upnpdescstrings.h,v 1.8 2012/09/27 16:00:10 nanard Exp $ */
 /* miniupnp project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
  * (c) 2006-2012 Thomas Bernard
@@ -24,7 +24,8 @@
 #define WANDEV_MODELDESCRIPTION		"WAN Device"
 #define WANDEV_MODELNUMBER			UPNP_VERSION
 #define WANDEV_MODELURL				"http://miniupnp.free.fr/"
-#define WANDEV_UPC					"MINIUPNPD"
+#define WANDEV_UPC					"000000000000"
+/* UPC is 12 digit (barcode) */
 
 #define WANCDEV_FRIENDLYNAME		"WANConnectionDevice"
 #define WANCDEV_MANUFACTURER		WANDEV_MANUFACTURER
@@ -33,7 +34,8 @@
 #define WANCDEV_MODELDESCRIPTION	"MiniUPnP daemon"
 #define WANCDEV_MODELNUMBER			UPNP_VERSION
 #define WANCDEV_MODELURL			"http://miniupnp.free.fr/"
-#define WANCDEV_UPC					"MINIUPNPD"
+#define WANCDEV_UPC					"000000000000"
+/* UPC is 12 digit (barcode) */
 
 #endif