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

Merge branch 'desc_test'

This commit is contained in:
Thomas Bernard 2015-12-15 10:57:14 +01:00
parent 9e31ceb630 76a5f9930b
commit 0139addbda
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
miniupnpd/upnpdescgen.c
View File

@ -48,6 +48,10 @@ static const char * const upnpdefaultvalues[] =
0, 0,
"IP_Routed"/*"Unconfigured"*/, /* 1 default value for ConnectionType */ "IP_Routed"/*"Unconfigured"*/, /* 1 default value for ConnectionType */
"3600", /* 2 default value for PortMappingLeaseDuration */ "3600", /* 2 default value for PortMappingLeaseDuration */
"Unconfigured", /* 3 default value for ConnectionStatus */
"0", /* 4 default value for RSIPAvailable */
"1", /* 5 default value for NATEnabled */
"ERROR_NONE", /* 6 default value for LastConnectionError */
}; };
static const char * const upnpallowedvalues[] = static const char * const upnpallowedvalues[] =
@ -487,24 +491,30 @@ static const struct action WANIPCnActions[] =
/* ignore "warning: missing initializer" */ /* ignore "warning: missing initializer" */
#pragma GCC diagnostic ignored "-Wmissing-field-initializers" #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
/* struct stateVar :
* {name, itype(&event), idefault, iallowedlist, ieventvalue} */
static const struct stateVar WANIPCnVars[] = static const struct stateVar WANIPCnVars[] =
{ {
/* 0 */ /* 0 */
#if 0 #if 0
{"ConnectionType", 0, 0/*1*/}, /* required */ {"ConnectionType", 0, 0/*1*/}, /* required */
{"PossibleConnectionTypes", 0|0x80, 0, 14, 15}, {"PossibleConnectionTypes", 0|0x80, 0, 14, 15},
#endif #elif 0
{"ConnectionType", 0, 1, 14, 15}, /* required */ {"ConnectionType", 0, 1, 14, 15}, /* required */
{"PossibleConnectionTypes", 0|0x80, 0, 0, 15}, {"PossibleConnectionTypes", 0|0x80, 0, 0, 15},
#else
{"ConnectionType", 0, 1, 0, 15}, /* required */
{"PossibleConnectionTypes", 0|0x80, 0, 14, 15},
#endif
/* Required /* Required
* Allowed values : Unconfigured / IP_Routed / IP_Bridged */ * Allowed values : Unconfigured / IP_Routed / IP_Bridged */
{"ConnectionStatus", 0|0x80, 0/*1*/, 18, {"ConnectionStatus", 0|0x80, 3, 18,
CONNECTIONSTATUS_MAGICALVALUE }, /* required */ CONNECTIONSTATUS_MAGICALVALUE }, /* required */
/* Allowed Values : Unconfigured / Connecting(opt) / Connected /* Allowed Values : Unconfigured / Connecting(opt) / Connected
* PendingDisconnect(opt) / Disconnecting (opt) * PendingDisconnect(opt) / Disconnecting (opt)
* Disconnected */ * Disconnected */
{"Uptime", 3, 0}, /* Required */ {"Uptime", 3, 0}, /* Required */
{"LastConnectionError", 0, 0, 25}, /* required : */ {"LastConnectionError", 0, 6, 25}, /* required : */
/* Allowed Values : ERROR_NONE(req) / ERROR_COMMAND_ABORTED(opt) /* Allowed Values : ERROR_NONE(req) / ERROR_COMMAND_ABORTED(opt)
* ERROR_NOT_ENABLED_FOR_INTERNET(opt) * ERROR_NOT_ENABLED_FOR_INTERNET(opt)
* ERROR_USER_DISCONNECT(opt) * ERROR_USER_DISCONNECT(opt)
@ -514,8 +524,8 @@ static const struct stateVar WANIPCnVars[] =
* ERROR_NO_CARRIER(opt) * ERROR_NO_CARRIER(opt)
* ERROR_IP_CONFIGURATION(opt) * ERROR_IP_CONFIGURATION(opt)
* ERROR_UNKNOWN(opt) */ * ERROR_UNKNOWN(opt) */
{"RSIPAvailable", 1, 0}, /* required */ {"RSIPAvailable", 1, 4}, /* required */
{"NATEnabled", 1, 0}, /* required */ {"NATEnabled", 1, 5}, /* required */
{"ExternalIPAddress", 0|0x80, 0, 0, {"ExternalIPAddress", 0|0x80, 0, 0,
EXTERNALIPADDRESS_MAGICALVALUE}, /* required. Default : empty string */ EXTERNALIPADDRESS_MAGICALVALUE}, /* required. Default : empty string */
{"PortMappingNumberOfEntries", 2|0x80, 0, 0, {"PortMappingNumberOfEntries", 2|0x80, 0, 0,