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

reorder elements in XML descriptions to follow UDA 1.1

This commit is contained in:
Thomas Bernard 2016-02-16 10:55:48 +01:00
parent 13a6a38241
commit 22f7836816
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
miniupnpd/upnpdescgen.c
View File

@ -237,9 +237,9 @@ static const struct XMLElt rootDesc[] =
"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1"}, "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1"},
/*{"/serviceId", "urn:upnp-org:serviceId:WANCommonInterfaceConfig"}, */ /*{"/serviceId", "urn:upnp-org:serviceId:WANCommonInterfaceConfig"}, */
{"/serviceId", "urn:upnp-org:serviceId:WANCommonIFC1"}, /* required */ {"/serviceId", "urn:upnp-org:serviceId:WANCommonIFC1"}, /* required */
{"/SCPDURL", WANCFG_PATH},
{"/controlURL", WANCFG_CONTROLURL}, {"/controlURL", WANCFG_CONTROLURL},
{"/eventSubURL", WANCFG_EVENTURL}, {"/eventSubURL", WANCFG_EVENTURL},
{"/SCPDURL", WANCFG_PATH},
/* 38 */ /* 38 */
{"device", INITHELPER(39,12)}, {"device", INITHELPER(39,12)},
/* 39 */ /* 39 */
@ -268,16 +268,16 @@ static const struct XMLElt rootDesc[] =
/* urn:schemas-upnp-org:service:WANIPConnection:2 for v2 */ /* urn:schemas-upnp-org:service:WANIPConnection:2 for v2 */
{"/serviceId", SERVICE_ID_WANIPC}, {"/serviceId", SERVICE_ID_WANIPC},
/* urn:upnp-org:serviceId:WANIPConn1 or 2 */ /* urn:upnp-org:serviceId:WANIPConn1 or 2 */
{"/SCPDURL", WANIPC_PATH},
{"/controlURL", WANIPC_CONTROLURL}, {"/controlURL", WANIPC_CONTROLURL},
{"/eventSubURL", WANIPC_EVENTURL}, {"/eventSubURL", WANIPC_EVENTURL},
{"/SCPDURL", WANIPC_PATH},
#ifdef ENABLE_6FC_SERVICE #ifdef ENABLE_6FC_SERVICE
/* 58 */ /* 58 */
{"/serviceType", "urn:schemas-upnp-org:service:WANIPv6FirewallControl:1"}, {"/serviceType", "urn:schemas-upnp-org:service:WANIPv6FirewallControl:1"},
{"/serviceId", "urn:upnp-org:serviceId:WANIPv6Firewall1"}, {"/serviceId", "urn:upnp-org:serviceId:WANIPv6Firewall1"},
{"/SCPDURL", WANIP6FC_PATH},
{"/controlURL", WANIP6FC_CONTROLURL}, {"/controlURL", WANIP6FC_CONTROLURL},
{"/eventSubURL", WANIP6FC_EVENTURL}, {"/eventSubURL", WANIP6FC_EVENTURL},
{"/SCPDURL", WANIP6FC_PATH},
#endif #endif
/* 58 / 63 = SERVICES_OFFSET*/ /* 58 / 63 = SERVICES_OFFSET*/
#if defined(HAS_DUMMY_SERVICE) || defined(ENABLE_L3F_SERVICE) || defined(ENABLE_DP_SERVICE) #if defined(HAS_DUMMY_SERVICE) || defined(ENABLE_L3F_SERVICE) || defined(ENABLE_DP_SERVICE)
@ -288,17 +288,17 @@ static const struct XMLElt rootDesc[] =
/* 60 / 65 = SERVICES_OFFSET+2 */ /* 60 / 65 = SERVICES_OFFSET+2 */
{"/serviceType", "urn:schemas-dummy-com:service:Dummy:1"}, {"/serviceType", "urn:schemas-dummy-com:service:Dummy:1"},
{"/serviceId", "urn:dummy-com:serviceId:dummy1"}, {"/serviceId", "urn:dummy-com:serviceId:dummy1"},
{"/SCPDURL", DUMMY_PATH},
{"/controlURL", "/dummy"}, {"/controlURL", "/dummy"},
{"/eventSubURL", "/dummy"}, {"/eventSubURL", "/dummy"},
{"/SCPDURL", DUMMY_PATH},
#endif #endif
#ifdef ENABLE_L3F_SERVICE #ifdef ENABLE_L3F_SERVICE
/* 60 / 65 = SERVICES_OFFSET+2 */ /* 60 / 65 = SERVICES_OFFSET+2 */
{"/serviceType", "urn:schemas-upnp-org:service:Layer3Forwarding:1"}, {"/serviceType", "urn:schemas-upnp-org:service:Layer3Forwarding:1"},
{"/serviceId", "urn:upnp-org:serviceId:L3Forwarding1"}, {"/serviceId", "urn:upnp-org:serviceId:L3Forwarding1"},
{"/SCPDURL", L3F_PATH},
{"/controlURL", L3F_CONTROLURL}, /* The Layer3Forwarding service is only */ {"/controlURL", L3F_CONTROLURL}, /* The Layer3Forwarding service is only */
{"/eventSubURL", L3F_EVENTURL}, /* recommended, not mandatory */ {"/eventSubURL", L3F_EVENTURL}, /* recommended, not mandatory */
{"/SCPDURL", L3F_PATH},
#endif #endif
#ifdef ENABLE_DP_SERVICE #ifdef ENABLE_DP_SERVICE
/* InternetGatewayDevice v2 : /* InternetGatewayDevice v2 :
@ -309,9 +309,9 @@ static const struct XMLElt rootDesc[] =
/* 65 / 70 = SERVICES_OFFSET+7 */ /* 65 / 70 = SERVICES_OFFSET+7 */
{"/serviceType", "urn:schemas-upnp-org:service:DeviceProtection:1"}, {"/serviceType", "urn:schemas-upnp-org:service:DeviceProtection:1"},
{"/serviceId", "urn:upnp-org:serviceId:DeviceProtection1"}, {"/serviceId", "urn:upnp-org:serviceId:DeviceProtection1"},
{"/SCPDURL", DP_PATH},
{"/controlURL", DP_CONTROLURL}, {"/controlURL", DP_CONTROLURL},
{"/eventSubURL", DP_EVENTURL}, {"/eventSubURL", DP_EVENTURL},
{"/SCPDURL", DP_PATH},
#endif #endif
{0, 0} {0, 0}
}; };
@ -1112,6 +1112,14 @@ genServiceDesc(int * len, const struct serviceDesc * s)
str = strcat_str(str, len, &tmplen, "</name><dataType>"); str = strcat_str(str, len, &tmplen, "</name><dataType>");
str = strcat_str(str, len, &tmplen, upnptypes[vars[i].itype & 0x0f]); str = strcat_str(str, len, &tmplen, upnptypes[vars[i].itype & 0x0f]);
str = strcat_str(str, len, &tmplen, "</dataType>"); str = strcat_str(str, len, &tmplen, "</dataType>");
/*if(vars[i].defaultValue) */
if(vars[i].idefault)
{
str = strcat_str(str, len, &tmplen, "<defaultValue>");
/*str = strcat_str(str, len, &tmplen, vars[i].defaultValue); */
str = strcat_str(str, len, &tmplen, upnpdefaultvalues[vars[i].idefault]);
str = strcat_str(str, len, &tmplen, "</defaultValue>");
}
if(vars[i].iallowedlist) if(vars[i].iallowedlist)
{ {
if((vars[i].itype & 0x0f) == 0) if((vars[i].itype & 0x0f) == 0)
@ -1134,14 +1142,6 @@ genServiceDesc(int * len, const struct serviceDesc * s)
str = strcat_str(str, len, &tmplen, "</maximum></allowedValueRange>"); str = strcat_str(str, len, &tmplen, "</maximum></allowedValueRange>");
} }
} }
/*if(vars[i].defaultValue) */
if(vars[i].idefault)
{
str = strcat_str(str, len, &tmplen, "<defaultValue>");
/*str = strcat_str(str, len, &tmplen, vars[i].defaultValue); */
str = strcat_str(str, len, &tmplen, upnpdefaultvalues[vars[i].idefault]);
str = strcat_str(str, len, &tmplen, "</defaultValue>");
}
str = strcat_str(str, len, &tmplen, "</stateVariable>"); str = strcat_str(str, len, &tmplen, "</stateVariable>");
/*str = strcat_char(str, len, &tmplen, '\n'); // TEMP ! */ /*str = strcat_char(str, len, &tmplen, '\n'); // TEMP ! */
i++; i++;