status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpd: UPC must be a 12 decimal digit code

This commit is contained in:
Thomas Bernard 2012-09-28 11:05:34 +02:00
parent 840031dea7
commit ee0815ac85
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
miniupnpd/Changelog.txt
View File

@ -3,6 +3,7 @@ $Id: Changelog.txt,v 1.309 2012/09/27 16:01:10 nanard Exp $
2012/09/27: 2012/09/27:
Fixes with DISABLE_CONFIG_FILE Fixes with DISABLE_CONFIG_FILE
and UPNP_STRICT and UPNP_STRICT
UPC must be a 12 decimal digit code
2012/09/20: 2012/09/20:
Cleaning code in ipfw (Jardel Weyrich) Cleaning code in ipfw (Jardel Weyrich)

14
miniupnpd/upnpdescgen.c
View File

@ -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 /* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2012 Thomas Bernard * (c) 2006-2012 Thomas Bernard
@ -202,7 +202,7 @@ static const struct XMLElt rootDesc[] =
{"/modelURL", WANDEV_MODELURL}, {"/modelURL", WANDEV_MODELURL},
{"/serialNumber", serialnumber}, {"/serialNumber", serialnumber},
{"/UDN", uuidvalue}, {"/UDN", uuidvalue},
{"/UPC", WANDEV_UPC}, {"/UPC", WANDEV_UPC}, /* UPC (=12 digit barcode) is optional */
/* 30 */ /* 30 */
{"serviceList", INITHELPER(32,1)}, {"serviceList", INITHELPER(32,1)},
{"deviceList", INITHELPER(38,1)}, {"deviceList", INITHELPER(38,1)},
@ -230,7 +230,7 @@ static const struct XMLElt rootDesc[] =
{"/modelURL", WANCDEV_MODELURL}, {"/modelURL", WANCDEV_MODELURL},
{"/serialNumber", serialnumber}, {"/serialNumber", serialnumber},
{"/UDN", uuidvalue}, {"/UDN", uuidvalue},
{"/UPC", WANCDEV_UPC}, {"/UPC", WANCDEV_UPC}, /* UPC (=12 digit Barcode) is optional */
#ifdef ENABLE_6FC_SERVICE #ifdef ENABLE_6FC_SERVICE
{"serviceList", INITHELPER(51,2)}, {"serviceList", INITHELPER(51,2)},
#else #else
@ -423,15 +423,15 @@ static const struct action WANIPCnActions[] =
{"SetConnectionType", SetConnectionTypeArgs}, /* R */ {"SetConnectionType", SetConnectionTypeArgs}, /* R */
{"GetConnectionTypeInfo", GetConnectionTypeInfoArgs}, /* R */ {"GetConnectionTypeInfo", GetConnectionTypeInfoArgs}, /* R */
{"RequestConnection", 0}, /* R */ {"RequestConnection", 0}, /* R */
{"RequestTermination", 0}, /* O */ /*{"RequestTermination", 0},*/ /* O */
{"ForceTermination", 0}, /* R */ {"ForceTermination", 0}, /* R */
/*{"SetAutoDisconnectTime", 0},*/ /* O */ /*{"SetAutoDisconnectTime", 0},*/ /* O */
/*{"SetIdleDisconnectTime", 0},*/ /* O */ /*{"SetIdleDisconnectTime", 0},*/ /* O */
/*{"SetWarnDisconnectDelay", 0}, */ /* O */ /*{"SetWarnDisconnectDelay", 0}, */ /* O */
{"GetStatusInfo", GetStatusInfoArgs}, /* R */ {"GetStatusInfo", GetStatusInfoArgs}, /* R */
/*GetAutoDisconnectTime*/ /*GetAutoDisconnectTime*/ /* O */
/*GetIdleDisconnectTime*/ /*GetIdleDisconnectTime*/ /* O */
/*GetWarnDisconnectDelay*/ /*GetWarnDisconnectDelay*/ /* O */
{"GetNATRSIPStatus", GetNATRSIPStatusArgs}, /* R */ {"GetNATRSIPStatus", GetNATRSIPStatusArgs}, /* R */
{"GetGenericPortMappingEntry", GetGenericPortMappingEntryArgs}, /* R */ {"GetGenericPortMappingEntry", GetGenericPortMappingEntryArgs}, /* R */
{"GetSpecificPortMappingEntry", GetSpecificPortMappingEntryArgs}, /* R */ {"GetSpecificPortMappingEntry", GetSpecificPortMappingEntryArgs}, /* R */

8
miniupnpd/upnpdescstrings.h
View File

@ -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 /* miniupnp project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2012 Thomas Bernard * (c) 2006-2012 Thomas Bernard
@ -24,7 +24,8 @@
#define WANDEV_MODELDESCRIPTION "WAN Device" #define WANDEV_MODELDESCRIPTION "WAN Device"
#define WANDEV_MODELNUMBER UPNP_VERSION #define WANDEV_MODELNUMBER UPNP_VERSION
#define WANDEV_MODELURL "http://miniupnp.free.fr/" #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_FRIENDLYNAME "WANConnectionDevice"
#define WANCDEV_MANUFACTURER WANDEV_MANUFACTURER #define WANCDEV_MANUFACTURER WANDEV_MANUFACTURER
@ -33,7 +34,8 @@
#define WANCDEV_MODELDESCRIPTION "MiniUPnP daemon" #define WANCDEV_MODELDESCRIPTION "MiniUPnP daemon"
#define WANCDEV_MODELNUMBER UPNP_VERSION #define WANCDEV_MODELNUMBER UPNP_VERSION
#define WANCDEV_MODELURL "http://miniupnp.free.fr/" #define WANCDEV_MODELURL "http://miniupnp.free.fr/"
#define WANCDEV_UPC "MINIUPNPD" #define WANCDEV_UPC "000000000000"
/* UPC is 12 digit (barcode) */
#endif #endif