From a1f7ce98cf2fd194d6024585acfa06e41f6c71bf Mon Sep 17 00:00:00 2001 From: Amin Ben Ramdhane Date: Fri, 13 Mar 2020 16:28:32 +0100 Subject: [PATCH] Ticket refs #1254: Improvement validation parameters --- bin/Makefile.am | 10 +- configure.ac | 6 + dmtree/tr104/voice_services.c | 68 +- dmtree/tr143/diagnostics.c | 106 +- dmtree/tr157/bulkdata.c | 48 +- dmtree/tr157/softwaremodules.c | 6 +- dmtree/tr181/atm.c | 8 +- dmtree/tr181/bridging.c | 30 +- dmtree/tr181/device.c | 2 +- dmtree/tr181/deviceinfo.c | 6 +- dmtree/tr181/dhcpv4.c | 60 +- dmtree/tr181/dhcpv6.c | 26 +- dmtree/tr181/dns.c | 24 +- dmtree/tr181/dsl.c | 6 +- dmtree/tr181/dynamicdns.c | 32 +- dmtree/tr181/ethernet.c | 20 +- dmtree/tr181/firewall.c | 40 +- dmtree/tr181/gre.c | 6 +- dmtree/tr181/interfacestack.c | 2 +- dmtree/tr181/ip.c | 42 +- dmtree/tr181/managementserver.c | 42 +- dmtree/tr181/nat.c | 22 +- dmtree/tr181/ppp.c | 12 +- dmtree/tr181/ptm.c | 2 +- dmtree/tr181/qos.c | 216 +- dmtree/tr181/routing.c | 26 +- dmtree/tr181/security.c | 2 +- dmtree/tr181/times.c | 4 +- dmtree/tr181/usb.c | 8 +- dmtree/tr181/userinterface.c | 4 +- dmtree/tr181/users.c | 8 +- dmtree/tr181/wifi.c | 90 +- dmtree/tr181/x_iopsys_eu_buttons.c | 2 +- dmtree/tr181/x_iopsys_eu_dropbear.c | 2 +- dmtree/tr181/x_iopsys_eu_ipacccfg.c | 4 +- dmtree/tr181/xmpp.c | 28 +- json/convertor_json_to_c.py | 114 +- json/tr104.json | 1460 ++- json/tr181.json | 13966 ++++++++++++++++---------- libbbf_api/dmbbf.c | 2 +- libbbf_api/dmcommon.c | 408 +- libbbf_api/dmcommon.h | 32 +- tools/generate_json.py | 89 +- 43 files changed, 10438 insertions(+), 6653 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 4c31a2c4..0c9da6a7 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -2,7 +2,6 @@ LIB_BBFDM_VERSION = 3:0:0 lib_LTLIBRARIES = libbbf_api.la - libbbf_api_la_SOURCES = \ ../libbbf_api/dmbbf.c \ ../libbbf_api/dmubus.c \ @@ -32,7 +31,6 @@ libbbf_api_la_LIBADD = \ $(LIBJSON_LIBS) \ $(LBLOBMSG_LIBS) - lib_LTLIBRARIES += libbbfdm.la libbbfdm_la_SOURCES = \ @@ -120,17 +118,17 @@ libbbfdm_la_CFLAGS = \ $(LIBUCI_CFLAGS) \ $(LIBUBOX_CFLAGS) \ $(LIBUBUS_CFLAGS) \ - -Wall + -Wall -Werror libbbfdm_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(LIBUCI_LDFLAGS) \ $(LIBUBOX_LDFLAGS) \ $(LIBUBUS_LDFLAGS) \ + $(LIBOPENSSL_LIBS) \ + $(LIBMBETLS_LIBS) \ -share \ - -version-info $(LIB_BBFDM_VERSION) \ - -lssl \ - -lmbedtls + -version-info $(LIB_BBFDM_VERSION) libbbfdm_la_LIBADD = \ $(AM_LIBS) \ diff --git a/configure.ac b/configure.ac index 0e6dcd8e..a4b3873d 100644 --- a/configure.ac +++ b/configure.ac @@ -85,6 +85,12 @@ AC_SUBST([LBLOBMSG_LIBS]) LIBDLOPEN_LIBS='-ldl' AC_SUBST([LIBDLOPEN_LIBS]) +LIBOPENSSL_LIBS='-lssl' +AC_SUBST([LIBOPENSSL_LIBS]) + +LIBMBETLS_LIBS='-lmbedtls' +AC_SUBST([LIBMBETLS_LIBS]) + # checks for header files AC_CHECK_HEADERS([stdlib.h string.h]) diff --git a/dmtree/tr104/voice_services.c b/dmtree/tr104/voice_services.c index 00e6bfb6..9d819eee 100644 --- a/dmtree/tr104/voice_services.c +++ b/dmtree/tr104/voice_services.c @@ -681,7 +681,7 @@ static int set_voice_profile_enable(char *refparam, struct dmctx *ctx, void *dat switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, ProfileEnable, NULL)) + if (dm_validate_string(value, -1, -1, ProfileEnable, 3, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -732,7 +732,7 @@ static int set_voice_profile_signaling_protocol(char *refparam, struct dmctx *ct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -785,7 +785,7 @@ static int set_voice_profile_sip_proxyserver(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -810,7 +810,7 @@ static int set_sip_proxy_server_transport(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -835,7 +835,7 @@ static int set_voice_profile_sip_registerserver(char *refparam, struct dmctx *ct switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -860,7 +860,7 @@ static int set_voice_profile_sip_registerserverport(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -885,7 +885,7 @@ static int set_sip_registrar_server_transport(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -910,7 +910,7 @@ static int set_sip_user_agent_domain(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -931,7 +931,7 @@ static int set_sip_user_agent_port(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -960,7 +960,7 @@ static int set_sip_user_agent_transport(char *refparam, struct dmctx *ctx, void struct sip_args *sipargs = (struct sip_args *)data; switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -986,7 +986,7 @@ static int set_sip_outbound_proxy(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1010,7 +1010,7 @@ static int set_sip_outbound_proxy_port(char *refparam, struct dmctx *ctx, void * struct sip_args *sipargs = (struct sip_args *)data; switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1031,7 +1031,7 @@ static int set_sip_registration_period(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1052,7 +1052,7 @@ static int set_sip_re_invite_expires(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1107,7 +1107,7 @@ static int set_voice_profile_sip_dtmfmethod(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", DTMFMethod, NULL)) + if (dm_validate_string(value, -1, 64, DTMFMethod, 3, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1142,7 +1142,7 @@ static int set_sip_profile_region(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1174,7 +1174,7 @@ static int set_voice_service_serviceproviderinfo_name(char *refparam, struct dmc switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1224,7 +1224,7 @@ static int set_voice_service_vp_rtp_portmin(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1251,7 +1251,7 @@ static int set_voice_profile_rtp_localportmax(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1283,7 +1283,7 @@ static int set_voice_service_vp_rtp_dscp(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "63")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","63"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1321,7 +1321,7 @@ static int set_voice_service_vp_rtp_rtcp_txrepeatinterval(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1382,7 +1382,7 @@ static int set_voice_profile_line_enable(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_boolean(value)) + if (dm_validate_string(value, -1, -1, ProfileEnable, 3, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1409,7 +1409,7 @@ static int set_line_directory_number(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "32", NULL, NULL)) + if (dm_validate_string(value, -1, 32, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1636,7 +1636,7 @@ static int set_line_calling_features_caller_id_name(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1688,7 +1688,7 @@ static int set_line_sip_auth_username(char *refparam, struct dmctx *ctx, void *d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "128", NULL, NULL)) + if (dm_validate_string(value, -1, 128, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1704,7 +1704,7 @@ static int set_line_sip_auth_password(char *refparam, struct dmctx *ctx, void *d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "128", NULL, NULL)) + if (dm_validate_string(value, -1, 128, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1735,7 +1735,7 @@ static int set_line_sip_uri(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "389", NULL, NULL)) + if (dm_validate_string(value, -1, 389, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1926,7 +1926,7 @@ static int set_line_codec_list_packetization(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, NULL, NULL, "64", NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, -1, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1981,7 +1981,7 @@ static int set_line_codec_list_priority(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -2038,7 +2038,7 @@ static int set_service_alias(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2061,7 +2061,7 @@ static int set_cap_codec_alias(char *refparam, struct dmctx *ctx, void *data, ch switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2089,7 +2089,7 @@ static int set_voice_profile_alias(char *refparam, struct dmctx *ctx, void *data switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2119,7 +2119,7 @@ static int set_line_alias(char *refparam, struct dmctx *ctx, void *data, char *i switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2141,7 +2141,7 @@ static int set_line_codec_list_alias(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr143/diagnostics.c b/dmtree/tr143/diagnostics.c index 002d0158..44e18594 100644 --- a/dmtree/tr143/diagnostics.c +++ b/dmtree/tr143/diagnostics.c @@ -45,7 +45,7 @@ static int set_ip_ping_diagnostics_state(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DiagnosticsState, NULL)) + if (dm_validate_string(value, -1, -1, DiagnosticsState, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -75,7 +75,7 @@ static int set_ip_ping_interface(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -102,7 +102,7 @@ static int set_ip_ping_protocolversion(char *refparam, struct dmctx *ctx, void * switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, ProtocolVersion, NULL)) + if (dm_validate_string(value, -1, -1, ProtocolVersion, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -129,7 +129,7 @@ static int set_ip_ping_host(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -156,7 +156,7 @@ static int set_ip_ping_repetition_number(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -183,7 +183,7 @@ static int set_ip_ping_timeout(char *refparam, struct dmctx *ctx, void *data, ch switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -211,7 +211,7 @@ static int set_ip_ping_block_size(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -237,7 +237,7 @@ static int set_ip_ping_DSCP(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "63")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","63"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -326,7 +326,7 @@ static int set_IPDiagnosticsTraceRoute_DiagnosticsState(char *refparam, struct d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DiagnosticsState, NULL)) + if (dm_validate_string(value, -1, -1, DiagnosticsState, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -356,7 +356,7 @@ static int set_IPDiagnosticsTraceRoute_Interface(char *refparam, struct dmctx *c switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -383,7 +383,7 @@ static int set_IPDiagnosticsTraceRoute_ProtocolVersion(char *refparam, struct dm switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, ProtocolVersion, NULL)) + if (dm_validate_string(value, -1, -1, ProtocolVersion, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -410,7 +410,7 @@ static int set_IPDiagnosticsTraceRoute_Host(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -437,7 +437,7 @@ static int set_IPDiagnosticsTraceRoute_NumberOfTries(char *refparam, struct dmct switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "3")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","3"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -464,7 +464,7 @@ static int set_IPDiagnosticsTraceRoute_Timeout(char *refparam, struct dmctx *ctx switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -491,7 +491,7 @@ static int set_IPDiagnosticsTraceRoute_DataBlockSize(char *refparam, struct dmct switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -518,7 +518,7 @@ static int set_IPDiagnosticsTraceRoute_DSCP(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "63")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","63"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -545,7 +545,7 @@ static int set_IPDiagnosticsTraceRoute_MaxHopCount(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "64")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","64"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -622,7 +622,7 @@ static int set_IPDiagnosticsDownloadDiagnostics_DiagnosticsState(char *refparam, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DiagnosticsState, NULL)) + if (dm_validate_string(value, -1, -1, DiagnosticsState, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -657,7 +657,7 @@ static int set_IPDiagnosticsDownloadDiagnostics_Interface(char *refparam, struct switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -693,7 +693,7 @@ static int set_IPDiagnosticsDownloadDiagnostics_DownloadURL(char *refparam, stru struct uci_section *curr_section = NULL; switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -732,7 +732,7 @@ static int set_IPDiagnosticsDownloadDiagnostics_DSCP(char *refparam, struct dmct switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "63")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","63"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -759,7 +759,7 @@ static int set_IPDiagnosticsDownloadDiagnostics_EthernetPriority(char *refparam, switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "7")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","7"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -786,7 +786,7 @@ static int set_IPDiagnosticsDownloadDiagnostics_ProtocolVersion(char *refparam, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, ProtocolVersion, NULL)) + if (dm_validate_string(value, -1, -1, ProtocolVersion, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -813,7 +813,7 @@ static int set_IPDiagnosticsDownloadDiagnostics_NumberOfConnections(char *refpar switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1011,7 +1011,7 @@ static int set_IPDiagnosticsUploadDiagnostics_DiagnosticsState(char *refparam, s switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DiagnosticsState, NULL)) + if (dm_validate_string(value, -1, -1, DiagnosticsState, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1046,7 +1046,7 @@ static int set_IPDiagnosticsUploadDiagnostics_Interface(char *refparam, struct d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1083,7 +1083,7 @@ static int set_IPDiagnosticsUploadDiagnostics_UploadURL(char *refparam, struct d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1116,7 +1116,7 @@ static int set_IPDiagnosticsUploadDiagnostics_DSCP(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "63")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","63"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1143,7 +1143,7 @@ static int set_IPDiagnosticsUploadDiagnostics_EthernetPriority(char *refparam, s switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "7")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","7"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1169,7 +1169,7 @@ static int set_IPDiagnosticsUploadDiagnostics_TestFileLength(char *refparam, str struct uci_section *curr_section = NULL; switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1196,7 +1196,7 @@ static int set_IPDiagnosticsUploadDiagnostics_ProtocolVersion(char *refparam, st switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, ProtocolVersion, NULL)) + if (dm_validate_string(value, -1, -1, ProtocolVersion, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1222,7 +1222,7 @@ static int set_IPDiagnosticsUploadDiagnostics_NumberOfConnections(char *refparam struct uci_section *curr_section = NULL; switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1437,7 +1437,7 @@ static int set_IPDiagnosticsUDPEchoConfig_Interface(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1457,7 +1457,7 @@ static int set_IPDiagnosticsUDPEchoConfig_SourceIPAddress(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; return 0; case VALUESET: @@ -1477,7 +1477,7 @@ static int set_IPDiagnosticsUDPEchoConfig_UDPPort(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1589,7 +1589,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_DiagnosticsState(char *refparam, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DiagnosticsState, NULL)) + if (dm_validate_string(value, -1, -1, DiagnosticsState, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1619,7 +1619,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_Interface(char *refparam, struct switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1646,7 +1646,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_Host(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1673,7 +1673,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_Port(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1700,7 +1700,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_NumberOfRepetitions(char *refpara switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1727,7 +1727,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_Timeout(char *refparam, struct dm switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1754,7 +1754,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_DataBlockSize(char *refparam, str switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1781,7 +1781,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_DSCP(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "63")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","63"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1808,7 +1808,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_InterTransmissionTime(char *refpa switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1835,7 +1835,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_ProtocolVersion(char *refparam, s switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, ProtocolVersion, NULL)) + if (dm_validate_string(value, -1, -1, ProtocolVersion, 3, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1906,7 +1906,7 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_DiagnosticsState(char *re switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DiagnosticsState, NULL)) + if (dm_validate_string(value, -1, -1, DiagnosticsState, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1936,7 +1936,7 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_Interface(char *refparam, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1963,7 +1963,7 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_ProtocolVersion(char *ref switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, ProtocolVersion, NULL)) + if (dm_validate_string(value, -1, -1, ProtocolVersion, 3, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1990,7 +1990,7 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_Protocol(char *refparam, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, ServerSelectionProtocol, NULL)) + if (dm_validate_string(value, -1, -1, ServerSelectionProtocol, 2, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2017,7 +2017,7 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_Port(char *refparam, stru switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -2044,7 +2044,7 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_HostList(char *refparam, switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, "10", NULL, NULL, "256", NULL, NULL)) + if (dm_validate_string_list(value, -1, 10, -1, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2071,7 +2071,7 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_NumberOfRepetitions(char switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -2098,7 +2098,7 @@ static int set_IPDiagnosticsServerSelectionDiagnostics_Timeout(char *refparam, s switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr157/bulkdata.c b/dmtree/tr157/bulkdata.c index bc1eecf7..300a99ba 100644 --- a/dmtree/tr157/bulkdata.c +++ b/dmtree/tr157/bulkdata.c @@ -351,7 +351,7 @@ static int set_BulkDataProfile_Alias(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -372,7 +372,7 @@ static int set_BulkDataProfile_Name(char *refparam, struct dmctx *ctx, void *dat { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "255", NULL, NULL)) + if (dm_validate_string(value, -1, 255, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -393,7 +393,7 @@ static int set_BulkDataProfile_NumberOfRetainedFailedReports(char *refparam, str { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -416,7 +416,7 @@ static int set_BulkDataProfile_Protocol(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, BulkDataProtocols, NULL)) + if (dm_validate_string(value, -1, -1, BulkDataProtocols, 3, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -442,7 +442,7 @@ static int set_BulkDataProfile_EncodingType(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, EncodingTypes, NULL)) + if (dm_validate_string(value, -1, -1, EncodingTypes, 4, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -466,7 +466,7 @@ static int set_BulkDataProfile_ReportingInterval(char *refparam, struct dmctx *c { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -542,7 +542,7 @@ static int set_BulkDataProfileParameter_Name(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -563,7 +563,7 @@ static int set_BulkDataProfileParameter_Reference(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -584,7 +584,7 @@ static int set_BulkDataProfileCSVEncoding_FieldSeparator(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -605,7 +605,7 @@ static int set_BulkDataProfileCSVEncoding_RowSeparator(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -627,7 +627,7 @@ static int set_BulkDataProfileCSVEncoding_EscapeCharacter(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -653,7 +653,7 @@ static int set_BulkDataProfileCSVEncoding_ReportFormat(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, CSVReportFormat, NULL)) + if (dm_validate_string(value, -1, -1, CSVReportFormat, 2, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -683,7 +683,7 @@ static int set_BulkDataProfileCSVEncoding_RowTimestamp(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, RowTimestamp, NULL)) + if (dm_validate_string(value, -1, -1, RowTimestamp, 3, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -713,7 +713,7 @@ static int set_BulkDataProfileJSONEncoding_ReportFormat(char *refparam, struct d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, JSONReportFormat, NULL)) + if (dm_validate_string(value, -1, -1, JSONReportFormat, 2, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -743,7 +743,7 @@ static int set_BulkDataProfileJSONEncoding_ReportTimestamp(char *refparam, struc { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, RowTimestamp, NULL)) + if (dm_validate_string(value, -1, -1, RowTimestamp, 3, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -769,7 +769,7 @@ static int set_BulkDataProfileHTTP_URL(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "1024", NULL, NULL)) + if (dm_validate_string(value, -1, 1024, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -790,7 +790,7 @@ static int set_BulkDataProfileHTTP_Username(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -811,7 +811,7 @@ static int set_BulkDataProfileHTTP_Password(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -844,7 +844,7 @@ static int set_BulkDataProfileHTTP_Compression(char *refparam, struct dmctx *ctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -880,7 +880,7 @@ static int set_BulkDataProfileHTTP_Method(char *refparam, struct dmctx *ctx, voi { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -952,7 +952,7 @@ static int set_BulkDataProfileHTTP_RetryMinimumWaitInterval(char *refparam, stru { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -973,7 +973,7 @@ static int set_BulkDataProfileHTTP_RetryIntervalMultiplier(char *refparam, struc { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1000", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1000","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1036,7 +1036,7 @@ static int set_BulkDataProfileHTTPRequestURIParameter_Name(char *refparam, struc { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1057,7 +1057,7 @@ static int set_BulkDataProfileHTTPRequestURIParameter_Reference(char *refparam, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr157/softwaremodules.c b/dmtree/tr157/softwaremodules.c index 2f0921e3..a39752d6 100644 --- a/dmtree/tr157/softwaremodules.c +++ b/dmtree/tr157/softwaremodules.c @@ -240,7 +240,7 @@ static int set_SoftwareModulesExecEnv_Alias(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -398,7 +398,7 @@ static int set_SoftwareModulesDeploymentUnit_Alias(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -567,7 +567,7 @@ static int set_SoftwareModulesExecutionUnit_Alias(char *refparam, struct dmctx * switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/atm.c b/dmtree/tr181/atm.c index 95cb5ea6..9e66d15e 100644 --- a/dmtree/tr181/atm.c +++ b/dmtree/tr181/atm.c @@ -61,7 +61,7 @@ static int set_atm_destination_address(char *refparam, struct dmctx *ctx, void * switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, DestinationAddress)) + if (dm_validate_string(value, -1, 256, NULL, 0, DestinationAddress, 1)) return FAULT_9007; return 0; case VALUESET: @@ -103,7 +103,7 @@ static int set_atm_encapsulation(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, Encapsulation, NULL)) + if (dm_validate_string(value, -1, -1, Encapsulation, 2, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -139,7 +139,7 @@ static int set_atm_link_type(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, LinkType, NULL)) + if (dm_validate_string(value, -1, -1, LinkType, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -312,7 +312,7 @@ static int set_atm_alias(char *refparam, struct dmctx *ctx, void *data, char *in switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/bridging.c b/dmtree/tr181/bridging.c index b3e46815..3bb9ad32 100644 --- a/dmtree/tr181/bridging.c +++ b/dmtree/tr181/bridging.c @@ -380,7 +380,7 @@ static int set_br_standard(char *refparam, struct dmctx *ctx, void *data, char * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, BridgeStandard, NULL)) + if (dm_validate_string(value, -1, -1, BridgeStandard, 3, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -435,7 +435,7 @@ static int set_br_associated_interfaces(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -562,7 +562,7 @@ static int set_br_port_type(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, BridgeType, NULL)) + if (dm_validate_string(value, -1, -1, BridgeType, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -594,7 +594,7 @@ static int set_br_port_default_user_priority(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "7")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","7"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -620,7 +620,7 @@ static int set_br_port_priority_regeneration(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt_list(value, "8", "8", NULL, "0", "7")) + if (dm_validate_unsignedInt_list(value, 8, 8, -1, RANGE_ARGS{{"0","7"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -665,7 +665,7 @@ static int set_br_port_pvid(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_int(value, "1", "4094")) + if (dm_validate_int(value, RANGE_ARGS{{"1","4094"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -709,7 +709,7 @@ static int set_br_port_tpid(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -874,7 +874,7 @@ static int set_br_vlan_name(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -897,7 +897,7 @@ static int set_br_vlan_vid(char *refparam, struct dmctx *ctx, void *data, char * switch (action) { case VALUECHECK: - if (dm_validate_int(value, "1", "4094")) + if (dm_validate_int(value, RANGE_ARGS{{"1","4094"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -953,7 +953,7 @@ static int set_br_alias(char *refparam, struct dmctx *ctx, void *data, char *ins switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -982,7 +982,7 @@ static int set_br_port_alias(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1011,7 +1011,7 @@ static int set_br_vlan_alias(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1339,7 +1339,7 @@ static int set_port_lower_layer(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; get_dmmap_section_of_config_section("dmmap_bridge_port", "bridge_port", section_name(((struct bridging_port_args *)data)->bridge_port_sec), &dmmap_section); dmuci_get_value_by_section_string(dmmap_section, "mg_port", &mg_port); @@ -1423,7 +1423,7 @@ static int set_vlan_port_vlan_ref(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1449,7 +1449,7 @@ static int set_vlan_port_port_ref(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/device.c b/dmtree/tr181/device.c index 0fdca2f5..7bd2448f 100644 --- a/dmtree/tr181/device.c +++ b/dmtree/tr181/device.c @@ -49,6 +49,7 @@ #include "datamodelversion.h" #include "gre.h" #include "dynamicdns.h" +#include "security.h" #ifdef BBF_TR104 #include "voice_services.h" #endif @@ -56,7 +57,6 @@ #include "bulkdata.h" #include "softwaremodules.h" #endif -#include "security.h" /* *** BBFDM *** */ DMOBJ tEntry181Obj[] = { diff --git a/dmtree/tr181/deviceinfo.c b/dmtree/tr181/deviceinfo.c index 95ffd5aa..8955e821 100644 --- a/dmtree/tr181/deviceinfo.c +++ b/dmtree/tr181/deviceinfo.c @@ -210,7 +210,7 @@ static int set_device_provisioningcode(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -372,7 +372,7 @@ static int set_vcf_alias(char *refparam, struct dmctx *ctx, void *data, char *in { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -408,7 +408,7 @@ static int set_vlf_alias(char *refparam, struct dmctx *ctx, void *data, char *in { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/dhcpv4.c b/dmtree/tr181/dhcpv4.c index 58a5d367..664d2988 100644 --- a/dmtree/tr181/dhcpv4.c +++ b/dmtree/tr181/dhcpv4.c @@ -564,7 +564,7 @@ static int set_server_pool_alias(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -609,7 +609,7 @@ static int set_dns_server(char *refparam, struct dmctx *ctx, void *data, char *i switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, "4", NULL, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string_list(value, -1, 4, -1, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -700,7 +700,7 @@ static int set_dhcp_sever_pool_order(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -866,7 +866,7 @@ static int set_dhcp_address_min(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -914,7 +914,7 @@ static int set_dhcp_address_max(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -995,7 +995,7 @@ static int set_dhcp_reserved_addresses(char *refparam, struct dmctx *ctx, void * switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, "32", NULL, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string_list(value, -1, 32, -1, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1061,7 +1061,7 @@ static int set_dhcp_subnetmask(char *refparam, struct dmctx *ctx, void *data, ch switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1088,7 +1088,7 @@ static int set_dhcp_iprouters(char *refparam, struct dmctx *ctx, void *data, cha switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, "4", NULL, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string_list(value, -1, 4, -1, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1172,7 +1172,7 @@ static int set_dhcp_leasetime(char *refparam, struct dmctx *ctx, void *data, cha switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1204,7 +1204,7 @@ static int set_dhcp_interface_linker_parameter(char *refparam, struct dmctx *ctx switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1249,7 +1249,7 @@ static int set_dhcp_domainname(char *refparam, struct dmctx *ctx, void *data, ch switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1287,7 +1287,7 @@ static int set_dhcp_static_alias(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1318,7 +1318,7 @@ static int set_dhcp_staticaddress_chaddr(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "17", NULL, MACAddress)) + if (dm_validate_string(value, -1, 17, NULL, 0, MACAddress, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1343,7 +1343,7 @@ static int set_dhcp_staticaddress_yiaddr(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1448,7 +1448,7 @@ static int set_DHCPv4Client_Alias(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1478,7 +1478,7 @@ static int set_DHCPv4Client_Interface(char *refparam, struct dmctx *ctx, void *d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; if(strlen(value) == 0 || strcmp(value, "") == 0) @@ -1749,7 +1749,7 @@ static int set_DHCPv4ClientSentOption_Alias(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1772,7 +1772,7 @@ static int set_DHCPv4ClientSentOption_Tag(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "254")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","254"}}, 1)) return FAULT_9007; dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v); if (v == NULL) @@ -1810,7 +1810,7 @@ static int set_DHCPv4ClientSentOption_Value(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, "0", "255")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{"0","255"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1881,7 +1881,7 @@ static int set_DHCPv4ClientReqOption_Alias(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1903,7 +1903,7 @@ static int set_DHCPv4ClientReqOption_Tag(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "254")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","254"}}, 1)) return FAULT_9007; dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "reqopts", &v); @@ -2010,7 +2010,7 @@ static int set_DHCPv4ServerPoolOption_Alias(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2035,7 +2035,7 @@ static int set_DHCPv4ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "254")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","254"}}, 1)) return FAULT_9007; dmuci_get_value_by_section_list(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", &dhcp_option_list); @@ -2074,7 +2074,7 @@ static int set_DHCPv4ServerPoolOption_Value(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, "0", "255")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{"0","255"}}, 1)) return FAULT_9007; dmuci_get_value_by_section_list(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", &dhcp_option_list); @@ -2144,7 +2144,7 @@ static int set_DHCPv4RelayForwarding_Alias(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2172,7 +2172,7 @@ static int set_DHCPv4RelayForwarding_Interface(char *refparam, struct dmctx *ctx switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; if (strlen(value) == 0 || strcmp(value, "") == 0) @@ -2222,7 +2222,7 @@ static int set_DHCPv4RelayForwarding_VendorClassID(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "255", NULL, NULL)) + if (dm_validate_string(value, -1, 255, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2269,7 +2269,7 @@ static int set_DHCPv4RelayForwarding_Chaddr(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "17", NULL, MACAddress)) + if (dm_validate_string(value, -1, 17, NULL, 0, MACAddress, 1)) return FAULT_9007; break; case VALUESET: @@ -2314,7 +2314,7 @@ static int set_DHCPv4RelayForwarding_ChaddrMask(char *refparam, struct dmctx *ct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "17", NULL, MACAddress)) + if (dm_validate_string(value, -1, 17, NULL, 0, MACAddress, 1)) return FAULT_9007; break; case VALUESET: @@ -2373,7 +2373,7 @@ static int set_DHCPv4RelayForwarding_UserClassID(char *refparam, struct dmctx *c { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "255")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"255"}}, 1)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/dhcpv6.c b/dmtree/tr181/dhcpv6.c index bd1ebd50..deeee56b 100644 --- a/dmtree/tr181/dhcpv6.c +++ b/dmtree/tr181/dhcpv6.c @@ -515,7 +515,7 @@ static int set_DHCPv6Client_Alias(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -544,7 +544,7 @@ static int set_DHCPv6Client_Interface(char *refparam, struct dmctx *ctx, void *d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; if (strlen(value) == 0 || strcmp(value, "") == 0) { @@ -722,7 +722,7 @@ static int set_DHCPv6Client_RequestedOptions(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt_list(value, NULL, NULL, NULL, NULL, NULL)) + if (dm_validate_unsignedInt_list(value, -1, -1, -1, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -843,7 +843,7 @@ static int set_DHCPv6ServerPool_Alias(char *refparam, struct dmctx *ctx, void *d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -871,7 +871,7 @@ static int set_DHCPv6ServerPool_Order(char *refparam, struct dmctx *ctx, void *d switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -900,7 +900,7 @@ static int set_DHCPv6ServerPool_Interface(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -929,7 +929,7 @@ static int set_DHCPv6ServerPool_VendorClassID(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -956,7 +956,7 @@ static int set_DHCPv6ServerPool_UserClassID(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1005,7 +1005,7 @@ static int set_DHCPv6ServerPool_SourceAddress(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPv6Address)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPv6Address, 1)) return FAULT_9007; break; case VALUESET: @@ -1050,7 +1050,7 @@ static int set_DHCPv6ServerPool_SourceAddressMask(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPv6Address)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPv6Address, 1)) return FAULT_9007; break; case VALUESET: @@ -1243,7 +1243,7 @@ static int set_DHCPv6ServerPoolOption_Alias(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1268,7 +1268,7 @@ static int set_DHCPv6ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; dmuci_get_value_by_section_list(((struct dhcpv6_client_option_args *)data)->client_sect, "dhcp_option", &dhcp_option_list); @@ -1309,7 +1309,7 @@ static int set_DHCPv6ServerPoolOption_Value(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, "0", "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; dmuci_get_value_by_section_list(((struct dhcpv6_client_option_args *)data)->client_sect, "dhcp_option", &dhcp_option_list); diff --git a/dmtree/tr181/dns.c b/dmtree/tr181/dns.c index db0d5ff1..8c0e40f8 100644 --- a/dmtree/tr181/dns.c +++ b/dmtree/tr181/dns.c @@ -595,7 +595,7 @@ static int set_server_alias(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -615,7 +615,7 @@ static int set_server_dns_server(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; break; case VALUESET: @@ -656,7 +656,7 @@ static int set_server_interface(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -730,7 +730,7 @@ static int set_forwarding_alias(char *refparam, struct dmctx *ctx, void *data, c { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -750,7 +750,7 @@ static int set_forwarding_dns_server(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; break; case VALUESET: @@ -791,7 +791,7 @@ static int set_forwarding_interface(char *refparam, struct dmctx *ctx, void *dat switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -820,7 +820,7 @@ static int set_nslookupdiagnostics_diagnostics_state(char *refparam, struct dmct switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DiagnosticsState, NULL)) + if (dm_validate_string(value, -1, -1, DiagnosticsState, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -844,7 +844,7 @@ static int set_nslookupdiagnostics_interface(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -865,7 +865,7 @@ static int set_nslookupdiagnostics_host_name(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -886,7 +886,7 @@ static int set_nslookupdiagnostics_d_n_s_server(char *refparam, struct dmctx *ct switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -907,7 +907,7 @@ static int set_nslookupdiagnostics_timeout(char *refparam, struct dmctx *ctx, vo switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -928,7 +928,7 @@ static int set_nslookupdiagnostics_number_of_repetitions(char *refparam, struct switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/dsl.c b/dmtree/tr181/dsl.c index 0fce81b2..7047925c 100644 --- a/dmtree/tr181/dsl.c +++ b/dmtree/tr181/dsl.c @@ -276,7 +276,7 @@ static int set_DSLLine_Alias(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -302,7 +302,7 @@ static int set_DSLLine_LowerLayers(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -903,7 +903,7 @@ static int set_DSLChannel_Alias(char *refparam, struct dmctx *ctx, void *data, c { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/dynamicdns.c b/dmtree/tr181/dynamicdns.c index fc788da6..2ae9affa 100644 --- a/dmtree/tr181/dynamicdns.c +++ b/dmtree/tr181/dynamicdns.c @@ -408,7 +408,7 @@ static int set_DynamicDNSClient_Alias(char *refparam, struct dmctx *ctx, void *d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -473,7 +473,7 @@ static int set_DynamicDNSClient_Server(char *refparam, struct dmctx *ctx, void * switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -504,7 +504,7 @@ static int set_DynamicDNSClient_Interface(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -529,7 +529,7 @@ static int set_DynamicDNSClient_Username(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -550,7 +550,7 @@ static int set_DynamicDNSClient_Password(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -636,7 +636,7 @@ static int set_DynamicDNSClientHostname_Name(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -702,7 +702,7 @@ static int set_DynamicDNSServer_Enable(char *refparam, struct dmctx *ctx, void * switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -729,7 +729,7 @@ static int set_DynamicDNSServer_Name(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -754,7 +754,7 @@ static int set_DynamicDNSServer_Alias(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -778,7 +778,7 @@ static int set_DynamicDNSServer_ServiceName(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -816,7 +816,7 @@ static int set_DynamicDNSServer_ServerAddress(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -873,7 +873,7 @@ static int set_DynamicDNSServer_ServerPort(char *refparam, struct dmctx *ctx, vo switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -935,7 +935,7 @@ static int set_DynamicDNSServer_Protocol(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, SupportedProtocols, NULL)) + if (dm_validate_string(value, -1, -1, SupportedProtocols, 2, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -972,7 +972,7 @@ static int set_DynamicDNSServer_CheckInterval(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1012,7 +1012,7 @@ static int set_DynamicDNSServer_RetryInterval(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1050,7 +1050,7 @@ static int set_DynamicDNSServer_MaxRetries(char *refparam, struct dmctx *ctx, vo switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/ethernet.c b/dmtree/tr181/ethernet.c index 29418242..ddd2d100 100644 --- a/dmtree/tr181/ethernet.c +++ b/dmtree/tr181/ethernet.c @@ -441,7 +441,7 @@ static int set_EthernetInterface_Alias(char *refparam, struct dmctx *ctx, void * switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -492,7 +492,7 @@ static int set_EthernetInterface_LowerLayers(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -543,7 +543,7 @@ static int set_EthernetInterface_MaxBitRate(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -608,7 +608,7 @@ static int set_EthernetInterface_DuplexMode(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DuplexMode, NULL)) + if (dm_validate_string(value, -1, -1, DuplexMode, 3, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -734,7 +734,7 @@ static int set_EthernetLink_Alias(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -817,7 +817,7 @@ static int set_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -925,7 +925,7 @@ static int set_EthernetVLANTermination_Alias(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -997,7 +997,7 @@ static int set_EthernetVLANTermination_LowerLayers(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1040,7 +1040,7 @@ static int set_EthernetVLANTermination_VLANID(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "4094")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","4094"}}, 1)) return FAULT_9007; return 0; case VALUESET: { @@ -1079,7 +1079,7 @@ static int set_EthernetVLANTermination_TPID(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/firewall.c b/dmtree/tr181/firewall.c index 6e09b2e0..870ab017 100644 --- a/dmtree/tr181/firewall.c +++ b/dmtree/tr181/firewall.c @@ -623,7 +623,7 @@ static int set_firewall_config(char *refparam, struct dmctx *ctx, void *data, ch { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, Config, NULL)) + if (dm_validate_string(value, -1, -1, Config, 4, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -638,7 +638,7 @@ static int set_firewall_advanced_level(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -653,7 +653,7 @@ static int set_level_name(char *refparam, struct dmctx *ctx, void *data, char *i { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -667,7 +667,7 @@ static int set_level_description(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -752,7 +752,7 @@ static int set_chain_name(char *refparam, struct dmctx *ctx, void *data, char *i { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -783,7 +783,7 @@ static int set_rule_order(char *refparam, struct dmctx *ctx, void *data, char *i { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -798,7 +798,7 @@ static int set_rule_description(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -814,7 +814,7 @@ static int set_rule_target(char *refparam, struct dmctx *ctx, void *data, char * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, Target, NULL)) + if (dm_validate_string(value, -1, -1, Target, 5, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -838,7 +838,7 @@ static int set_rule_source_interface(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; adm_entry_get_linker_value(ctx, value, &iface); @@ -869,7 +869,7 @@ static int set_rule_dest_interface(char *refparam, struct dmctx *ctx, void *data switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -893,7 +893,7 @@ static int set_rule_i_p_version(char *refparam, struct dmctx *ctx, void *data, c { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "15")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","15"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -914,7 +914,7 @@ static int set_rule_dest_ip(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; break; case VALUESET: @@ -937,7 +937,7 @@ static int set_rule_dest_mask(char *refparam, struct dmctx *ctx, void *data, cha switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "49", NULL, NULL)) + if (dm_validate_string(value, -1, 49, NULL, 0, IPPrefix, 2)) return FAULT_9007; break; case VALUESET: @@ -959,7 +959,7 @@ static int set_rule_source_ip(char *refparam, struct dmctx *ctx, void *data, cha switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; break; case VALUESET: @@ -982,7 +982,7 @@ static int set_rule_source_mask(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "49", NULL, NULL)) + if (dm_validate_string(value, -1, 49, NULL, 0, IPPrefix, 2)) return FAULT_9007; break; case VALUESET: @@ -1002,7 +1002,7 @@ static int set_rule_protocol(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "255")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","255"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1018,7 +1018,7 @@ static int set_rule_dest_port(char *refparam, struct dmctx *ctx, void *data, cha switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "65535")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1044,7 +1044,7 @@ static int set_rule_dest_port_range_max(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "65535")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1073,7 +1073,7 @@ static int set_rule_source_port(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "65535")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1099,7 +1099,7 @@ static int set_rule_source_port_range_max(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "65535")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/gre.c b/dmtree/tr181/gre.c index d210012c..c0257efd 100644 --- a/dmtree/tr181/gre.c +++ b/dmtree/tr181/gre.c @@ -241,7 +241,7 @@ static int set_GRETunnel_Alias(char *refparam, struct dmctx *ctx, void *data, ch switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -263,7 +263,7 @@ static int set_GRETunnel_KeepAliveThreshold(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -345,7 +345,7 @@ static int set_GRETunnelInterface_Alias(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/interfacestack.c b/dmtree/tr181/interfacestack.c index dcd5b855..2080c458 100644 --- a/dmtree/tr181/interfacestack.c +++ b/dmtree/tr181/interfacestack.c @@ -484,7 +484,7 @@ static int set_InterfaceStack_Alias(char *refparam, struct dmctx *ctx, void *dat switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/ip.c b/dmtree/tr181/ip.c index 50447fc9..0987065d 100644 --- a/dmtree/tr181/ip.c +++ b/dmtree/tr181/ip.c @@ -219,7 +219,7 @@ static int set_IP_ULAPrefix(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "49", NULL, NULL)) + if (dm_validate_string(value, -1, 49, NULL, 0, IPv6Prefix, 1)) return FAULT_9007; break; case VALUESET: @@ -354,7 +354,7 @@ static int set_IPInterface_Router(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -401,7 +401,7 @@ static int set_IPInterface_MaxMTUSize(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "64", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"64","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -568,7 +568,7 @@ static int set_ipv4_address(char *refparam, struct dmctx *ctx, void *data, char switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -606,7 +606,7 @@ static int set_ipv4_netmask(char *refparam, struct dmctx *ctx, void *data, char char *proto; switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -670,7 +670,7 @@ static int set_IPInterface_LowerLayers(char *refparam, struct dmctx *ctx, void * switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -707,7 +707,7 @@ static int set_IPInterfaceIPv6Address_IPAddress(char *refparam, struct dmctx *ct char *proto; switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPv6Address)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPv6Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -788,7 +788,7 @@ static int set_IPInterfaceIPv6Address_Prefix(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -916,7 +916,7 @@ static int set_IPInterfaceIPv6Prefix_Prefix(char *refparam, struct dmctx *ctx, v char *proto; switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "49", NULL, NULL)) + if (dm_validate_string(value, -1, 49, NULL, 0, IPv6Prefix, 1)) return FAULT_9007; return 0; case VALUESET: @@ -955,7 +955,7 @@ static int set_IPInterfaceIPv6Prefix_StaticType(char *refparam, struct dmctx *ct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, StaticType, NULL)) + if (dm_validate_string(value, -1, -1, StaticType, 4, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -979,7 +979,7 @@ static int set_IPInterfaceIPv6Prefix_ParentPrefix(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -998,7 +998,7 @@ static int set_IPInterfaceIPv6Prefix_ChildPrefixBits(char *refparam, struct dmct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "49", NULL, NULL)) + if (dm_validate_string(value, -1, 49, NULL, 0, IPv6Prefix, 1)) return FAULT_9007; break; case VALUESET: @@ -1185,7 +1185,7 @@ static int set_IPInterfaceTWAMPReflector_Alias(char *refparam, struct dmctx *ctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1205,7 +1205,7 @@ static int set_IPInterfaceTWAMPReflector_Port(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1225,7 +1225,7 @@ static int set_IPInterfaceTWAMPReflector_MaximumTTL(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "255")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","255"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1245,7 +1245,7 @@ static int set_IPInterfaceTWAMPReflector_IPAllowedList(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "255", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 255, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1265,7 +1265,7 @@ static int set_IPInterfaceTWAMPReflector_PortAllowedList(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "255", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 255, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1294,6 +1294,8 @@ static int set_IPInterface_Alias(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) + return FAULT_9007; return 0; case VALUESET: get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct ip_args *)data)->ip_sec), &dmmap_section); @@ -1320,6 +1322,8 @@ static int set_ipv4_alias(char *refparam, struct dmctx *ctx, void *data, char *i switch (action) { case VALUECHECK: + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) + return FAULT_9007; return 0; case VALUESET: get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct ip_args *)data)->ip_sec), &dmmap_section); @@ -1350,6 +1354,8 @@ static int set_IPInterfaceIPv6Address_Alias(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) + return FAULT_9007; return 0; case VALUESET: uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6", "ipv6_instance", instance, dmmap_section) { @@ -1384,6 +1390,8 @@ static int set_IPInterfaceIPv6Prefix_Alias(char *refparam, struct dmctx *ctx, vo switch (action) { case VALUECHECK: + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) + return FAULT_9007; return 0; case VALUESET: uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6prefix", "ipv6prefix_instance", instance, dmmap_section) { diff --git a/dmtree/tr181/managementserver.c b/dmtree/tr181/managementserver.c index 7a7c93cb..9d6ae15c 100644 --- a/dmtree/tr181/managementserver.c +++ b/dmtree/tr181/managementserver.c @@ -34,7 +34,7 @@ static int set_management_server_url(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -57,7 +57,7 @@ static int set_management_server_username(char *refparam, struct dmctx *ctx, voi { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -73,7 +73,7 @@ static int set_management_server_passwd(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -127,7 +127,7 @@ static int set_management_server_periodic_inform_interval(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -202,7 +202,7 @@ static int set_management_server_connection_request_username(char *refparam, str { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -218,7 +218,7 @@ static int set_management_server_connection_request_passwd(char *refparam, struc { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -251,7 +251,7 @@ static int set_lwn_protocol_used(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, -1, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -276,7 +276,7 @@ static int set_lwn_host(char *refparam, struct dmctx *ctx, void *data, char *ins { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -298,7 +298,7 @@ static int set_lwn_port(char *refparam, struct dmctx *ctx, void *data, char *ins { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -326,7 +326,7 @@ static int set_management_server_http_compression(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -350,7 +350,7 @@ static int set_management_server_retry_min_wait_interval(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -372,7 +372,7 @@ static int set_management_server_retry_interval_multiplier(char *refparam, struc { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1000", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1000","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -405,7 +405,7 @@ static int set_instance_mode(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, InstanceMode, NULL)) + if (dm_validate_string(value, -1, -1, InstanceMode, 2, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -471,7 +471,7 @@ static int set_stun_server_address(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -492,7 +492,7 @@ static int set_stun_server_port(char *refparam, struct dmctx *ctx, void *data, c { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -513,7 +513,7 @@ static int set_stun_username(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -534,7 +534,7 @@ static int set_stun_password(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -555,7 +555,7 @@ static int set_stun_maximum_keepalive_period(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -576,7 +576,7 @@ static int set_stun_minimum_keepalive_period(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -614,7 +614,7 @@ static int set_management_server_conn_rep_allowed_jabber_id(char *refparam, stru { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, "32", NULL, NULL, "256", NULL, NULL)) + if (dm_validate_string_list(value, -1, 32, -1, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -664,7 +664,7 @@ static int set_management_server_conn_req_xmpp_connection(char *refparam, struct switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/nat.c b/dmtree/tr181/nat.c index be2af768..382415cb 100644 --- a/dmtree/tr181/nat.c +++ b/dmtree/tr181/nat.c @@ -206,7 +206,7 @@ static int set_nat_interface_setting_alias(char *refparam, struct dmctx *ctx, vo switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -246,7 +246,7 @@ static int set_nat_interface_setting_interface(char *refparam, struct dmctx *ctx switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -315,7 +315,7 @@ static int set_nat_port_mapping_alias(char *refparam, struct dmctx *ctx, void *d switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -363,7 +363,7 @@ static int set_nat_port_mapping_interface(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -394,7 +394,7 @@ static int set_nat_port_mapping_remote_host(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -426,7 +426,7 @@ static int set_nat_port_mapping_external_port(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -458,7 +458,7 @@ static int set_nat_port_mapping_external_port_end_range(char *refparam, struct d switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -487,7 +487,7 @@ static int set_nat_port_mapping_internal_port(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -515,7 +515,7 @@ static int set_nat_port_mapping_protocol(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NATProtocol, NULL)) + if (dm_validate_string(value, -1, -1, NATProtocol, 3, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -541,7 +541,7 @@ static int set_nat_port_mapping_internal_client(char *refparam, struct dmctx *ct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -562,7 +562,7 @@ static int set_nat_port_mapping_description(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/ppp.c b/dmtree/tr181/ppp.c index 415377d0..ee4d5897 100644 --- a/dmtree/tr181/ppp.c +++ b/dmtree/tr181/ppp.c @@ -32,7 +32,7 @@ static int set_ppp_alias(char *refparam, struct dmctx *ctx, void *data, char *in switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -177,7 +177,7 @@ static int set_ppp_username(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -192,7 +192,7 @@ static int set_ppp_password(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -293,7 +293,7 @@ static int set_ppp_lower_layer(char *refparam, struct dmctx *ctx, void *data, ch switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -345,7 +345,7 @@ static int set_PPPInterfacePPPoE_ACName(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; dmuci_get_value_by_section_string(((struct uci_section *)data), "proto", &proto); @@ -377,7 +377,7 @@ static int set_PPPInterfacePPPoE_ServiceName(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; dmuci_get_value_by_section_string(((struct uci_section *)data), "proto", &proto); diff --git a/dmtree/tr181/ptm.c b/dmtree/tr181/ptm.c index d8e9bf69..aac33ff8 100644 --- a/dmtree/tr181/ptm.c +++ b/dmtree/tr181/ptm.c @@ -203,7 +203,7 @@ static int set_ptm_alias(char *refparam, struct dmctx *ctx, void *data, char *in switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/qos.c b/dmtree/tr181/qos.c index d70a50f4..3d2dff34 100644 --- a/dmtree/tr181/qos.c +++ b/dmtree/tr181/qos.c @@ -542,7 +542,7 @@ static int set_QoS_DefaultForwardingPolicy(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -562,7 +562,7 @@ static int set_QoS_DefaultTrafficClass(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -582,7 +582,7 @@ static int set_QoS_DefaultPolicer(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -609,7 +609,7 @@ static int set_QoS_DefaultQueue(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -641,7 +641,7 @@ static int set_QoS_DefaultDSCPMark(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -661,7 +661,7 @@ static int set_QoS_DefaultEthernetPriorityMark(char *refparam, struct dmctx *ctx { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -681,7 +681,7 @@ static int set_QoS_DefaultInnerEthernetPriorityMark(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -733,7 +733,7 @@ static int set_QoSClassification_Order(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -756,7 +756,7 @@ static int set_QoSClassification_Alias(char *refparam, struct dmctx *ctx, void * switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -776,7 +776,7 @@ static int set_QoSClassification_DHCPType(char *refparam, struct dmctx *ctx, voi { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DHCPType, NULL)) + if (dm_validate_string(value, -1, -1, DHCPType, 2, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -823,7 +823,7 @@ static int set_QoSClassification_Interface(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -867,7 +867,7 @@ static int set_QoSClassification_DestIP(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; break; case VALUESET: @@ -887,7 +887,7 @@ static int set_QoSClassification_DestMask(char *refparam, struct dmctx *ctx, voi { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "49", NULL, NULL)) + if (dm_validate_string(value, -1, 49, NULL, 0, IPPrefix, 2)) return FAULT_9007; break; case VALUESET: @@ -931,7 +931,7 @@ static int set_QoSClassification_SourceIP(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; break; case VALUESET: @@ -951,7 +951,7 @@ static int set_QoSClassification_SourceMask(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "49", NULL, NULL)) + if (dm_validate_string(value, -1, 49, NULL, 0, IPPrefix, 2)) return FAULT_9007; break; case VALUESET: @@ -994,7 +994,7 @@ static int set_QoSClassification_Protocol(char *refparam, struct dmctx *ctx, voi struct dmmap_dup *p= (struct dmmap_dup*)data; switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "255")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","255"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1038,7 +1038,7 @@ static int set_QoSClassification_DestPort(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "65535")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1062,7 +1062,7 @@ static int set_QoSClassification_DestPortRangeMax(char *refparam, struct dmctx * switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "65535")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1106,7 +1106,7 @@ static int set_QoSClassification_SourcePort(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "65535")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1126,7 +1126,7 @@ static int set_QoSClassification_SourcePortRangeMax(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "65535")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1166,7 +1166,7 @@ static int set_QoSClassification_SourceMACAddress(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "17", NULL, MACAddress)) + if (dm_validate_string(value, -1, 17, NULL, 0, MACAddress, 1)) return FAULT_9007; break; case VALUESET: @@ -1186,7 +1186,7 @@ static int set_QoSClassification_SourceMACMask(char *refparam, struct dmctx *ctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "17", NULL, MACAddress)) + if (dm_validate_string(value, -1, 17, NULL, 0, MACAddress, 1)) return FAULT_9007; break; case VALUESET: @@ -1226,7 +1226,7 @@ static int set_QoSClassification_DestMACAddress(char *refparam, struct dmctx *ct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "17", NULL, MACAddress)) + if (dm_validate_string(value, -1, 17, NULL, 0, MACAddress, 1)) return FAULT_9007; break; case VALUESET: @@ -1246,7 +1246,7 @@ static int set_QoSClassification_DestMACMask(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "17", NULL, MACAddress)) + if (dm_validate_string(value, -1, 17, NULL, 0, MACAddress, 1)) return FAULT_9007; break; case VALUESET: @@ -1286,7 +1286,7 @@ static int set_QoSClassification_Ethertype(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1326,7 +1326,7 @@ static int set_QoSClassification_SSAP(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1366,7 +1366,7 @@ static int set_QoSClassification_DSAP(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1406,7 +1406,7 @@ static int set_QoSClassification_LLCControl(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1446,7 +1446,7 @@ static int set_QoSClassification_SNAPOUI(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1486,7 +1486,7 @@ static int set_QoSClassification_SourceVendorClassID(char *refparam, struct dmct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "255", NULL, NULL)) + if (dm_validate_string(value, -1, 255, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1506,7 +1506,7 @@ static int set_QoSClassification_SourceVendorClassIDv6(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1546,7 +1546,7 @@ static int set_QoSClassification_SourceVendorClassIDMode(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, VendorClassIDMode, NULL)) + if (dm_validate_string(value, -1, -1, VendorClassIDMode, 4, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1566,7 +1566,7 @@ static int set_QoSClassification_DestVendorClassID(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "255", NULL, NULL)) + if (dm_validate_string(value, -1, 255, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1586,7 +1586,7 @@ static int set_QoSClassification_DestVendorClassIDv6(char *refparam, struct dmct { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1626,7 +1626,7 @@ static int set_QoSClassification_DestVendorClassIDMode(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, VendorClassIDMode, NULL)) + if (dm_validate_string(value, -1, -1, VendorClassIDMode, 4, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1646,7 +1646,7 @@ static int set_QoSClassification_SourceClientID(char *refparam, struct dmctx *ct { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1686,7 +1686,7 @@ static int set_QoSClassification_DestClientID(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1726,7 +1726,7 @@ static int set_QoSClassification_SourceUserClassID(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1766,7 +1766,7 @@ static int set_QoSClassification_DestUserClassID(char *refparam, struct dmctx *c { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1806,7 +1806,7 @@ static int set_QoSClassification_SourceVendorSpecificInfo(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1846,7 +1846,7 @@ static int set_QoSClassification_SourceVendorSpecificInfoEnterprise(char *refpar { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1866,7 +1866,7 @@ static int set_QoSClassification_SourceVendorSpecificInfoSubOption(char *refpara { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "0", "255")) + if (dm_validate_int(value, RANGE_ARGS{{"0","255"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1886,7 +1886,7 @@ static int set_QoSClassification_DestVendorSpecificInfo(char *refparam, struct d { switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "65535")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1926,7 +1926,7 @@ static int set_QoSClassification_DestVendorSpecificInfoEnterprise(char *refparam { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1946,7 +1946,7 @@ static int set_QoSClassification_DestVendorSpecificInfoSubOption(char *refparam, { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "0", "255")) + if (dm_validate_int(value, RANGE_ARGS{{"0","255"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2006,7 +2006,7 @@ static int set_QoSClassification_IPLengthMin(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2026,7 +2026,7 @@ static int set_QoSClassification_IPLengthMax(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2066,7 +2066,7 @@ static int set_QoSClassification_DSCPCheck(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "63")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","63"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2110,7 +2110,7 @@ static int set_QoSClassification_DSCPMark(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2130,7 +2130,7 @@ static int set_QoSClassification_EthernetPriorityCheck(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2170,7 +2170,7 @@ static int set_QoSClassification_EthernetPriorityMark(char *refparam, struct dmc { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2190,7 +2190,7 @@ static int set_QoSClassification_InnerEthernetPriorityCheck(char *refparam, stru { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2230,7 +2230,7 @@ static int set_QoSClassification_InnerEthernetPriorityMark(char *refparam, struc { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2250,7 +2250,7 @@ static int set_QoSClassification_EthernetDEICheck(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2290,7 +2290,7 @@ static int set_QoSClassification_VLANIDCheck(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2330,7 +2330,7 @@ static int set_QoSClassification_OutOfBandInfo(char *refparam, struct dmctx *ctx { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2350,7 +2350,7 @@ static int set_QoSClassification_ForwardingPolicy(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2370,7 +2370,7 @@ static int set_QoSClassification_TrafficClass(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2390,7 +2390,7 @@ static int set_QoSClassification_Policer(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2410,7 +2410,7 @@ static int set_QoSClassification_App(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2456,7 +2456,7 @@ static int set_QoSApp_Alias(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2476,7 +2476,7 @@ static int set_QoSApp_ProtocolIdentifier(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2496,7 +2496,7 @@ static int set_QoSApp_Name(char *refparam, struct dmctx *ctx, void *data, char * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2516,7 +2516,7 @@ static int set_QoSApp_DefaultForwardingPolicy(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2536,7 +2536,7 @@ static int set_QoSApp_DefaultTrafficClass(char *refparam, struct dmctx *ctx, voi { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2556,7 +2556,7 @@ static int set_QoSApp_DefaultPolicer(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2576,7 +2576,7 @@ static int set_QoSApp_DefaultDSCPMark(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2596,7 +2596,7 @@ static int set_QoSApp_DefaultEthernetPriorityMark(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2616,7 +2616,7 @@ static int set_QoSApp_DefaultInnerEthernetPriorityMark(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2662,7 +2662,7 @@ static int set_QoSFlow_Alias(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2682,7 +2682,7 @@ static int set_QoSFlow_Type(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2702,7 +2702,7 @@ static int set_QoSFlow_TypeParameters(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2722,7 +2722,7 @@ static int set_QoSFlow_Name(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2742,7 +2742,7 @@ static int set_QoSFlow_App(char *refparam, struct dmctx *ctx, void *data, char * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2762,7 +2762,7 @@ static int set_QoSFlow_ForwardingPolicy(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2782,7 +2782,7 @@ static int set_QoSFlow_TrafficClass(char *refparam, struct dmctx *ctx, void *dat { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2802,7 +2802,7 @@ static int set_QoSFlow_Policer(char *refparam, struct dmctx *ctx, void *data, ch { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2822,7 +2822,7 @@ static int set_QoSFlow_DSCPMark(char *refparam, struct dmctx *ctx, void *data, c { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2842,7 +2842,7 @@ static int set_QoSFlow_EthernetPriorityMark(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2862,7 +2862,7 @@ static int set_QoSFlow_InnerEthernetPriorityMark(char *refparam, struct dmctx *c { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-2", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-2",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2908,7 +2908,7 @@ static int set_QoSPolicer_Alias(char *refparam, struct dmctx *ctx, void *data, c { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2928,7 +2928,7 @@ static int set_QoSPolicer_CommittedRate(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2948,7 +2948,7 @@ static int set_QoSPolicer_CommittedBurstSize(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2968,7 +2968,7 @@ static int set_QoSPolicer_ExcessBurstSize(char *refparam, struct dmctx *ctx, voi { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -2988,7 +2988,7 @@ static int set_QoSPolicer_PeakRate(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3008,7 +3008,7 @@ static int set_QoSPolicer_PeakBurstSize(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3028,7 +3028,7 @@ static int set_QoSPolicer_MeterType(char *refparam, struct dmctx *ctx, void *dat { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3054,7 +3054,7 @@ static int set_QoSPolicer_ConformingAction(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, ConformingAction)) + if (dm_validate_string(value, -1, -1, NULL, 0, ConformingAction, 5)) return FAULT_9007; break; case VALUESET: @@ -3074,7 +3074,7 @@ static int set_QoSPolicer_PartialConformingAction(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, ConformingAction)) + if (dm_validate_string(value, -1, -1, NULL, 0, ConformingAction, 5)) return FAULT_9007; break; case VALUESET: @@ -3094,7 +3094,7 @@ static int set_QoSPolicer_NonConformingAction(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, ConformingAction)) + if (dm_validate_string(value, -1, -1, NULL, 0, ConformingAction, 5)) return FAULT_9007; break; case VALUESET: @@ -3191,7 +3191,7 @@ static int set_QoSQueue_Alias(char *refparam, struct dmctx *ctx, void *data, cha switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3211,7 +3211,7 @@ static int set_QoSQueue_TrafficClasses(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt_list(value, NULL, NULL, "256", NULL, NULL)) + if (dm_validate_unsignedInt_list(value, -1, -1, 256, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3257,7 +3257,7 @@ static int set_QoSQueue_Interface(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3311,7 +3311,7 @@ static int set_QoSQueue_Weight(char *refparam, struct dmctx *ctx, void *data, ch { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3331,7 +3331,7 @@ static int set_QoSQueue_Precedence(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3351,7 +3351,7 @@ static int set_QoSQueue_REDThreshold(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, "100")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,"100"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3371,7 +3371,7 @@ static int set_QoSQueue_REDPercentage(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, "100")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,"100"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3391,7 +3391,7 @@ static int set_QoSQueue_DropAlgorithm(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DropAlgorithm, NULL)) + if (dm_validate_string(value, -1, -1, DropAlgorithm, 4, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3411,7 +3411,7 @@ static int set_QoSQueue_SchedulerAlgorithm(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, SchedulerAlgorithm, NULL)) + if (dm_validate_string(value, -1, -1, SchedulerAlgorithm, 3, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3441,7 +3441,7 @@ static int set_QoSQueue_ShapingRate(char *refparam, struct dmctx *ctx, void *dat switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3465,7 +3465,7 @@ static int set_QoSQueue_ShapingBurstSize(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3514,7 +3514,7 @@ static int set_QoSQueueStats_Alias(char *refparam, struct dmctx *ctx, void *data switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3534,7 +3534,7 @@ static int set_QoSQueueStats_Queue(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3564,7 +3564,7 @@ static int set_QoSQueueStats_Interface(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3652,7 +3652,7 @@ static int set_QoSShaper_Alias(char *refparam, struct dmctx *ctx, void *data, ch switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3698,7 +3698,7 @@ static int set_QoSShaper_Interface(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -3727,7 +3727,7 @@ static int set_QoSShaper_ShapingRate(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -3751,7 +3751,7 @@ static int set_QoSShaper_ShapingBurstSize(char *refparam, struct dmctx *ctx, voi { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/routing.c b/dmtree/tr181/routing.c index fdc825d6..ad728407 100644 --- a/dmtree/tr181/routing.c +++ b/dmtree/tr181/routing.c @@ -555,7 +555,7 @@ static int set_router_ipv4forwarding_destip(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -579,7 +579,7 @@ static int set_router_ipv4forwarding_destmask(char *refparam, struct dmctx *ctx, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -626,7 +626,7 @@ static int set_router_ipv4forwarding_gatewayip(char *refparam, struct dmctx *ctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "15", NULL, IPv4Address)) + if (dm_validate_string(value, -1, 15, NULL, 0, IPv4Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -656,7 +656,7 @@ static int set_router_ipv4forwarding_interface_linker_parameter(char *refparam, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -684,7 +684,7 @@ static int set_router_ipv4forwarding_metric(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -733,7 +733,7 @@ static int set_RoutingRouterIPv6Forwarding_DestIPPrefix(char *refparam, struct d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "49", NULL, NULL)) + if (dm_validate_string(value, -1, 49, NULL, 0, IPv6Prefix, 1)) return FAULT_9007; return 0; case VALUESET: @@ -753,7 +753,7 @@ static int set_RoutingRouterIPv6Forwarding_ForwardingPolicy(char *refparam, stru { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -776,7 +776,7 @@ static int set_RoutingRouterIPv6Forwarding_NextHop(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPv6Address)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPv6Address, 1)) return FAULT_9007; return 0; case VALUESET: @@ -806,7 +806,7 @@ static int set_RoutingRouterIPv6Forwarding_Interface(char *refparam, struct dmct switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -841,7 +841,7 @@ static int set_RoutingRouterIPv6Forwarding_ForwardingMetric(char *refparam, stru { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", NULL)) + if (dm_validate_int(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1008,7 +1008,7 @@ static int set_RoutingRouter_Alias(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1039,7 +1039,7 @@ static int set_router_ipv4forwarding_alias(char *refparam, struct dmctx *ctx, vo switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1075,7 +1075,7 @@ static int set_RoutingRouterIPv6Forwarding_Alias(char *refparam, struct dmctx *c switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/security.c b/dmtree/tr181/security.c index 92393184..2c9aaf05 100644 --- a/dmtree/tr181/security.c +++ b/dmtree/tr181/security.c @@ -283,7 +283,7 @@ static int get_SecurityCertificate_SerialNumber(char *refparam, struct dmctx *ct #ifdef LOPENSSL struct certificate_profile *cert_profile = (struct certificate_profile*)data; ASN1_INTEGER *serial = X509_get_serialNumber(cert_profile->openssl_cert); - *value = stringToHex(serial->data, serial->length); + *value = stringToHex((char *)serial->data, serial->length); #elif LMBEDTLS struct certificate_profile *cert_profile = (struct certificate_profile*)data; *value = stringToHex(cert_profile->mbdtls_cert.serial.p, cert_profile->mbdtls_cert.serial.len); diff --git a/dmtree/tr181/times.c b/dmtree/tr181/times.c index 820085b6..db8288af 100644 --- a/dmtree/tr181/times.c +++ b/dmtree/tr181/times.c @@ -80,7 +80,7 @@ static int set_time_LocalTimeZone(char *refparam, struct dmctx *ctx, void *data, { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -189,7 +189,7 @@ static int set_time_ntpserver(char *refparam, struct dmctx *ctx, int action, cha switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/usb.c b/dmtree/tr181/usb.c index 326004ce..4826ac01 100644 --- a/dmtree/tr181/usb.c +++ b/dmtree/tr181/usb.c @@ -489,7 +489,7 @@ static int set_USBInterface_Alias(char *refparam, struct dmctx *ctx, void *data, struct usb_interface *usbiface= (struct usb_interface *)data; switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -518,7 +518,7 @@ static int set_USBInterface_LowerLayers(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -594,7 +594,7 @@ static int set_USBPort_Alias(char *refparam, struct dmctx *ctx, void *data, char struct usb_port* port = (struct usb_port *)data; switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -696,7 +696,7 @@ static int set_USBUSBHostsHost_Alias(char *refparam, struct dmctx *ctx, void *da struct usb_port* port=(struct usb_port *)data; switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/userinterface.c b/dmtree/tr181/userinterface.c index 967b8abf..012fa068 100644 --- a/dmtree/tr181/userinterface.c +++ b/dmtree/tr181/userinterface.c @@ -97,7 +97,7 @@ static int set_userint_remoteaccesss_port(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,"65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -170,7 +170,7 @@ static int set_userint_remoteaccesss_protocol(char *refparam, struct dmctx *ctx, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, SupportedProtocols, NULL)) + if (dm_validate_string(value, -1, -1, SupportedProtocols, 2, NULL, 0)) return FAULT_9007; found = get_supportedprotocols(); diff --git a/dmtree/tr181/users.c b/dmtree/tr181/users.c index 5e0db698..0b1b0490 100644 --- a/dmtree/tr181/users.c +++ b/dmtree/tr181/users.c @@ -153,7 +153,7 @@ static int set_user_alias(char *refparam, struct dmctx *ctx, void *data, char *i switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -183,7 +183,7 @@ static int set_user_username(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -197,7 +197,7 @@ static int set_user_password(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -225,7 +225,7 @@ static int set_user_language(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "16", NULL, NULL)) + if (dm_validate_string(value, -1, 16, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: diff --git a/dmtree/tr181/wifi.c b/dmtree/tr181/wifi.c index 3aacbad3..63ec34ec 100644 --- a/dmtree/tr181/wifi.c +++ b/dmtree/tr181/wifi.c @@ -250,7 +250,7 @@ static int set_wlan_ssid(char *refparam, struct dmctx *ctx, void *data, char *in { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "32", NULL, NULL)) + if (dm_validate_string(value, -1, 32, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -334,7 +334,7 @@ static int set_WiFiRadio_LowerLayers(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -461,7 +461,7 @@ static int set_radio_operating_standard(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, -1, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -522,7 +522,7 @@ static int set_WiFiRadio_AutoChannelRefreshPeriod(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -550,7 +550,7 @@ static int set_WiFiRadio_FragmentationThreshold(char *refparam, struct dmctx *ct { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -571,7 +571,7 @@ static int set_WiFiRadio_RTSThreshold(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -592,7 +592,7 @@ static int set_WiFiRadio_BeaconPeriod(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -613,7 +613,7 @@ static int set_WiFiRadio_DTIMPeriod(char *refparam, struct dmctx *ctx, void *dat { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -654,7 +654,7 @@ static int set_WiFiRadio_OperatingChannelBandwidth(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -694,7 +694,7 @@ static int set_WiFiRadio_PreambleType(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, PreambleType, NULL)) + if (dm_validate_string(value, -1, -1, PreambleType, 3, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -747,7 +747,7 @@ static int set_WiFiRadio_TransmitPower(char *refparam, struct dmctx *ctx, void * { switch (action) { case VALUECHECK: - if (dm_validate_int(value, "-1", "100")) + if (dm_validate_int(value, RANGE_ARGS{{"-1","100"}}, 1)) return FAULT_9007; break; case VALUESET: @@ -780,7 +780,7 @@ static int set_WiFiRadio_RegulatoryDomain(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_string(value, "3", "3", NULL, RegulatoryDomain)) + if (dm_validate_string(value, 3, 3, NULL, 0, RegulatoryDomain, 1)) return FAULT_9007; break; case VALUESET: @@ -816,7 +816,7 @@ static int set_radio_channel(char *refparam, struct dmctx *ctx, void *data, char { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "255")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","255"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1284,7 +1284,7 @@ static int set_access_point_maxassoc(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1330,7 +1330,7 @@ static int set_WiFiAccessPoint_MaxAllowedAssociations(char *refparam, struct dmc switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1384,7 +1384,7 @@ static int set_WiFiAccessPoint_AllowedMACAddress(char *refparam, struct dmctx *c switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, NULL, NULL, "17", NULL, MACAddress)) + if (dm_validate_string_list(value, -1, -1, -1, -1, 17, NULL, 0, MACAddress, 1)) return FAULT_9007; break; case VALUESET: @@ -1497,7 +1497,7 @@ static int set_access_point_security_modes(char *refparam, struct dmctx *ctx, vo switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1585,7 +1585,7 @@ static int set_access_point_security_wepkey(char *refparam, struct dmctx *ctx, v switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, "13", "13")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{"5","5"},{"13","13"}}, 2)) return FAULT_9007; return 0; case VALUESET: @@ -1632,7 +1632,7 @@ static int set_access_point_security_shared_key(char *refparam, struct dmctx *ct char *encryption; switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "32")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"32"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1651,7 +1651,7 @@ static int set_access_point_security_passphrase(char *refparam, struct dmctx *ct switch (action) { case VALUECHECK: - if (dm_validate_string(value, "8", "63", NULL, NULL)) + if (dm_validate_string(value, 8, 63, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1677,7 +1677,7 @@ static int set_access_point_security_rekey_interval(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1705,7 +1705,7 @@ static int set_access_point_security_radius_ip_address(char *refparam, struct dm switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; return 0; case VALUESET: @@ -1730,7 +1730,7 @@ static int set_access_point_security_radius_server_port(char *refparam, struct d switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -1748,7 +1748,7 @@ static int set_access_point_security_radius_secret(char *refparam, struct dmctx switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -1771,7 +1771,7 @@ static int set_WiFiAccessPointSecurity_MFPConfig(char *refparam, struct dmctx *c { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, MFPConfig, NULL)) + if (dm_validate_string(value, -1, -1, MFPConfig, 3, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1852,7 +1852,7 @@ static int set_WiFiAccessPointWPS_ConfigMethodsEnabled(char *refparam, struct dm { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, -1, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -1884,7 +1884,7 @@ static int set_WiFiAccessPointWPS_PIN(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "8", NULL, PIN)) + if (dm_validate_string(value, -1, 8, NULL, 0, PIN, 1)) return FAULT_9007; break; case VALUESET: @@ -1905,7 +1905,7 @@ static int set_WiFiAccessPointAccounting_ServerIPAddr(char *refparam, struct dmc { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "45", NULL, IPAddress)) + if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2)) return FAULT_9007; break; case VALUESET: @@ -1926,7 +1926,7 @@ static int set_WiFiAccessPointAccounting_ServerPort(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; break; case VALUESET: @@ -1947,7 +1947,7 @@ static int set_WiFiAccessPointAccounting_Secret(char *refparam, struct dmctx *ct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2099,7 +2099,7 @@ static int set_WiFiEndPoint_Alias(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2165,7 +2165,7 @@ static int set_WiFiEndPointProfile_Alias(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2191,7 +2191,7 @@ static int set_WiFiEndPointProfile_SSID(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "32", NULL, NULL)) + if (dm_validate_string(value, -1, 32, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2227,7 +2227,7 @@ static int set_WiFiEndPointProfileSecurity_ModeEnabled(char *refparam, struct dm switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, NULL)) + if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2316,7 +2316,7 @@ static int set_WiFiEndPointProfileSecurity_WEPKey(char *refparam, struct dmctx * switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, "13", "13")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{"5","5"},{"13","13"}}, 2)) return FAULT_9007; return 0; case VALUESET: @@ -2337,7 +2337,7 @@ static int set_WiFiEndPointProfileSecurity_PreSharedKey(char *refparam, struct d switch (action) { case VALUECHECK: - if (dm_validate_hexBinary(value, NULL, "32")) + if (dm_validate_hexBinary(value, RANGE_ARGS{{NULL,"32"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -2356,7 +2356,7 @@ static int set_WiFiEndPointProfileSecurity_KeyPassphrase(char *refparam, struct switch (action) { case VALUECHECK: - if (dm_validate_string(value, "8", "63", NULL, NULL)) + if (dm_validate_string(value, 8, 63, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2380,7 +2380,7 @@ static int set_WiFiEndPointProfileSecurity_MFPConfig(char *refparam, struct dmct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, MFPConfig, NULL)) + if (dm_validate_string(value, -1, -1, MFPConfig, 3, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2461,7 +2461,7 @@ static int set_WiFiEndPointWPS_ConfigMethodsEnabled(char *refparam, struct dmctx { switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, -1, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; break; case VALUESET: @@ -2494,7 +2494,7 @@ static int set_WiFiEndPointWPS_PIN(char *refparam, struct dmctx *ctx, void *data { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "8", "8")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"4","4"},{"8","8"}}, 2)) return FAULT_9007; break; case VALUESET: @@ -2530,7 +2530,7 @@ static int set_neighboring_wifi_diagnostics_diagnostics_state(char *refparam, st switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, DiagnosticsState, NULL)) + if (dm_validate_string(value, -1, -1, DiagnosticsState, 5, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2625,7 +2625,7 @@ static int set_radio_alias(char *refparam, struct dmctx *ctx, void *data, char * switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2653,7 +2653,7 @@ static int set_ssid_alias(char *refparam, struct dmctx *ctx, void *data, char *i switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2681,7 +2681,7 @@ static int set_access_point_alias(char *refparam, struct dmctx *ctx, void *data, switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -2711,7 +2711,7 @@ static int set_ssid_lower_layer(char *refparam, struct dmctx *ctx, void *data, c switch (action) { case VALUECHECK: - if (dm_validate_string_list(value, NULL, NULL, "1024", NULL, NULL, NULL, NULL)) + if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/x_iopsys_eu_buttons.c b/dmtree/tr181/x_iopsys_eu_buttons.c index b2c7c577..561a82c2 100644 --- a/dmtree/tr181/x_iopsys_eu_buttons.c +++ b/dmtree/tr181/x_iopsys_eu_buttons.c @@ -137,7 +137,7 @@ static int set_x_iopsys_eu_button_alias(char *refparam, struct dmctx *ctx, void switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/x_iopsys_eu_dropbear.c b/dmtree/tr181/x_iopsys_eu_dropbear.c index 1b1f21ba..12042bdb 100644 --- a/dmtree/tr181/x_iopsys_eu_dropbear.c +++ b/dmtree/tr181/x_iopsys_eu_dropbear.c @@ -334,7 +334,7 @@ static int set_x_iopsys_eu_dropbear_alias(char *refparam, struct dmctx *ctx, voi switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/x_iopsys_eu_ipacccfg.c b/dmtree/tr181/x_iopsys_eu_ipacccfg.c index 0ed64780..1895501d 100644 --- a/dmtree/tr181/x_iopsys_eu_ipacccfg.c +++ b/dmtree/tr181/x_iopsys_eu_ipacccfg.c @@ -612,7 +612,7 @@ static int set_x_iopsys_eu_cfgobj_address_alias(char *refparam, struct dmctx *ct switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -642,7 +642,7 @@ static int set_port_forwarding_alias(char *refparam, struct dmctx *ctx, void *da switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: diff --git a/dmtree/tr181/xmpp.c b/dmtree/tr181/xmpp.c index a7fdaa56..22038f58 100644 --- a/dmtree/tr181/xmpp.c +++ b/dmtree/tr181/xmpp.c @@ -128,7 +128,7 @@ static int set_xmpp_connection_alias(char *refparam, struct dmctx *ctx, void *da { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -149,7 +149,7 @@ static int set_xmpp_connection_username(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -170,7 +170,7 @@ static int set_xmpp_connection_password(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -191,7 +191,7 @@ static int set_xmpp_connection_domain(char *refparam, struct dmctx *ctx, void *d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -212,7 +212,7 @@ static int set_xmpp_connection_resource(char *refparam, struct dmctx *ctx, void { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -233,7 +233,7 @@ static int set_xmpp_connection_server_connect_algorithm(char *refparam, struct d { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, NULL, NULL, ServerConnectAlgorithm)) + if (dm_validate_string(value, -1, -1, ServerConnectAlgorithm, 4, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -254,7 +254,7 @@ static int set_xmpp_connection_keepalive_interval(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_long(value, "-1", NULL)) + if (dm_validate_long(value, RANGE_ARGS{{"-1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -275,7 +275,7 @@ static int set_xmpp_connection_server_attempts(char *refparam, struct dmctx *ctx { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, NULL, NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{NULL,NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -296,7 +296,7 @@ static int set_xmpp_connection_retry_initial_interval(char *refparam, struct dmc { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -317,7 +317,7 @@ static int set_xmpp_connection_retry_interval_multiplier(char *refparam, struct { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1000", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1000","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -338,7 +338,7 @@ static int set_xmpp_connection_retry_max_interval(char *refparam, struct dmctx * { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "1", NULL)) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1",NULL}}, 1)) return FAULT_9007; return 0; case VALUESET: @@ -440,7 +440,7 @@ static int set_xmpp_connection_server_alias(char *refparam, struct dmctx *ctx, v { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "64", NULL, NULL)) + if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -461,7 +461,7 @@ static int set_xmpp_connection_server_server_address(char *refparam, struct dmct { switch (action) { case VALUECHECK: - if (dm_validate_string(value, NULL, "256", NULL, NULL)) + if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0)) return FAULT_9007; return 0; case VALUESET: @@ -482,7 +482,7 @@ static int set_xmpp_connection_server_port(char *refparam, struct dmctx *ctx, vo { switch (action) { case VALUECHECK: - if (dm_validate_unsignedInt(value, "0", "65535")) + if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1)) return FAULT_9007; return 0; case VALUESET: diff --git a/json/convertor_json_to_c.py b/json/convertor_json_to_c.py index 90e57a25..97f805ac 100755 --- a/json/convertor_json_to_c.py +++ b/json/convertor_json_to_c.py @@ -159,9 +159,9 @@ def get_mapping_obj( mappingobj ): def generate_validate_value(dmparam, value): validate_value = "" - maxsizeparam = "NULL" - itemminparam = "NULL" - itemmaxparam = "NULL" + maxsizeparam = "-1" + itemminparam = "-1" + itemmaxparam = "-1" rangeminparam = "NULL" rangemaxparam = "NULL" @@ -169,106 +169,158 @@ def generate_validate_value(dmparam, value): if listparam != None: datatypeparam = getoptionparam(listparam, "datatype") maxsizeparam = getoptionparam(listparam, "maxsize") - if maxsizeparam == None: maxsizeparam = "NULL" + if maxsizeparam == None: maxsizeparam = "-1" itemparam = getoptionparam(listparam, "item") if itemparam != None: itemminparam = getoptionparam(itemparam, "min") - if itemminparam == None: itemminparam = "NULL" + if itemminparam == None: itemminparam = "-1" itemmaxparam = getoptionparam(itemparam, "max") - if itemmaxparam == None: itemmaxparam = "NULL" - rangeparam = getoptionparam(listparam, "range") + if itemmaxparam == None: itemmaxparam = "-1" + + rangeparam = getarrayoptionparam(listparam, "range") if rangeparam != None: - rangeminparam = getoptionparam(rangeparam, "min") + range_length = len(rangeparam) + rangeargs = "RANGE_ARGS{" + for i in range(range_length - 1): + rangeminparam = getoptionparam(rangeparam[i], "min") + if rangeminparam == None: rangeminparam = "NULL" + rangemaxparam = getoptionparam(rangeparam[i], "max") + if rangemaxparam == None: rangemaxparam = "NULL" + rangeargs += "{\"%s\",\"%s\"}," % (rangeminparam, rangemaxparam) + rangeminparam = getoptionparam(rangeparam[range_length - 1], "min") if rangeminparam == None: rangeminparam = "NULL" - rangemaxparam = getoptionparam(rangeparam, "max") + rangemaxparam = getoptionparam(rangeparam[range_length - 1], "max") if rangemaxparam == None: rangemaxparam = "NULL" + rangeargs += "{\"%s\",\"%s\"}}, %s" % (rangeminparam, rangemaxparam, range_length) + else: + rangeargs = "RANGE_ARGS{{NULL,NULL}}, 1" + enumarationsparam = getarrayoptionparam(listparam, "enumerations") if enumarationsparam != None: list_enumarationsparam = enumarationsparam enum_length = len(list_enumarationsparam) enumarationsparam = dmparam if datatypeparam == "string" else datatypeparam str_enum = "char *%s[] = {" % enumarationsparam - for i in range(enum_length): + for i in range(enum_length - 1): str_enum += "\"%s\", " % list_enumarationsparam[i] - str_enum += "NULL};" + str_enum += "\"%s\"};" % list_enumarationsparam[enum_length - 1] printGlobalstrCommon(str_enum) else: enumarationsparam = "NULL" + enum_length = "0" + patternparam = getarrayoptionparam(listparam, "pattern") if patternparam != None: list_patternparam = patternparam pattern_length = len(list_patternparam) patternparam = dmparam if datatypeparam == "string" else datatypeparam str_pattern = "char *%s[] = {" % patternparam - for i in range(pattern_length): + for i in range(pattern_length - 1): str_pattern += "\"^%s$\", " % list_patternparam[i] - str_pattern += "NULL};" + str_pattern += "\"^%s$\"};" % list_patternparam[pattern_length - 1] printGlobalstrCommon(str_pattern) elif datatypeparam == "IPAddress": patternparam = "IPAddress" + pattern_length = "2" elif datatypeparam == "IPv6Address": patternparam = "IPv6Address" + pattern_length = "1" + elif datatypeparam == "IPPrefix": + patternparam = "IPPrefix" + pattern_length = "3" + elif datatypeparam == "IPv6Prefix": + patternparam = "IPv6Prefix" + pattern_length = "1" else: patternparam = "NULL" + pattern_length = "0" + if datatypeparam == "unsignedInt": - validate_value += " if (dm_validate_unsignedInt_list(value, \"%s\", \"%s\", \"%s\", \"%s\", \"%s\"))\n" % (itemminparam, itemmaxparam, maxsizeparam, rangeminparam, rangemaxparam) - elif datatypeparam == "int": - validate_value += " if (dm_validate_int_list(value, \"%s\", \"%s\", \"%s\", \"%s\", \"%s\"))\n" % (itemminparam, itemmaxparam, maxsizeparam, rangeminparam, rangemaxparam) + validate_value += " if (dm_validate_unsignedInt_list(value, %s, %s, %s, %s))\n" % (itemminparam, itemmaxparam, maxsizeparam, rangeargs) else: - validate_value += " if (dm_validate_string_list(value, \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", %s, %s))\n" % (itemminparam, itemmaxparam, maxsizeparam, rangeminparam, rangemaxparam, enumarationsparam, patternparam) + if rangeminparam == "NULL": rangeminparam = "-1" + if rangemaxparam == "NULL": rangemaxparam = "-1" + validate_value += " if (dm_validate_string_list(value, %s, %s, %s, %s, %s, %s, %s, %s, %s))\n" % (itemminparam, itemmaxparam, maxsizeparam, rangeminparam, rangemaxparam, enumarationsparam, enum_length, patternparam, pattern_length) else: datatypeparam = getoptionparam(value, "datatype") - rangeparam = getoptionparam(value, "range") + rangeparam = getarrayoptionparam(value, "range") if rangeparam != None: - rangeminparam = getoptionparam(rangeparam, "min") + range_length = len(rangeparam) + rangeargs = "RANGE_ARGS{" + for i in range(range_length - 1): + rangeminparam = getoptionparam(rangeparam[i], "min") + if rangeminparam == None: rangeminparam = "NULL" + rangemaxparam = getoptionparam(rangeparam[i], "max") + if rangemaxparam == None: rangemaxparam = "NULL" + rangeargs += "{\"%s\",\"%s\"}," % (rangeminparam, rangemaxparam) + rangeminparam = getoptionparam(rangeparam[range_length - 1], "min") if rangeminparam == None: rangeminparam = "NULL" - rangemaxparam = getoptionparam(rangeparam, "max") + rangemaxparam = getoptionparam(rangeparam[range_length - 1], "max") if rangemaxparam == None: rangemaxparam = "NULL" + rangeargs += "{\"%s\",\"%s\"}}, %s" % (rangeminparam, rangemaxparam, range_length) + else: + rangeargs = "RANGE_ARGS{{NULL,NULL}}, 1" + enumarationsparam = getarrayoptionparam(value, "enumerations") if enumarationsparam != None: list_enumarationsparam = enumarationsparam enum_length = len(list_enumarationsparam) enumarationsparam = dmparam if datatypeparam == "string" else datatypeparam str_enum = "char *%s[] = {" % enumarationsparam - for i in range(enum_length): + for i in range(enum_length - 1): str_enum += "\"%s\", " % list_enumarationsparam[i] - - str_enum += "NULL};" + str_enum += "\"%s\"};" % list_enumarationsparam[enum_length - 1] printGlobalstrCommon(str_enum) else: enumarationsparam = "NULL" + enum_length = "0" + patternparam = getarrayoptionparam(value, "pattern") if patternparam != None: list_patternparam = patternparam pattern_length = len(list_patternparam) patternparam = dmparam if datatypeparam == "string" else datatypeparam str_pattern = "char *%s[] = {" % patternparam - for i in range(pattern_length): + for i in range(pattern_length - 1): str_pattern += "\"^%s$\", " % list_patternparam[i] - str_pattern += "NULL};" + str_pattern += "\"^%s$\"};" % list_patternparam[pattern_length - 1] printGlobalstrCommon(str_pattern) elif datatypeparam == "IPAddress": patternparam = "IPAddress" + pattern_length = "2" elif datatypeparam == "IPv6Address": patternparam = "IPv6Address" + pattern_length = "1" + elif datatypeparam == "IPPrefix": + patternparam = "IPPrefix" + pattern_length = "3" + elif datatypeparam == "IPv6Prefix": + patternparam = "IPv6Prefix" + pattern_length = "1" else: patternparam = "NULL" + pattern_length = "0" + if datatypeparam == "boolean": validate_value += " if (dm_validate_boolean(value))\n" elif datatypeparam == "unsignedInt": - validate_value += " if (dm_validate_unsignedInt(value, \"%s\", \"%s\"))\n" % (rangeminparam, rangemaxparam) + validate_value += " if (dm_validate_unsignedInt(value, %s))\n" % rangeargs elif datatypeparam == "int": - validate_value += " if (dm_validate_int(value, \"%s\", \"%s\"))\n" % (rangeminparam, rangemaxparam) + validate_value += " if (dm_validate_int(value, %s))\n" % rangeargs elif datatypeparam == "unsignedLong": - validate_value += " if (dm_validate_unsignedLong(value, \"%s\", \"%s\"))\n" % (rangeminparam, rangemaxparam) + validate_value += " if (dm_validate_unsignedLong(value, %s))\n" % rangeargs elif datatypeparam == "long": - validate_value += " if (dm_validate_long(value, \"%s\", \"%s\"))\n" % (rangeminparam, rangemaxparam) + validate_value += " if (dm_validate_long(value, %s))\n" % rangeargs elif datatypeparam == "dateTime": validate_value += " if (dm_validate_dateTime(value))\n" elif datatypeparam == "hexBinary": - validate_value += " if (dm_validate_hexBinary(value, \"%s\", \"%s\"))\n" % (rangeminparam, rangemaxparam) + if rangeminparam == "NULL": rangeminparam = "-1" + if rangemaxparam == "NULL": rangemaxparam = "-1" + validate_value += " if (dm_validate_hexBinary(value, %s))\n" % rangeargs else: - validate_value += " if (dm_validate_string(value, \"%s\", \"%s\", %s, %s))\n" % (rangeminparam, rangemaxparam, enumarationsparam, patternparam) + if rangeminparam == "NULL": rangeminparam = "-1" + if rangemaxparam == "NULL": rangemaxparam = "-1" + validate_value += " if (dm_validate_string(value, %s, %s, %s, %s, %s, %s))\n" % (rangeminparam, rangemaxparam, enumarationsparam, enum_length, patternparam, pattern_length) validate_value += " return FAULT_9007;" validate_value = validate_value.replace("\"NULL\"", "NULL") return validate_value diff --git a/json/tr104.json b/json/tr104.json index dac84e96..d273e90c 100644 --- a/json/tr104.json +++ b/json/tr104.json @@ -16,9 +16,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "VoiceProfileNumberOfEntries": { "type": "unsignedInt", @@ -659,9 +661,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EntryID": { "type": "unsignedInt", @@ -672,9 +676,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Codec": { "type": "string", @@ -685,9 +691,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "enumerations": [ "G.711MuLaw", "G.711ALaw", @@ -727,9 +735,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "SilenceSuppression": { @@ -801,9 +811,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Reset": { "type": "boolean", @@ -845,9 +857,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -904,9 +918,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "enumerations": [ "InBand", "RFC2833", @@ -937,9 +953,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "enumerations": [ "InBand", "RFC2833", @@ -966,9 +984,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DigitMapEnable": { "type": "boolean", @@ -999,9 +1019,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NonVoiceBandwidthReservedUpstream": { "type": "unsignedInt", @@ -1082,9 +1104,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "URL": { "type": "string", @@ -1095,9 +1119,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ContactPhoneNumber": { "type": "string", @@ -1108,9 +1134,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "EmailAddress": { "type": "string", @@ -1121,9 +1149,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.SIP.": { @@ -1143,9 +1173,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -1171,10 +1203,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "ProxyServerTransport": { "type": "string", @@ -1210,9 +1244,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -1238,10 +1274,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -1292,9 +1330,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -1320,10 +1360,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -1374,9 +1416,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -1402,10 +1446,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -1431,9 +1477,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "RegistrationPeriod": { "type": "unsignedInt", @@ -1444,9 +1492,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds", "mapping": [ { @@ -1473,9 +1523,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerT2": { @@ -1487,9 +1539,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerT4": { @@ -1501,9 +1555,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerA": { @@ -1515,9 +1571,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerB": { @@ -1529,9 +1587,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerC": { @@ -1543,9 +1603,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerD": { @@ -1557,9 +1619,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerE": { @@ -1571,9 +1635,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerF": { @@ -1585,9 +1651,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerG": { @@ -1599,9 +1667,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerH": { @@ -1613,9 +1683,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerI": { @@ -1627,9 +1699,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerJ": { @@ -1641,9 +1715,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "TimerK": { @@ -1655,9 +1731,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "InviteExpires": { @@ -1669,9 +1747,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "ReInviteExpires": { @@ -1683,9 +1763,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds", "mapping": [ { @@ -1712,9 +1794,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "RegistersMinExpires": { @@ -1726,9 +1810,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "RegisterRetryInterval": { @@ -1740,9 +1826,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "InboundAuth": { @@ -1768,9 +1856,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "InboundAuthPassword": { "type": "string", @@ -1781,9 +1871,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UseCodecPriorityInSDPResponse": { "type": "boolean", @@ -1804,10 +1896,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "VLANIDMark": { "type": "int", @@ -1818,9 +1912,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "EthernetPriorityMark": { "type": "int", @@ -1831,9 +1927,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "SIPEventSubscribeNumberOfElements": { "type": "unsignedInt", @@ -1854,10 +1952,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - } + "range": [ + { + "min": 0, + "max": 999 + } + ] }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.SIP.EventSubscribe.{i}.": { "type": "object", @@ -1876,9 +1976,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Event": { "type": "string", @@ -1889,9 +1991,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "Notifier": { "type": "string", @@ -1902,9 +2006,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NotifierPort": { "type": "unsignedInt", @@ -1915,10 +2021,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "NotifierTransport": { "type": "string", @@ -1959,9 +2067,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SIPResponseNumber": { "type": "unsignedInt", @@ -1972,10 +2082,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 100, - "max": 999 - } + "range": [ + { + "min": 100, + "max": 999 + } + ] }, "TextMessage": { "type": "string", @@ -1986,9 +2098,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Tone": { "type": "unsignedInt", @@ -2019,9 +2133,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "CallAgentPort1": { "type": "unsignedInt", @@ -2032,10 +2148,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "CallAgent2": { "type": "string", @@ -2046,9 +2164,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "CallAgentPort2": { "type": "unsignedInt", @@ -2059,10 +2179,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "RetranIntervalTimer": { "type": "unsignedInt", @@ -2073,10 +2195,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "unit": "seconds" }, "MaxRetranCount": { @@ -2088,10 +2212,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "RegisterMode": { "type": "string", @@ -2116,10 +2242,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Domain": { "type": "string", @@ -2130,9 +2258,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "User": { "type": "string", @@ -2143,9 +2273,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "DSCPMark": { "type": "unsignedInt", @@ -2156,10 +2288,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "VLANIDMark": { "type": "int", @@ -2170,9 +2304,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "EthernetPriorityMark": { "type": "int", @@ -2183,9 +2319,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "AllowPiggybackEvents": { "type": "boolean", @@ -2296,10 +2434,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "VLANIDMark": { "type": "int", @@ -2310,9 +2450,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "EthernetPriorityMark": { "type": "int", @@ -2323,9 +2465,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] } }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.RTP.": { @@ -2345,10 +2489,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "LocalPortMax": { "type": "unsignedInt", @@ -2359,10 +2505,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "DSCPMark": { "type": "unsignedInt", @@ -2373,10 +2521,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "VLANIDMark": { "type": "int", @@ -2387,9 +2537,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "EthernetPriorityMark": { "type": "int", @@ -2400,9 +2552,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "TelephoneEventPayloadType": { "type": "unsignedInt", @@ -2413,10 +2567,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 128 - } + "range": [ + { + "min": 0, + "max": 128 + } + ] }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.RTP.RTCP.": { "type": "object", @@ -2445,9 +2601,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "LocalCName": { @@ -2459,9 +2617,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.RTP.SRTP.": { @@ -2536,10 +2696,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 127 - } + "range": [ + { + "min": 0, + "max": 127 + } + ] }, "BlockPayloadType": { "type": "unsignedInt", @@ -2550,10 +2712,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 127 - } + "range": [ + { + "min": 0, + "max": 127 + } + ] }, "FaxAndModemRedundancy": { "type": "int", @@ -2564,10 +2728,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 5 - } + "range": [ + { + "min": -1, + "max": 5 + } + ] }, "ModemRedundancy": { "type": "int", @@ -2578,10 +2744,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 5 - } + "range": [ + { + "min": -1, + "max": 5 + } + ] }, "DTMFRedundancy": { "type": "int", @@ -2592,10 +2760,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 5 - } + "range": [ + { + "min": -1, + "max": 5 + } + ] }, "VoiceRedundancy": { "type": "int", @@ -2606,10 +2776,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 5 - } + "range": [ + { + "min": -1, + "max": 5 + } + ] }, "MaxSessionsUsingRedundancy": { "type": "unsignedInt", @@ -2640,10 +2812,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 40 - } + "range": [ + { + "min": 1, + "max": 40 + } + ] }, "MaximumNumberOfDigits": { "type": "unsignedInt", @@ -2654,10 +2828,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 40 - } + "range": [ + { + "min": 1, + "max": 40 + } + ] }, "InterDigitTimerStd": { "type": "unsignedInt", @@ -2668,10 +2844,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 50000 - }, + "range": [ + { + "min": 1, + "max": 50000 + } + ], "unit": "milliseconds" }, "InterDigitTimerOpen": { @@ -2683,10 +2861,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 50000 - }, + "range": [ + { + "min": 1, + "max": 50000 + } + ], "unit": "milliseconds" }, "InvalidNumberTone": { @@ -2736,9 +2916,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "PrefixRange": { "type": "string", @@ -2749,9 +2931,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 42 - } + "range": [ + { + "max": 42 + } + ] }, "PrefixMinNumberOfDigits": { "type": "unsignedInt", @@ -2762,10 +2946,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 40 - } + "range": [ + { + "min": 1, + "max": 40 + } + ] }, "PrefixMaxNumberOfDigits": { "type": "unsignedInt", @@ -2776,10 +2962,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 40 - } + "range": [ + { + "min": 1, + "max": 40 + } + ] }, "NumberOfDigitsToRemove": { "type": "unsignedInt", @@ -2790,10 +2978,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 40 - } + "range": [ + { + "min": 0, + "max": 40 + } + ] }, "PosOfDigitsToRemove": { "type": "unsignedInt", @@ -2804,10 +2994,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 40 - } + "range": [ + { + "min": 0, + "max": 40 + } + ] }, "DialTone": { "type": "unsignedInt", @@ -2828,9 +3020,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "FacilityActionArgument": { "type": "string", @@ -2841,9 +3035,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -2902,9 +3098,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Function": { "type": "string", @@ -2915,9 +3113,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "enumerations": [ "Busy", "Confirmation", @@ -2970,9 +3170,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EntryID": { "type": "unsignedInt", @@ -2983,9 +3185,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "ToneEnable": { "type": "boolean", @@ -3006,9 +3210,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "TonePattern": { "type": "unsignedInt", @@ -3029,9 +3235,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ToneRepetitions": { "type": "unsignedInt", @@ -3042,10 +3250,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "ToneText": { "type": "string", @@ -3056,9 +3266,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.Tone.Pattern.{i}.": { @@ -3078,9 +3290,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EntryID": { "type": "unsignedInt", @@ -3091,9 +3305,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "ToneOn": { "type": "boolean", @@ -3114,10 +3330,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4095 - }, + "range": [ + { + "min": 0, + "max": 4095 + } + ], "unit": "hertz" }, "Power1": { @@ -3140,10 +3358,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4095 - }, + "range": [ + { + "min": 0, + "max": 4095 + } + ], "unit": "hertz" }, "Power2": { @@ -3166,10 +3386,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4095 - }, + "range": [ + { + "min": 0, + "max": 4095 + } + ], "unit": "hertz" }, "Power3": { @@ -3192,10 +3414,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4095 - }, + "range": [ + { + "min": 0, + "max": 4095 + } + ], "unit": "herts" }, "Power4": { @@ -3218,10 +3442,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4095 - }, + "range": [ + { + "min": 0, + "max": 4095 + } + ], "unit": "hertz" }, "ModulationPower": { @@ -3293,9 +3519,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ButtonName": { "type": "string", @@ -3306,9 +3534,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 16 - } + "range": [ + { + "max": 16 + } + ] }, "FacilityAction": { "type": "string", @@ -3319,9 +3549,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "FacilityActionArgument": { "type": "string", @@ -3332,9 +3564,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "QuickDialNumber": { "type": "string", @@ -3345,9 +3579,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 40 - } + "range": [ + { + "max": 40 + } + ] }, "ButtonMessage": { "type": "string", @@ -3358,9 +3594,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "UserAccess": { "type": "boolean", @@ -3401,10 +3639,36 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 33600, - "max": 33600 - } + "range": [ + { + "min": 2400, + "max": 2400 + }, + { + "min": 4800, + "max": 4800 + }, + { + "min": 7200, + "max": 7200 + }, + { + "min": 9600, + "max": 9600 + }, + { + "min": 12000, + "max": 12000 + }, + { + "min": 14400, + "max": 14400 + }, + { + "min": 33600, + "max": 33600 + } + ] }, "HighSpeedPacketRate": { "type": "unsignedInt", @@ -3415,10 +3679,24 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 40, - "max": 40 - }, + "range": [ + { + "min": 10, + "max": 10 + }, + { + "min": 20, + "max": 20 + }, + { + "min": 30, + "max": 30 + }, + { + "min": 40, + "max": 40 + } + ], "unit": "milliseconds" }, "HighSpeedRedundancy": { @@ -3430,10 +3708,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 3 - } + "range": [ + { + "min": 0, + "max": 3 + } + ] }, "LowSpeedRedundancy": { "type": "unsignedInt", @@ -3444,10 +3724,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 5 - } + "range": [ + { + "min": 0, + "max": 5 + } + ] }, "TCFMethod": { "type": "string", @@ -3506,9 +3788,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "DirectoryNumber": { "type": "string", @@ -3519,9 +3803,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "Status": { "type": "string", @@ -3594,10 +3880,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - } + "range": [ + { + "min": 0, + "max": 100 + } + ] }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.Line.{i}.SIP.": { "type": "object", @@ -3616,9 +3904,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "AuthPassword": { "type": "string", @@ -3629,9 +3919,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "URI": { "type": "string", @@ -3642,9 +3934,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 389 - } + "range": [ + { + "max": 389 + } + ] }, "SIPEventSubscribeNumberOfElements": { "type": "unsignedInt", @@ -3673,9 +3967,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Event": { "type": "string", @@ -3686,9 +3982,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "AuthUserName": { "type": "string", @@ -3699,9 +3997,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "AuthPassword": { "type": "string", @@ -3712,9 +4012,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] } } }, @@ -3735,9 +4037,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] } }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.Line.{i}.H323.": { @@ -3757,9 +4061,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] } }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.Line.{i}.Ringer.": { @@ -3817,9 +4123,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Function": { "type": "string", @@ -3830,9 +4138,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "enumerations": [ "Default", "RingSplash" @@ -3866,9 +4176,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EntryID": { "type": "unsignedInt", @@ -3879,9 +4191,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "RingEnable": { "type": "boolean", @@ -3902,9 +4216,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RingPattern": { "type": "unsignedInt", @@ -3925,9 +4241,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.Line.{i}.Ringer.Pattern.{i}.": { @@ -3947,9 +4265,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EntryID": { "type": "unsignedInt", @@ -3960,9 +4280,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "RingerOn": { "type": "boolean", @@ -4034,9 +4356,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "CallWaitingEnable": { "type": "boolean", @@ -4102,9 +4426,19 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 0, + "max": 0 + }, + { + "min": 1, + "max": 1 + }, + { + "min": 1 + } + ] }, "CallForwardUnconditionalEnable": { "type": "boolean", @@ -4125,9 +4459,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "CallForwardOnBusyEnable": { "type": "boolean", @@ -4148,9 +4484,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "CallForwardOnNoAnswerEnable": { "type": "boolean", @@ -4171,9 +4509,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "CallForwardOnNoAnswerRingCount": { "type": "unsignedInt", @@ -4345,9 +4685,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "enumerations": [ "G.711MuLaw", "G.711ALaw", @@ -4375,9 +4717,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "enumerations": [ "G.711MuLaw", "G.711ALaw", @@ -4466,9 +4810,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EntryID": { "type": "unsignedInt", @@ -4479,9 +4825,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Codec": { "type": "string", @@ -4492,9 +4840,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "BitRate": { "type": "unsignedInt", @@ -4517,9 +4867,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "SilenceSuppression": { @@ -4551,9 +4903,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] } } }, @@ -4594,9 +4948,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "FarEndUDPPort": { "type": "unsignedInt", @@ -4607,10 +4963,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "LocalUDPPort": { "type": "unsignedInt", @@ -4621,10 +4979,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } }, "Device.Services.VoiceService.{i}.VoiceProfile.{i}.Line.{i}.Stats.": { @@ -4834,10 +5194,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - } + "range": [ + { + "min": 0, + "max": 100 + } + ] }, "FarEndPacketLossRate": { "type": "unsignedInt", @@ -4848,10 +5210,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - } + "range": [ + { + "min": 0, + "max": 100 + } + ] }, "ReceiveInterarrivalJitter": { "type": "unsignedInt", @@ -4939,9 +5303,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "PhyPort": { "type": "string", @@ -4952,9 +5318,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 2 - } + "range": [ + { + "max": 2 + } + ] }, "InterfaceID": { "type": "unsignedInt", @@ -4965,9 +5333,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Description": { "type": "string", @@ -4978,9 +5348,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "Device.Services.VoiceService.{i}.PhyInterface.{i}.Tests.": { "type": "object", @@ -5015,9 +5387,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "enumerations": [ "PhoneConnectivityTest" ] diff --git a/json/tr181.json b/json/tr181.json index 9dc3ae4f..2b2200df 100644 --- a/json/tr181.json +++ b/json/tr181.json @@ -16,9 +16,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "pattern": [ "2\\.\\d+" ] @@ -82,9 +84,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1024 - } + "range": [ + { + "max": 1024 + } + ] } } }, @@ -102,9 +106,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Format": { "type": "string", @@ -127,9 +133,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "PacketCount": { @@ -158,9 +166,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 2048 - } + "range": [ + { + "max": 2048 + } + ] }, "FilterExpression": { "type": "string", @@ -170,9 +180,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Username": { "type": "string", @@ -182,9 +194,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -194,9 +208,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "output": { @@ -274,9 +290,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -302,10 +320,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ], @@ -343,9 +363,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ModelNumber": { "type": "string", @@ -356,9 +378,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Description": { "type": "string", @@ -369,9 +393,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProductClass": { "type": "string", @@ -382,9 +408,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -410,9 +438,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "HardwareVersion": { "type": "string", @@ -423,9 +453,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SoftwareVersion": { "type": "string", @@ -436,9 +468,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ActiveFirmwareImage": { "type": "string", @@ -495,9 +529,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -603,10 +639,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -619,9 +657,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 10 - } + "range": [ + { + "max": 10 + } + ] }, "FriendlyName": { "type": "string", @@ -631,9 +671,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "Device.DeviceInfo.VendorConfigFile.{i}.": { "type": "object", @@ -652,9 +694,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -665,9 +709,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Version": { "type": "string", @@ -678,9 +724,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 16 - } + "range": [ + { + "max": 16 + } + ] }, "Date": { "type": "dateTime", @@ -701,9 +749,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UseForBackupRestore": { "type": "boolean", @@ -729,9 +779,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Username": { "type": "string", @@ -741,9 +793,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -753,9 +807,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -773,9 +829,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Username": { "type": "string", @@ -785,9 +843,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -797,9 +857,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "FileSize": { "type": "unsignedInt", @@ -818,9 +880,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "CheckSumAlgorithm": { "type": "string", @@ -920,9 +984,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 100 - }, + "range": [ + { + "max": 100 + } + ], "unit": "percent", "mapping": [ { @@ -973,9 +1039,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Size": { "type": "unsignedInt", @@ -997,9 +1065,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 99 - } + "range": [ + { + "max": 99 + } + ] }, "CPUTime": { "type": "unsignedInt", @@ -1067,9 +1137,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -1124,9 +1196,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Value": { "type": "int", @@ -1137,9 +1211,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -274 - }, + "range": [ + { + "min": -274 + } + ], "unit": "degrees celsius" }, "LastUpdate": { @@ -1161,9 +1237,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -274 - }, + "range": [ + { + "min": -274 + } + ], "unit": "degrees celsius" }, "MinTime": { @@ -1185,9 +1263,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -274 - }, + "range": [ + { + "min": -274 + } + ], "unit": "degrees celsius" }, "MaxTime": { @@ -1209,9 +1289,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -274 - }, + "range": [ + { + "min": -274 + } + ], "unit": "degrees celsius" }, "LowAlarmTime": { @@ -1233,9 +1315,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -274 - }, + "range": [ + { + "min": -274 + } + ], "unit": "degrees celsius" }, "PollingInterval": { @@ -1322,9 +1406,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Architecture": { "type": "string", @@ -1366,9 +1452,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -1379,9 +1467,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "MaximumSize": { "type": "unsignedInt", @@ -1418,9 +1508,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Username": { "type": "string", @@ -1430,9 +1522,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -1442,9 +1536,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -1526,9 +1622,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1200 - } + "range": [ + { + "max": 1200 + } + ] } }, "Device.DeviceInfo.DeviceImageFile.{i}.": { @@ -1548,9 +1646,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Location": { "type": "string", @@ -1598,9 +1698,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -1611,9 +1713,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Version": { "type": "string", @@ -1624,9 +1728,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Available": { "type": "boolean", @@ -1682,9 +1788,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AutoActivate": { "type": "boolean", @@ -1703,9 +1811,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -1715,9 +1825,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "FileSize": { "type": "unsignedInt", @@ -1778,9 +1890,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "URL": { "type": "string", @@ -1790,9 +1904,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UUID": { "type": "string", @@ -1802,10 +1918,12 @@ "cwmp" ], "datatype": "UUID", - "range": { - "min": 36, - "max": 36 - }, + "range": [ + { + "min": 36, + "max": 36 + } + ], "pattern": [ "[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}" ] @@ -1818,9 +1936,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Features": { "type": "string", @@ -1849,10 +1969,12 @@ "cwmp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -1865,9 +1987,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SerialNumber": { "type": "string", @@ -1877,9 +2001,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProxyProtocol": { "type": "string", @@ -1922,9 +2048,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -1949,9 +2077,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -1976,9 +2106,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2012,9 +2144,11 @@ "cwmp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" }, "PeriodicInformEnable": { @@ -2049,9 +2183,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds", "mapping": [ { @@ -2101,9 +2237,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "mapping": [ { "type": "uci", @@ -2128,9 +2266,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2155,9 +2295,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2182,9 +2324,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2218,9 +2362,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DownloadProgressURL": { "type": "string", @@ -2230,9 +2376,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DefaultActiveNotificationThrottle": { "type": "unsignedInt", @@ -2252,10 +2400,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "seconds", "mapping": [ { @@ -2281,10 +2431,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 65535 - }, + "range": [ + { + "min": 1000, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -2318,9 +2470,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2354,9 +2508,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2381,10 +2537,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -2409,9 +2567,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2436,9 +2596,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2463,9 +2625,11 @@ "cwmp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds", "mapping": [ { @@ -2666,9 +2830,11 @@ "item": { "max": 32 }, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "mapping": [ { @@ -2783,9 +2949,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0 - }, + "range": [ + { + "min": 0 + } + ], "unit": "seconds" }, "LightweightNotificationTriggerTime": { @@ -2805,9 +2973,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -2881,9 +3051,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ManufacturerOUI": { "type": "string", @@ -2893,10 +3065,12 @@ "cwmp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -2909,9 +3083,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProductClass": { "type": "string", @@ -2921,9 +3097,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Host": { "type": "string", @@ -3063,9 +3241,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -3098,9 +3278,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -3142,9 +3324,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -3242,9 +3426,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProxiedDeviceID": { "type": "string", @@ -3254,9 +3440,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Reference": { "type": "string", @@ -3367,9 +3555,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 1024 - } + "range": [ + { + "max": 1024 + } + ] }, "LastSyncTime": { "type": "dateTime", @@ -3396,10 +3586,12 @@ "cwmp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -3412,9 +3604,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SerialNumber": { "type": "string", @@ -3424,9 +3618,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Host": { "type": "string", @@ -3510,9 +3706,11 @@ "cwmp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" }, "MaxMissedPeriodic": { @@ -3523,9 +3721,11 @@ "cwmp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "NotifyMissedScheduled": { "type": "boolean", @@ -3606,9 +3806,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ParameterName": { "type": "string", @@ -3618,9 +3820,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "EventList": { "type": "string", @@ -3658,9 +3862,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 30 - }, + "range": [ + { + "min": 30 + } + ], "unit": "seconds" }, "InitiationTime": { @@ -3726,9 +3932,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UUID": { "type": "string", @@ -3738,10 +3946,12 @@ "usp" ], "datatype": "UUID", - "range": { - "min": 36, - "max": 36 - }, + "range": [ + { + "min": 36, + "max": 36 + } + ], "pattern": [ "[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}" ] @@ -3754,9 +3964,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -3766,9 +3978,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ExecutionEnvRef": { "type": "string", @@ -3778,9 +3992,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -3857,9 +4073,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -3870,9 +4088,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "mapping": [ { "type": "ubus", @@ -3894,9 +4114,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "ubus", @@ -3918,9 +4140,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "RequestedRunLevel": { "type": "int", @@ -3930,10 +4154,12 @@ "cwmp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "CurrentRunLevel": { "type": "int", @@ -3944,10 +4170,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "InitialExecutionUnitRunLevel": { "type": "int", @@ -3958,10 +4186,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "Vendor": { "type": "string", @@ -3972,9 +4202,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - }, + "range": [ + { + "max": 128 + } + ], "mapping": [ { "type": "ubus", @@ -3996,9 +4228,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "mapping": [ { "type": "ubus", @@ -4030,9 +4264,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "kilobytes", "mapping": [ { @@ -4055,9 +4291,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "kilobytes", "mapping": [ { @@ -4080,9 +4318,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "kilobytes", "mapping": [ { @@ -4105,9 +4345,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "kilobytes", "mapping": [ { @@ -4159,10 +4401,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] } } }, @@ -4190,9 +4434,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 36 - }, + "range": [ + { + "max": 36 + } + ], "mapping": [ { "type": "ubus", @@ -4214,9 +4460,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "ubus", @@ -4238,9 +4486,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -4251,9 +4501,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "ubus", @@ -4302,9 +4554,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1024 - }, + "range": [ + { + "max": 1024 + } + ], "mapping": [ { "type": "ubus", @@ -4326,9 +4580,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -4350,9 +4606,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - }, + "range": [ + { + "max": 128 + } + ], "mapping": [ { "type": "ubus", @@ -4374,9 +4632,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "mapping": [ { "type": "ubus", @@ -4471,9 +4731,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -4494,9 +4756,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -4506,9 +4770,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -4536,9 +4802,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "ubus", @@ -4560,9 +4828,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -4573,9 +4843,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "mapping": [ { "type": "ubus", @@ -4597,9 +4869,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "ubus", @@ -4669,9 +4943,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AutoStart": { "type": "boolean", @@ -4692,9 +4968,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Vendor": { "type": "string", @@ -4705,9 +4983,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - }, + "range": [ + { + "max": 128 + } + ], "mapping": [ { "type": "ubus", @@ -4729,9 +5009,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "mapping": [ { "type": "ubus", @@ -4753,9 +5035,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -4777,9 +5061,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "kilobytes", "mapping": [ { @@ -4802,9 +5088,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "kilobytes", "mapping": [ { @@ -4981,9 +5269,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "AnnouncedToSCLList": { "type": "string", @@ -5121,10 +5411,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - }, + "range": [ + { + "min": 0, + "max": 100 + } + ], "unit": "percent" }, "FinalStatus": { @@ -5166,9 +5458,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "PolicyScope": { "type": "string", @@ -5214,9 +5508,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ANName": { "type": "string", @@ -5269,9 +5565,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "FailedAttempts": { "type": "unsignedInt", @@ -5317,9 +5615,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RCAT": { "type": "string", @@ -5363,9 +5663,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Schedules": { "type": "string", @@ -5411,9 +5713,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "StartTime": { "type": "dateTime", @@ -5486,9 +5790,11 @@ "cwmp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RCAT": { "type": "string", @@ -5507,9 +5813,11 @@ "cwmp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" }, "Thresh": { @@ -5763,9 +6071,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 6 - }, + "range": [ + { + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -5778,9 +6088,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SerialNumber": { "type": "string", @@ -5790,9 +6102,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "Device.Time.": { @@ -5839,9 +6153,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NTPServer2": { "type": "string", @@ -5852,9 +6168,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NTPServer3": { "type": "string", @@ -5865,9 +6183,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NTPServer4": { "type": "string", @@ -5878,9 +6198,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NTPServer5": { "type": "string", @@ -5891,9 +6213,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "CurrentLocalTime": { "type": "dateTime", @@ -5914,9 +6238,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.UserInterface.": { @@ -5995,9 +6321,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ISPHelpDesk": { "type": "string", @@ -6008,9 +6336,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "ISPHomePage": { "type": "string", @@ -6021,9 +6351,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ISPHelpPage": { "type": "string", @@ -6034,9 +6366,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ISPLogo": { "type": "base64", @@ -6047,10 +6381,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 4095 - } + "range": [ + { + "min": 0, + "max": 4095 + } + ] }, "ISPLogoSize": { "type": "unsignedInt", @@ -6061,10 +6397,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4095 - } + "range": [ + { + "min": 0, + "max": 4095 + } + ] }, "ISPMailServer": { "type": "string", @@ -6075,9 +6413,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ISPNewsServer": { "type": "string", @@ -6088,9 +6428,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TextColor": { "type": "hexBinary", @@ -6101,10 +6443,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "BackgroundColor": { "type": "hexBinary", @@ -6115,10 +6459,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "ButtonColor": { "type": "hexBinary", @@ -6129,10 +6475,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "ButtonTextColor": { "type": "hexBinary", @@ -6143,10 +6491,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "AutoUpdateServer": { "type": "string", @@ -6157,9 +6507,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UserUpdateServer": { "type": "string", @@ -6170,9 +6522,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AvailableLanguages": { "type": "string", @@ -6196,9 +6550,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 16 - } + "range": [ + { + "max": 16 + } + ] }, "PasswordReset()": { "type": "command", @@ -6233,9 +6589,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SupportedProtocols": { "type": "string", @@ -6386,9 +6744,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "SubTitle": { "type": "string", @@ -6399,9 +6759,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "Text": { "type": "string", @@ -6441,10 +6803,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "BackgroundColor": { "type": "hexBinary", @@ -6455,10 +6819,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "TitleColor": { "type": "hexBinary", @@ -6469,10 +6835,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "SubTitleColor": { "type": "hexBinary", @@ -6483,10 +6851,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "RequestedNumberOfRepetitions": { "type": "unsignedInt", @@ -6527,9 +6897,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "HigherLayer": { "type": "string", @@ -6540,9 +6912,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "LowerLayer": { "type": "string", @@ -6553,9 +6927,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "HigherAlias": { "type": "string", @@ -6566,9 +6942,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LowerAlias": { "type": "string", @@ -6579,9 +6957,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "Device.DSL.": { @@ -6700,9 +7080,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -6713,9 +7095,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -6771,9 +7155,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "ubus", @@ -6875,10 +7261,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 8, - "max": 8 - }, + "range": [ + { + "min": 8, + "max": 8 + } + ], "mapping": [ { "type": "ubus", @@ -6921,10 +7309,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 8, - "max": 8 - }, + "range": [ + { + "min": 8, + "max": 8 + } + ], "mapping": [ { "type": "ubus", @@ -7059,10 +7449,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 6 - }, + "range": [ + { + "min": 0, + "max": 6 + } + ], "mapping": [ { "type": "ubus", @@ -7084,10 +7476,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 1280 - }, + "range": [ + { + "min": 0, + "max": 1280 + } + ], "unit": "0.1 dB", "mapping": [ { @@ -7111,10 +7505,16 @@ ], "list": { "datatype": "unsignedInt", - "range": { - "min": 2047, - "max": 2047 - }, + "range": [ + { + "min": 0, + "max": 1280 + }, + { + "min": 2047, + "max": 2047 + } + ], "unit": "0.1 dB" } }, @@ -7128,10 +7528,16 @@ ], "list": { "datatype": "unsignedInt", - "range": { - "min": 2047, - "max": 2047 - }, + "range": [ + { + "min": 0, + "max": 1280 + }, + { + "min": 2047, + "max": 2047 + } + ], "unit": "0.1 dB" }, "mapping": [ @@ -7155,10 +7561,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -640, - "max": 0 - }, + "range": [ + { + "min": -640, + "max": 0 + } + ], "unit": "0.1 dB", "mapping": [ { @@ -7181,10 +7589,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 4 - }, + "range": [ + { + "min": 1, + "max": 4 + } + ], "mapping": [ { "type": "ubus", @@ -7206,10 +7616,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 4 - }, + "range": [ + { + "min": 1, + "max": 4 + } + ], "mapping": [ { "type": "ubus", @@ -7326,10 +7738,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 1280 - }, + "range": [ + { + "min": 0, + "max": 1280 + } + ], "unit": "0.1dB", "mapping": [ { @@ -7352,10 +7766,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 145 - } + "range": [ + { + "min": 0, + "max": 145 + } + ] }, "MREFPSDus": { "type": "base64", @@ -7366,10 +7782,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 145 - } + "range": [ + { + "min": 0, + "max": 145 + } + ] }, "LIMITMASK": { "type": "unsignedInt", @@ -7495,10 +7913,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 97 - } + "range": [ + { + "min": 0, + "max": 97 + } + ] }, "VirtualNoisePSDus": { "type": "base64", @@ -7509,10 +7929,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 49 - } + "range": [ + { + "min": 0, + "max": 49 + } + ] }, "ACTUALCE": { "type": "unsignedInt", @@ -7533,9 +7955,11 @@ "usp" ], "datatype": "int", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "mapping": [ { "type": "ubus", @@ -7693,10 +8117,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 3, - "max": 511 - } + "range": [ + { + "min": 3, + "max": 511 + } + ] }, "INMIATSds": { "type": "unsignedInt", @@ -7707,10 +8133,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "INMCCds": { "type": "unsignedInt", @@ -7721,10 +8149,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 64 - } + "range": [ + { + "min": 0, + "max": 64 + } + ] }, "INMINPEQMODEds": { "type": "unsignedInt", @@ -7735,10 +8165,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 3 - } + "range": [ + { + "min": 0, + "max": 3 + } + ] }, "UpstreamAttenuation": { "type": "int", @@ -7837,10 +8269,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 4, - "max": 4 - }, + "range": [ + { + "min": 4, + "max": 4 + } + ], "mapping": [ { "type": "ubus", @@ -7862,10 +8296,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 2, - "max": 2 - }, + "range": [ + { + "min": 2, + "max": 2 + } + ], "mapping": [ { "type": "ubus", @@ -7929,10 +8365,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 4, - "max": 4 - }, + "range": [ + { + "min": 4, + "max": 4 + } + ], "mapping": [ { "type": "ubus", @@ -7954,10 +8392,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 2, - "max": 2 - }, + "range": [ + { + "min": 2, + "max": 2 + } + ], "mapping": [ { "type": "ubus", @@ -8764,9 +9204,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -8838,9 +9280,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -8851,9 +9295,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -8945,9 +9391,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 3 - }, + "range": [ + { + "max": 3 + } + ], "mapping": [ { "type": "ubus", @@ -9205,10 +9653,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "0.1 DMT symbols", "mapping": [ { @@ -10143,9 +10593,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -10156,9 +10608,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -10248,10 +10702,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 32 - } + "range": [ + { + "min": 1, + "max": 32 + } + ] }, "RunningTime": { "type": "unsignedInt", @@ -10339,10 +10795,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 32 - } + "range": [ + { + "min": 1, + "max": 32 + } + ] }, "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.": { "type": "object", @@ -10361,9 +10819,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Channel": { "type": "string", @@ -10374,9 +10834,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.": { "type": "object", @@ -11272,9 +11734,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "output": { @@ -11658,9 +12122,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UERMaxMeasurementDuration": { "type": "unsignedInt", @@ -11670,10 +12136,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 5, - "max": 240 - }, + "range": [ + { + "min": 5, + "max": 240 + } + ], "unit": "seconds" } }, @@ -11733,10 +12201,16 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 12, - "max": 12 - }, + "range": [ + { + "min": 1, + "max": 2 + }, + { + "min": 12, + "max": 12 + } + ], "unit": "subcarriers" }, "UERVar": { @@ -11770,9 +12244,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "QLNMaxMeasurementDuration": { "type": "unsignedInt", @@ -11782,10 +12258,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 240 - }, + "range": [ + { + "min": 1, + "max": 240 + } + ], "unit": "seconds" } }, @@ -11833,10 +12311,16 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 12, - "max": 12 - }, + "range": [ + { + "min": 1, + "max": 2 + }, + { + "min": 12, + "max": 12 + } + ], "unit": "subcarriers" } } @@ -11855,9 +12339,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "CapacityEstimateEnabling": { "type": "boolean", @@ -11906,10 +12392,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 310 - }, + "range": [ + { + "min": 0, + "max": 310 + } + ], "unit": "0.1 dB" } }, @@ -11936,9 +12424,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 21 - } + "range": [ + { + "max": 21 + } + ] }, "LoopLength": { "type": "unsignedInt", @@ -11948,10 +12438,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 16383 - }, + "range": [ + { + "min": 0, + "max": 16383 + } + ], "unit": "meters" }, "LoopTopology": { @@ -12030,9 +12522,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ACTPSDds": { "type": "int", @@ -12414,9 +12908,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UERMaxMeasurementDuration": { "type": "unsignedInt", @@ -12426,10 +12922,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 5, - "max": 240 - }, + "range": [ + { + "min": 5, + "max": 240 + } + ], "unit": "seconds" }, "ExtendedBandwidthOperation": { @@ -12473,10 +12971,16 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 12, - "max": 12 - }, + "range": [ + { + "min": 1, + "max": 2 + }, + { + "min": 12, + "max": 12 + } + ], "unit": "subcarriers" }, "UERVar": { @@ -12526,9 +13030,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "QLNMaxMeasurementDuration": { "type": "unsignedInt", @@ -12538,10 +13044,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 240 - }, + "range": [ + { + "min": 1, + "max": 240 + } + ], "unit": "seconds" }, "ExtendedBandwidthOperation": { @@ -12573,10 +13081,16 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 12, - "max": 12 - }, + "range": [ + { + "min": 1, + "max": 2 + }, + { + "min": 12, + "max": 12 + } + ], "unit": "subcarriers" } }, @@ -12611,9 +13125,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "CapacityEstimateEnabling": { "type": "boolean", @@ -12662,10 +13178,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 310 - }, + "range": [ + { + "min": 0, + "max": 310 + } + ], "unit": "0.1 dB" }, "LoopTermination": { @@ -12676,9 +13194,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 21 - } + "range": [ + { + "max": 21 + } + ] }, "LoopLength": { "type": "unsignedInt", @@ -12688,10 +13208,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 16383 - }, + "range": [ + { + "min": 0, + "max": 16383 + } + ], "unit": "meters" }, "LoopTopology": { @@ -12780,9 +13302,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Format": { "type": "string", @@ -12805,9 +13329,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "PacketCount": { @@ -12836,9 +13362,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 2048 - } + "range": [ + { + "max": 2048 + } + ] }, "FilterExpression": { "type": "string", @@ -12848,9 +13376,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Username": { "type": "string", @@ -12860,9 +13390,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -12872,9 +13404,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Device.PacketCaptureDiagnostics.PacketCaptureResult.{i}.": { "type": "object", @@ -12891,9 +13425,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 2048 - } + "range": [ + { + "max": 2048 + } + ] }, "StartTime": { "type": "dateTime", @@ -12988,9 +13524,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -13001,9 +13539,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -13048,9 +13588,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LinkStatus": { "type": "string", @@ -13121,10 +13663,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 5 - } + "range": [ + { + "min": 0, + "max": 5 + } + ] }, "UPBOKLER": { "type": "unsignedInt", @@ -13135,10 +13679,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 1280 - }, + "range": [ + { + "min": 0, + "max": 1280 + } + ], "unit": "0.1 dB" }, "LastTransmittedDownstreamSignal": { @@ -13150,10 +13696,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 21 - } + "range": [ + { + "min": 0, + "max": 21 + } + ] }, "LastTransmittedUpstreamSignal": { "type": "unsignedInt", @@ -13164,10 +13712,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 21 - } + "range": [ + { + "min": 0, + "max": 21 + } + ] }, "UPBOKLE": { "type": "unsignedInt", @@ -13178,10 +13728,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 1280 - }, + "range": [ + { + "min": 0, + "max": 1280 + } + ], "unit": "0.1dB" }, "LineNumber": { @@ -13193,9 +13745,11 @@ "usp" ], "datatype": "int", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "UpstreamMaxBitRate": { "type": "unsignedInt", @@ -14400,9 +14954,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -14413,9 +14969,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -14700,9 +15258,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -14713,9 +15273,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -14760,10 +15322,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 15, - "max": 15 - }, + "range": [ + { + "min": 15, + "max": 15 + } + ], "pattern": [ "[0-9]{15,15}" ] @@ -14819,9 +15383,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "NetworkRequested": { @@ -14833,9 +15399,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NetworkInUse": { "type": "string", @@ -14846,9 +15414,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RSSI": { "type": "int", @@ -14917,10 +15487,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 14, - "max": 15 - }, + "range": [ + { + "min": 14, + "max": 15 + } + ], "pattern": [ "[0-9]{14,15}" ] @@ -14934,10 +15506,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 20 - }, + "range": [ + { + "min": 6, + "max": 20 + } + ], "pattern": [ "[0-9]{6,20}" ] @@ -14951,10 +15525,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 14, - "max": 15 - }, + "range": [ + { + "min": 14, + "max": 15 + } + ], "pattern": [ "[0-9]{14,15}" ] @@ -14983,9 +15559,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 4 - } + "range": [ + { + "max": 4 + } + ] } }, "Device.Cellular.Interface.{i}.Stats.": { @@ -15175,9 +15753,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "APN": { "type": "string", @@ -15188,9 +15768,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Username": { "type": "string", @@ -15201,9 +15783,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -15214,9 +15798,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Proxy": { "type": "string", @@ -15227,9 +15813,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ProxyPort": { "type": "unsignedInt", @@ -15240,10 +15828,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "Interface": { "type": "string", @@ -15331,9 +15921,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -15344,9 +15936,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -15438,9 +16032,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "pattern": [ "\\d+/\\d+" ], @@ -15867,9 +16463,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NumberOfRepetitions": { "type": "unsignedInt", @@ -15879,9 +16477,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -15891,9 +16491,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" } }, @@ -15995,9 +16597,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NumberOfRepetitions": { "type": "unsignedInt", @@ -16007,9 +16611,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -16019,9 +16625,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "SuccessCount": { @@ -16149,9 +16757,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -16162,9 +16772,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -16214,9 +16826,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -16606,9 +17220,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -16619,9 +17235,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -16694,9 +17312,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ], @@ -16723,9 +17343,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "Mbps", "mapping": [ { @@ -17123,9 +17745,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -17136,9 +17760,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -17173,9 +17799,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -17406,9 +18034,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -17419,9 +18049,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -17469,10 +18101,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 4094 - } + "range": [ + { + "min": 1, + "max": 4094 + } + ] }, "TPID": { "type": "unsignedInt", @@ -17806,9 +18440,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -17819,9 +18455,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -17842,10 +18480,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4094 - } + "range": [ + { + "min": 0, + "max": 4094 + } + ] }, "Queue": { "type": "string", @@ -18046,9 +18686,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -18076,9 +18718,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -18141,9 +18785,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -18154,9 +18800,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -18191,9 +18839,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -18433,9 +19083,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -18446,9 +19098,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -18493,9 +19147,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -18520,9 +19176,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Device.USB.Interface.{i}.Stats.": { "type": "object", @@ -18701,9 +19359,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -18714,9 +19374,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Standard": { "type": "string", @@ -18727,9 +19389,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 4 - } + "range": [ + { + "max": 4 + } + ] }, "Type": { "type": "string", @@ -18830,9 +19494,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -18853,9 +19519,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Type": { "type": "string", @@ -18901,9 +19569,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 4 - } + "range": [ + { + "max": 4 + } + ] }, "DeviceNumberOfEntries": { "type": "unsignedInt", @@ -18948,9 +19618,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 4 - } + "range": [ + { + "max": 4 + } + ] }, "DeviceClass": { "type": "hexBinary", @@ -18961,9 +19633,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 1 - } + "range": [ + { + "max": 1 + } + ] }, "DeviceSubClass": { "type": "hexBinary", @@ -18974,9 +19648,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 1 - } + "range": [ + { + "max": 1 + } + ] }, "DeviceVersion": { "type": "unsignedInt", @@ -18987,9 +19663,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DeviceProtocol": { "type": "hexBinary", @@ -19000,9 +19678,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 1 - } + "range": [ + { + "max": 1 + } + ] }, "ProductID": { "type": "unsignedInt", @@ -19013,9 +19693,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "VendorID": { "type": "unsignedInt", @@ -19026,9 +19708,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Manufacturer": { "type": "string", @@ -19039,9 +19723,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProductClass": { "type": "string", @@ -19052,9 +19738,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SerialNumber": { "type": "string", @@ -19065,9 +19753,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Port": { "type": "unsignedInt", @@ -19078,9 +19768,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "USBPort": { "type": "string", @@ -19203,9 +19895,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "InterfaceClass": { "type": "hexBinary", @@ -19216,9 +19910,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 1 - } + "range": [ + { + "max": 1 + } + ] }, "InterfaceSubClass": { "type": "hexBinary", @@ -19229,9 +19925,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 1 - } + "range": [ + { + "max": 1 + } + ] }, "InterfaceProtocol": { "type": "hexBinary", @@ -19242,9 +19940,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 1 - } + "range": [ + { + "max": 1 + } + ] } } } @@ -19316,9 +20016,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -19329,9 +20031,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -19376,9 +20080,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -19392,9 +20098,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NodeID": { "type": "unsignedInt", @@ -19457,10 +20165,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 1000 - }, + "range": [ + { + "min": 0, + "max": 1000 + } + ], "unit": "0.1%" }, "PossibleConnectionTypes": { @@ -19828,9 +20538,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "TrafficClasses": { "type": "string", @@ -19870,10 +20582,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "Latency": { "type": "unsignedInt", @@ -19884,10 +20598,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "milliseconds" }, "Jitter": { @@ -19899,10 +20615,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "milliseconds" }, "PacketSize": { @@ -19914,9 +20632,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0 - } + "range": [ + { + "min": 0 + } + ] }, "MinRate": { "type": "unsignedInt", @@ -19988,9 +20708,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -20091,9 +20813,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NumPacketsInBurst": { "type": "unsignedInt", @@ -20122,10 +20846,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 1480 - } + "range": [ + { + "min": 0, + "max": 1480 + } + ] }, "PayloadEncoding": { "type": "unsignedInt", @@ -20166,10 +20892,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] } }, "output": { @@ -20213,9 +20941,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SampleInterval": { "type": "unsignedInt", @@ -20277,9 +21007,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NumPacketsInBurst": { "type": "unsignedInt", @@ -20308,10 +21040,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 1480 - } + "range": [ + { + "min": 0, + "max": 1480 + } + ] }, "PayloadEncoding": { "type": "unsignedInt", @@ -20352,10 +21086,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "ResultNumberOfEntries": { "type": "unsignedInt", @@ -20381,9 +21117,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -20396,9 +21134,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -20485,9 +21225,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SampleInterval": { "type": "unsignedInt", @@ -20548,9 +21290,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -20788,10 +21532,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 1000 - }, + "range": [ + { + "min": 0, + "max": 1000 + } + ], "unit": "0.1%" } } @@ -20836,9 +21582,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -20851,9 +21599,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -20866,9 +21616,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -20881,9 +21633,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -20953,9 +21707,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -21026,9 +21782,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -21039,9 +21797,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -21086,9 +21846,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -21102,9 +21864,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "MaxBitRate": { "type": "unsignedInt", @@ -21148,9 +21912,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "pattern": [ "\\d+(\\.\\d+)*" ] @@ -21164,9 +21930,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "pattern": [ "\\d+(\\.\\d+)*" ] @@ -21250,10 +22018,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 8, - "max": 8 - } + "range": [ + { + "min": 8, + "max": 8 + } + ] }, "FreqCurrentMaskSetting": { "type": "hexBinary", @@ -21264,10 +22034,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 8, - "max": 8 - } + "range": [ + { + "min": 8, + "max": 8 + } + ] }, "FreqCurrentMask": { "type": "hexBinary", @@ -21278,10 +22050,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 8, - "max": 8 - } + "range": [ + { + "min": 8, + "max": 8 + } + ] }, "CurrentOperFreq": { "type": "unsignedInt", @@ -21312,10 +22086,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 12, - "max": 17 - }, + "range": [ + { + "min": 12, + "max": 17 + } + ], "pattern": [ "\\d+" ] @@ -21360,10 +22136,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 8, - "max": 8 - } + "range": [ + { + "min": 8, + "max": 8 + } + ] }, "NodeTabooMask": { "type": "hexBinary", @@ -21374,10 +22152,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 8, - "max": 8 - } + "range": [ + { + "min": 8, + "max": 8 + } + ] }, "TxBcastRate": { "type": "unsignedInt", @@ -21420,10 +22200,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 10 - }, + "range": [ + { + "min": 0, + "max": 10 + } + ], "unit": "packets" }, "AssociatedDeviceNumberOfEntries": { @@ -21660,9 +22442,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -21739,9 +22523,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -21775,9 +22561,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "pattern": [ "\\d+(\\.\\d+)*" ] @@ -21897,10 +22685,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 10 - }, + "range": [ + { + "min": 0, + "max": 10 + } + ], "unit": "packets" }, "RxSNR": { @@ -21991,9 +22781,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -22004,9 +22796,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -22051,9 +22845,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -22067,9 +22863,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ConnectionType": { "type": "string", @@ -22108,9 +22906,11 @@ "list": { "datatype": "string", "maxsize": 1024, - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] } }, "DomainName": { @@ -22122,9 +22922,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "DomainNameIdentifier": { "type": "unsignedInt", @@ -22286,9 +23088,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 2 - } + "range": [ + { + "max": 2 + } + ] }, "PHYThroughputDiagnosticsEnable": { "type": "string", @@ -22632,9 +23436,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -22699,9 +23505,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "DomainNameIdentifier": { "type": "hexBinary", @@ -22712,9 +23520,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 2 - } + "range": [ + { + "max": 2 + } + ] }, "DomainId": { "type": "unsignedInt", @@ -22735,10 +23545,16 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 10, - "max": 200 - }, + "range": [ + { + "min": 0, + "max": 0 + }, + { + "min": 10, + "max": 200 + } + ], "unit": "0.5 msec" }, "SCDeviceId": { @@ -22760,9 +23576,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -22776,10 +23594,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 5, - "max": 63 - }, + "range": [ + { + "min": 5, + "max": 63 + } + ], "unit": "2 seconds" }, "TopologyPeriodicInterval": { @@ -22791,10 +23611,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "0.1 sec" }, "MinSupportedBandplan": { @@ -22959,9 +23781,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -23007,9 +23831,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -23032,10 +23858,44 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 256, - "max": 256 - } + "range": [ + { + "min": 1, + "max": 1 + }, + { + "min": 2, + "max": 2 + }, + { + "min": 4, + "max": 4 + }, + { + "min": 8, + "max": 8 + }, + { + "min": 16, + "max": 16 + }, + { + "min": 32, + "max": 32 + }, + { + "min": 64, + "max": 64 + }, + { + "min": 128, + "max": 128 + }, + { + "min": 256, + "max": 256 + } + ] } }, "output": { @@ -23119,9 +23979,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -23144,10 +24006,44 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 256, - "max": 256 - } + "range": [ + { + "min": 1, + "max": 1 + }, + { + "min": 2, + "max": 2 + }, + { + "min": 4, + "max": 4 + }, + { + "min": 8, + "max": 8 + }, + { + "min": 16, + "max": 16 + }, + { + "min": 32, + "max": 32 + }, + { + "min": 64, + "max": 64 + }, + { + "min": 128, + "max": 128 + }, + { + "min": 256, + "max": 256 + } + ] }, "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.": { "type": "object", @@ -23198,9 +24094,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -23454,9 +24352,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -23542,9 +24442,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -23555,9 +24457,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -23602,9 +24506,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -23618,9 +24524,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Version": { "type": "string", @@ -23631,9 +24539,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 16 - } + "range": [ + { + "max": 16 + } + ] }, "FirmwareVersion": { "type": "string", @@ -23644,9 +24554,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ForceCCo": { "type": "boolean", @@ -23667,9 +24579,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "OtherNetworksPresent": { "type": "string", @@ -23931,9 +24845,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -24000,9 +24916,11 @@ "item": { "max": 16 }, - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -24085,9 +25003,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -24098,9 +25018,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -24145,9 +25067,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -24161,9 +25085,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "MaxBitRate": { "type": "unsignedInt", @@ -24199,9 +25125,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 20 - } + "range": [ + { + "max": 20 + } + ] }, "EncryptionMethod": { "type": "string", @@ -24212,9 +25140,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 6 - }, + "range": [ + { + "max": 6 + } + ], "enumerations": [ "None", "DES", @@ -24232,9 +25162,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 36 - } + "range": [ + { + "max": 36 + } + ] }, "PowerBackoffEnabled": { "type": "boolean", @@ -24483,9 +25415,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -24499,10 +25433,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "LogicalNetwork": { "type": "string", @@ -24513,9 +25449,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 20 - } + "range": [ + { + "max": 20 + } + ] }, "PhyTxThroughput": { "type": "unsignedInt", @@ -24559,10 +25497,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - }, + "range": [ + { + "min": 0, + "max": 100 + } + ], "unit": "percent" }, "MeanEstimatedAtt": { @@ -24585,9 +25525,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -24640,9 +25582,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "StartFreq": { "type": "unsignedInt", @@ -24695,9 +25639,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "MACAddress": { "type": "string", @@ -24708,9 +25654,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -24724,10 +25672,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } } }, @@ -24766,9 +25716,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -24778,10 +25730,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } }, "output": { @@ -24871,9 +25825,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -24883,10 +25839,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Measurements": { "type": "string", @@ -25179,9 +26137,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -25205,10 +26165,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -25222,9 +26184,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SerialNumber": { "type": "string", @@ -25235,9 +26199,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SoftwareVersion": { "type": "string", @@ -25248,9 +26214,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastContactTime": { "type": "dateTime", @@ -25301,9 +26269,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -25337,9 +26307,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 100 - }, + "range": [ + { + "max": 100 + } + ], "unit": "%" }, "BackhaulSignalStrength": { @@ -25351,9 +26323,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - }, + "range": [ + { + "max": 255 + } + ], "unit": "dBm" }, "RadioNumberOfEntries": { @@ -25383,9 +26357,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -25433,10 +26409,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 255 - } + "range": [ + { + "min": 1, + "max": 255 + } + ] }, "ExtensionChannel": { "type": "string", @@ -25478,10 +26456,16 @@ "usp" ], "datatype": "int", - "range": { - "min": 16, - "max": 31 - } + "range": [ + { + "min": 0, + "max": 15 + }, + { + "min": 16, + "max": 31 + } + ] }, "TransmitPower": { "type": "int", @@ -25492,10 +26476,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 100 - }, + "range": [ + { + "min": -1, + "max": 100 + } + ], "unit": "percentage" }, "APNumberOfEntries": { @@ -25525,9 +26511,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -25599,9 +26587,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -25675,9 +26665,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - }, + "range": [ + { + "max": 255 + } + ], "unit": "dBm" }, "Noise": { @@ -25689,9 +26681,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "SteeringHistoryNumberOfEntries": { "type": "unsignedInt", @@ -26041,9 +27035,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -26057,10 +27053,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "CollectionInterval": { "type": "unsignedInt", @@ -26100,10 +27098,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 6, - "max": 6 - } + "range": [ + { + "min": 6, + "max": 6 + } + ] }, "Enabled": { "type": "boolean", @@ -26124,9 +27124,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "Utilization": { "type": "unsignedInt", @@ -26137,10 +27139,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "Transmit": { "type": "unsignedInt", @@ -26151,10 +27155,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "ReceiveSelf": { "type": "unsignedInt", @@ -26165,9 +27171,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "ReceiveOther": { "type": "unsignedInt", @@ -26178,10 +27186,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "CurrentOperatingClassProfileNumberOfEntries": { "type": "unsignedInt", @@ -26240,9 +27250,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -26265,10 +27277,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "VHTCapabilities": { "type": "base64", @@ -26279,10 +27293,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 2, - "max": 6 - } + "range": [ + { + "min": 2, + "max": 6 + } + ] }, "HECapabilities": { "type": "base64", @@ -26293,10 +27309,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 4, - "max": 14 - } + "range": [ + { + "min": 4, + "max": 14 + } + ] }, "CapableOperatingClassProfileNumberOfEntries": { "type": "unsignedInt", @@ -26325,9 +27343,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "MaxTxPower": { "type": "int", @@ -26338,10 +27358,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -127, - "max": 127 - }, + "range": [ + { + "min": -127, + "max": 127 + } + ], "unit": "dBm" }, "NonOperable": { @@ -26354,9 +27376,11 @@ ], "list": { "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] } }, "NumberOfNonOperChan": { @@ -26388,9 +27412,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "Channel": { "type": "unsignedInt", @@ -26401,9 +27427,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "TxPower": { "type": "int", @@ -26414,10 +27442,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -127, - "max": 127 - }, + "range": [ + { + "min": -127, + "max": 127 + } + ], "unit": "dBm" }, "TimeStamp": { @@ -26448,9 +27478,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -26565,10 +27597,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 3 - } + "range": [ + { + "min": 0, + "max": 3 + } + ] }, "EstServiceParametersBK": { "type": "base64", @@ -26579,10 +27613,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 3 - } + "range": [ + { + "min": 0, + "max": 3 + } + ] }, "EstServiceParametersVI": { "type": "base64", @@ -26593,10 +27629,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 3 - } + "range": [ + { + "min": 0, + "max": 3 + } + ] }, "EstServiceParametersVO": { "type": "base64", @@ -26607,10 +27645,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 0, - "max": 3 - } + "range": [ + { + "min": 0, + "max": 3 + } + ] }, "STANumberOfEntries": { "type": "unsignedInt", @@ -26639,9 +27679,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -26665,10 +27707,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "VHTCapabilities": { "type": "base64", @@ -26679,10 +27723,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 2, - "max": 6 - } + "range": [ + { + "min": 2, + "max": 6 + } + ] }, "HECapabilities": { "type": "base64", @@ -26693,10 +27739,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 4, - "max": 14 - } + "range": [ + { + "min": 4, + "max": 14 + } + ] }, "LastDataDownlinkRate": { "type": "unsignedInt", @@ -26773,9 +27821,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - }, + "range": [ + { + "max": 255 + } + ], "unit": "dBm" }, "LastConnectTime": { @@ -26890,9 +27940,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -26906,9 +27958,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "Hostname": { "type": "string", @@ -26967,9 +28021,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "ChannelScanNumberOfEntries": { "type": "unsignedInt", @@ -26998,9 +28054,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "TimeStamp": { "type": "string", @@ -27021,9 +28079,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "Noise": { "type": "unsignedInt", @@ -27034,9 +28094,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "NeighborBSSNumberOfEntries": { "type": "unsignedInt", @@ -27065,9 +28127,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -27091,9 +28155,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - }, + "range": [ + { + "max": 255 + } + ], "unit": "dBm" }, "ChannelBandwidth": { @@ -27115,9 +28181,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "StationCount": { "type": "unsignedInt", @@ -27150,9 +28218,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -27166,9 +28236,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - }, + "range": [ + { + "max": 255 + } + ], "unit": "dBm" } } @@ -27210,9 +28282,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -27226,9 +28300,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -27252,10 +28328,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "VHTCapabilities": { "type": "base64", @@ -27266,10 +28344,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 2, - "max": 6 - } + "range": [ + { + "min": 2, + "max": 6 + } + ] }, "HECapabilities": { "type": "base64", @@ -27280,10 +28360,12 @@ "usp" ], "datatype": "base64", - "range": { - "min": 4, - "max": 14 - } + "range": [ + { + "min": 4, + "max": 14 + } + ] }, "TimeStamp": { "type": "string", @@ -27332,9 +28414,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -27348,9 +28432,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -27534,9 +28620,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -27547,9 +28635,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -27763,10 +28853,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 255 - }, + "range": [ + { + "min": 1, + "max": 255 + } + ], "mapping": [ { "type": "uci", @@ -27883,9 +28975,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "MaxSupportedAssociations": { "type": "unsignedInt", @@ -27896,9 +28990,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "mapping": [ { "type": "uci", @@ -27924,9 +29020,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SupportedOperatingChannelBandwidths": { "type": "string", @@ -28082,10 +29180,16 @@ "usp" ], "datatype": "int", - "range": { - "min": 16, - "max": 31 - } + "range": [ + { + "min": -1, + "max": 15 + }, + { + "min": 16, + "max": 31 + } + ] }, "TransmitPowerSupported": { "type": "string", @@ -28098,10 +29202,12 @@ "list": { "datatype": "int", "maxsize": 64, - "range": { - "min": -1, - "max": 100 - }, + "range": [ + { + "min": -1, + "max": 100 + } + ], "unit": "percentage" } }, @@ -28114,10 +29220,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 100 - }, + "range": [ + { + "min": -1, + "max": 100 + } + ], "unit": "percentage", "mapping": [ { @@ -28179,10 +29287,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 3, - "max": 3 - }, + "range": [ + { + "min": 3, + "max": 3 + } + ], "pattern": [ "[A-Z][A-Z][ OI]" ], @@ -28211,10 +29321,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "CCARequest": { "type": "hexBinary", @@ -28225,10 +29337,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 11, - "max": 11 - } + "range": [ + { + "min": 11, + "max": 11 + } + ] }, "CCAReport": { "type": "hexBinary", @@ -28239,10 +29353,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 12, - "max": 12 - } + "range": [ + { + "min": 12, + "max": 12 + } + ] }, "RPIHistogramRequest": { "type": "hexBinary", @@ -28253,10 +29369,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 11, - "max": 11 - } + "range": [ + { + "min": 11, + "max": 11 + } + ] }, "RPIHistogramReport": { "type": "hexBinary", @@ -28267,10 +29385,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 19, - "max": 19 - } + "range": [ + { + "min": 19, + "max": 19 + } + ] }, "FragmentationThreshold": { "type": "unsignedInt", @@ -28827,9 +29947,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "BSSID": { "type": "string", @@ -28839,9 +29961,11 @@ "cwmp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -28867,10 +29991,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 255 - } + "range": [ + { + "min": 1, + "max": 255 + } + ] }, "SignalStrength": { "type": "int", @@ -28880,10 +30006,12 @@ "cwmp" ], "datatype": "int", - "range": { - "min": -200, - "max": 0 - }, + "range": [ + { + "min": -200, + "max": 0 + } + ], "unit": "dBm" }, "SecurityModeEnabled": { @@ -29000,10 +30128,12 @@ "cwmp" ], "datatype": "int", - "range": { - "min": -200, - "max": 0 - }, + "range": [ + { + "min": -200, + "max": 0 + } + ], "unit": "dBm" }, "BasicDataTransferRates": { @@ -29128,9 +30258,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -29141,9 +30273,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -29178,9 +30312,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ], @@ -29205,9 +30341,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ], @@ -29234,9 +30372,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "mapping": [ { "type": "uci", @@ -29767,9 +30907,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SSIDReference": { "type": "string", @@ -29780,9 +30922,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SSIDAdvertisementEnabled": { "type": "boolean", @@ -29803,10 +30947,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "WMMCapability": { "type": "boolean", @@ -29973,9 +31119,11 @@ ], "list": { "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -30059,10 +31207,16 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 13, - "max": 13 - } + "range": [ + { + "min": 5, + "max": 5 + }, + { + "min": 13, + "max": 13 + } + ] }, "PreSharedKey": { "type": "hexBinary", @@ -30073,9 +31227,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "KeyPassphrase": { "type": "string", @@ -30086,10 +31242,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 8, - "max": 63 - } + "range": [ + { + "min": 8, + "max": 63 + } + ] }, "RekeyingInterval": { "type": "unsignedInt", @@ -30136,9 +31294,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - }, + "range": [ + { + "max": 45 + } + ], "mapping": [ { "type": "uci", @@ -30164,9 +31324,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "RadiusServerPort": { "type": "unsignedInt", @@ -30392,9 +31554,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 8 - }, + "range": [ + { + "max": 8 + } + ], "pattern": [ "\\d{4}|\\d{8}" ], @@ -30432,9 +31596,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -30476,9 +31642,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000 - }, + "range": [ + { + "min": 1000 + } + ], "unit": "kbps" }, "LastDataUplinkRate": { @@ -30490,9 +31658,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000 - }, + "range": [ + { + "min": 1000 + } + ], "unit": "kbps" }, "AssociationTime": { @@ -30514,10 +31684,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -200, - "max": 0 - }, + "range": [ + { + "min": -200, + "max": 0 + } + ], "unit": "dBm" }, "Noise": { @@ -30529,10 +31701,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -200, - "max": 0 - }, + "range": [ + { + "min": -200, + "max": 0 + } + ], "unit": "dBm" }, "Retransmissions": { @@ -30544,10 +31718,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - }, + "range": [ + { + "min": 0, + "max": 100 + } + ], "unit": "packets" }, "Active": { @@ -30693,9 +31869,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "AIFSN": { "type": "unsignedInt", @@ -30706,10 +31884,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 2, - "max": 15 - } + "range": [ + { + "min": 2, + "max": 15 + } + ] }, "ECWMin": { "type": "unsignedInt", @@ -30720,10 +31900,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 15 - }, + "range": [ + { + "min": 0, + "max": 15 + } + ], "unit": "microseconds" }, "ECWMax": { @@ -30735,10 +31917,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 15 - }, + "range": [ + { + "min": 0, + "max": 15 + } + ], "unit": "microseconds" }, "TxOpMax": { @@ -30750,10 +31934,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "32 microseconds" }, "AckPolicy": { @@ -30928,9 +32114,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - }, + "range": [ + { + "max": 45 + } + ], "mapping": [ { "type": "uci", @@ -30956,9 +32144,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ServerPort": { "type": "unsignedInt", @@ -31039,9 +32229,15 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 60 - }, + "range": [ + { + "min": 0, + "max": 0 + }, + { + "min": 60 + } + ], "unit": "seconds" } } @@ -31129,9 +32325,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProfileReference": { "type": "string", @@ -31142,9 +32340,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SSIDReference": { "type": "string", @@ -31155,9 +32355,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProfileNumberOfEntries": { "type": "unsignedInt", @@ -31186,10 +32388,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 600000 - }, + "range": [ + { + "min": 1000, + "max": 600000 + } + ], "unit": "kbps" }, "LastDataUplinkRate": { @@ -31201,10 +32405,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 600000 - }, + "range": [ + { + "min": 1000, + "max": 600000 + } + ], "unit": "kbps" }, "SignalStrength": { @@ -31216,10 +32422,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -200, - "max": 0 - }, + "range": [ + { + "min": -200, + "max": 0 + } + ], "unit": "dBm" }, "Retransmissions": { @@ -31231,10 +32439,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - }, + "range": [ + { + "min": 0, + "max": 100 + } + ], "unit": "packets" } }, @@ -31316,9 +32526,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SSID": { "type": "string", @@ -31329,9 +32541,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 32 - }, + "range": [ + { + "max": 32 + } + ], "mapping": [ { "type": "uci", @@ -31367,9 +32581,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "Device.WiFi.EndPoint.{i}.Profile.{i}.Security.": { "type": "object", @@ -31398,10 +32614,16 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 13, - "max": 13 - } + "range": [ + { + "min": 5, + "max": 5 + }, + { + "min": 13, + "max": 13 + } + ] }, "PreSharedKey": { "type": "hexBinary", @@ -31412,9 +32634,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 32 - } + "range": [ + { + "max": 32 + } + ] }, "KeyPassphrase": { "type": "string", @@ -31425,10 +32649,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 8, - "max": 63 - } + "range": [ + { + "min": 8, + "max": 63 + } + ] }, "SAEPassphrase": { "type": "string", @@ -31594,10 +32820,16 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 8, - "max": 8 - }, + "range": [ + { + "min": 4, + "max": 4 + }, + { + "min": 8, + "max": 8 + } + ], "mapping": [ { "type": "uci", @@ -31648,9 +32880,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "AIFSN": { "type": "unsignedInt", @@ -31661,10 +32895,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 2, - "max": 15 - } + "range": [ + { + "min": 2, + "max": 15 + } + ] }, "ECWMin": { "type": "unsignedInt", @@ -31675,10 +32911,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 15 - }, + "range": [ + { + "min": 0, + "max": 15 + } + ], "unit": "microseconds" }, "ECWMax": { @@ -31690,10 +32928,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 15 - }, + "range": [ + { + "min": 0, + "max": 15 + } + ], "unit": "microseconds" }, "TxOpMax": { @@ -31705,10 +32945,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "32 microseconds" }, "AckPolicy": { @@ -31932,9 +33174,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -31945,9 +33189,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -31982,9 +33228,11 @@ "usp" ], "datatype": "IEEE_EUI64", - "range": { - "max": 23 - }, + "range": [ + { + "max": 23 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){7}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -31998,9 +33246,11 @@ "usp" ], "datatype": "ZigBeeNetworkAddress", - "range": { - "max": 4 - }, + "range": [ + { + "max": 4 + } + ], "pattern": [ "([0-9A-Fa-f]){4}" ] @@ -32014,9 +33264,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AssociatedDeviceNumberOfEntries": { "type": "unsignedInt", @@ -32204,9 +33456,11 @@ "usp" ], "datatype": "IEEE_EUI64", - "range": { - "max": 23 - }, + "range": [ + { + "max": 23 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){7}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -32220,9 +33474,11 @@ "usp" ], "datatype": "ZigBeeNetworkAddress", - "range": { - "max": 4 - }, + "range": [ + { + "max": 4 + } + ], "pattern": [ "([0-9A-Fa-f]){4}" ] @@ -32246,9 +33502,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -32269,9 +33527,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "IEEEAddress": { "type": "string", @@ -32282,9 +33542,11 @@ "usp" ], "datatype": "IEEE_EUI64", - "range": { - "max": 23 - }, + "range": [ + { + "max": 23 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){7}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -32298,9 +33560,11 @@ "usp" ], "datatype": "ZigBeeNetworkAddress", - "range": { - "max": 4 - }, + "range": [ + { + "max": 4 + } + ], "pattern": [ "([0-9A-Fa-f]){4}" ] @@ -32423,9 +33687,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "MaximumBufferSize": { "type": "unsignedInt", @@ -32436,9 +33702,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 128 - }, + "range": [ + { + "max": 128 + } + ], "unit": "octets" }, "MaximumIncomingTransferSize": { @@ -32450,9 +33718,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 32768 - }, + "range": [ + { + "max": 32768 + } + ], "unit": "octets" }, "MaximumOutgoingTransferSize": { @@ -32464,9 +33734,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 32768 - }, + "range": [ + { + "max": 32768 + } + ], "unit": "octets" }, "ServerMask": { @@ -32605,9 +33877,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 16 - } + "range": [ + { + "max": 16 + } + ] } }, "Device.ZigBee.ZDO.{i}.ComplexDescriptor.": { @@ -32697,9 +33971,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "IconURL": { "type": "string", @@ -32729,9 +34005,11 @@ "usp" ], "datatype": "IEEE_EUI64", - "range": { - "max": 23 - }, + "range": [ + { + "max": 23 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){7}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -32765,9 +34043,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - }, + "range": [ + { + "max": 65535 + } + ], "unit": "milliseconds" } }, @@ -32816,9 +34096,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "Relationship": { "type": "string", @@ -32899,9 +34181,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 4 - }, + "range": [ + { + "max": 4 + } + ], "pattern": [ "([0-9A-Fa-f]){4}" ] @@ -32915,9 +34199,11 @@ "usp" ], "datatype": "ZigBeeNetworkAddress", - "range": { - "max": 4 - }, + "range": [ + { + "max": 4 + } + ], "pattern": [ "([0-9A-Fa-f]){4}" ] @@ -32998,9 +34284,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SourceEndpoint": { "type": "unsignedInt", @@ -33011,9 +34299,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 240 - } + "range": [ + { + "max": 240 + } + ] }, "SourceAddress": { "type": "string", @@ -33024,9 +34314,11 @@ "usp" ], "datatype": "IEEE_EUI64", - "range": { - "max": 23 - }, + "range": [ + { + "max": 23 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){7}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -33040,9 +34332,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DestinationAddressMode": { "type": "string", @@ -33067,9 +34361,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 240 - } + "range": [ + { + "max": 240 + } + ] }, "IEEEDestinationAddress": { "type": "string", @@ -33080,9 +34376,11 @@ "usp" ], "datatype": "IEEE_EUI64", - "range": { - "max": 23 - }, + "range": [ + { + "max": 23 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){7}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -33096,9 +34394,11 @@ "usp" ], "datatype": "ZigBeeNetworkAddress", - "range": { - "max": 4 - }, + "range": [ + { + "max": 4 + } + ], "pattern": [ "([0-9A-Fa-f]){4}" ] @@ -33131,9 +34431,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "GroupId": { "type": "string", @@ -33144,9 +34446,11 @@ "usp" ], "datatype": "ZigBeeNetworkAddress", - "range": { - "max": 4 - }, + "range": [ + { + "max": 4 + } + ], "pattern": [ "([0-9A-Fa-f]){4}" ] @@ -33161,9 +34465,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -33194,9 +34500,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EndpointId": { "type": "unsignedInt", @@ -33207,9 +34515,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 240 - } + "range": [ + { + "max": 240 + } + ] }, "Device.ZigBee.ZDO.{i}.ApplicationEndpoint.{i}.SimpleDescriptor.": { "type": "object", @@ -33228,9 +34538,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DeviceId": { "type": "unsignedInt", @@ -33241,9 +34553,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DeviceVersion": { "type": "unsignedInt", @@ -33254,9 +34568,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 15 - } + "range": [ + { + "max": 15 + } + ] }, "InputClusterList": { "type": "string", @@ -33268,9 +34584,11 @@ ], "list": { "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] } }, "OutputClusterList": { @@ -33283,9 +34601,11 @@ ], "list": { "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] } } } @@ -33363,9 +34683,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Coordinator": { "type": "string", @@ -33376,9 +34698,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ZDOReference": { "type": "string", @@ -33389,9 +34713,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ZDOList": { "type": "string", @@ -33403,9 +34729,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -33598,9 +34926,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Standard": { "type": "string", @@ -33719,9 +35049,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -33732,9 +35064,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -33809,10 +35143,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "PriorityRegeneration": { "type": "string", @@ -33828,10 +35164,12 @@ "min": 8, "max": 8 }, - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] } }, "PortState": { @@ -33861,10 +35199,12 @@ "usp" ], "datatype": "int", - "range": { - "min": 1, - "max": 4094 - } + "range": [ + { + "min": 1, + "max": 4094 + } + ] }, "TPID": { "type": "unsignedInt", @@ -33925,10 +35265,12 @@ "min": 8, "max": 8 }, - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] } }, "PriorityTagging": { @@ -34208,10 +35550,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 4 - } + "range": [ + { + "min": 1, + "max": 4 + } + ] }, "UseDEI": { "type": "boolean", @@ -34247,10 +35591,12 @@ "min": 4, "max": 4 }, - "range": { - "min": 31, - "max": 31 - }, + "range": [ + { + "min": 31, + "max": 31 + } + ], "pattern": [ "([0-7],){15}[0-7]" ] @@ -34270,10 +35616,12 @@ "min": 4, "max": 4 }, - "range": { - "min": 15, - "max": 15 - }, + "range": [ + { + "min": 15, + "max": 15 + } + ], "pattern": [ "([0-7],[0-1],){7}[0-7],[0-1]" ] @@ -34308,9 +35656,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -34321,9 +35671,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "VLANID": { "type": "int", @@ -34334,10 +35686,12 @@ "usp" ], "datatype": "int", - "range": { - "min": 1, - "max": 4094 - } + "range": [ + { + "min": 1, + "max": 4094 + } + ] } }, "Device.Bridging.Bridge.{i}.VLANPort.{i}.": { @@ -34367,9 +35721,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "VLAN": { "type": "string", @@ -34380,9 +35736,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "string", @@ -34393,9 +35751,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Untagged": { "type": "boolean", @@ -34436,9 +35796,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Status": { "type": "string", @@ -34465,9 +35827,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Order": { "type": "unsignedInt", @@ -34478,9 +35842,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Interface": { "type": "string", @@ -34491,9 +35857,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DHCPType": { "type": "string", @@ -34518,10 +35886,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4094 - } + "range": [ + { + "min": 0, + "max": 4094 + } + ] }, "EthertypeFilterList": { "type": "string", @@ -34601,9 +35971,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "SourceMACFromVendorClassIDFilterv6": { "type": "hexBinary", @@ -34614,9 +35986,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SourceMACFromVendorClassIDFilterExclude": { "type": "boolean", @@ -34653,9 +36027,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "DestMACFromVendorClassIDFilterv6": { "type": "hexBinary", @@ -34666,9 +36042,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DestMACFromVendorClassIDFilterExclude": { "type": "boolean", @@ -34705,9 +36083,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SourceMACFromClientIDFilterExclude": { "type": "boolean", @@ -34728,9 +36108,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DestMACFromClientIDFilterExclude": { "type": "boolean", @@ -34751,9 +36133,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SourceMACFromUserClassIDFilterExclude": { "type": "boolean", @@ -34774,9 +36158,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DestMACFromUserClassIDFilterExclude": { "type": "boolean", @@ -34797,9 +36183,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "DestMask": { "type": "string", @@ -34810,9 +36198,11 @@ "usp" ], "datatype": "IPPrefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "DestIPExclude": { "type": "boolean", @@ -34833,9 +36223,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SourceMask": { "type": "string", @@ -34846,9 +36238,11 @@ "usp" ], "datatype": "IPPrefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "SourceIPExclude": { "type": "boolean", @@ -34869,10 +36263,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 255 - } + "range": [ + { + "min": -1, + "max": 255 + } + ] }, "ProtocolExclude": { "type": "boolean", @@ -34893,10 +36289,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "DestPortRangeMax": { "type": "int", @@ -34907,10 +36305,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "DestPortExclude": { "type": "boolean", @@ -34931,10 +36331,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "SourcePortRangeMax": { "type": "int", @@ -34945,10 +36347,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "SourcePortExclude": { "type": "boolean", @@ -35004,9 +36408,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Type": { "type": "string", @@ -35031,9 +36437,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "CVLANcomponents": { "type": "string", @@ -35045,9 +36453,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -35171,9 +36581,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -35184,9 +36596,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -35343,9 +36757,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -35371,9 +36787,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -35443,10 +36861,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 64, - "max": 65535 - } + "range": [ + { + "min": 64, + "max": 65535 + } + ] }, "CurrentMRUSize": { "type": "unsignedInt", @@ -35457,10 +36877,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 64, - "max": 65535 - } + "range": [ + { + "min": 64, + "max": 65535 + } + ] }, "ConnectionTrigger": { "type": "string", @@ -35541,9 +36963,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "ACName": { "type": "string", @@ -35554,9 +36978,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -35582,9 +37008,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -35619,9 +37047,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -35635,9 +37065,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -35655,9 +37087,11 @@ "item": { "max": 2 }, - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -35682,9 +37116,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.PPP.Interface.{i}.IPv6CP.": { @@ -35704,9 +37140,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "RemoteInterfaceIdentifier": { "type": "string", @@ -35717,9 +37155,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] } }, "Device.PPP.Interface.{i}.Stats.": { @@ -36083,9 +37523,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "InterfaceNumberOfEntries": { "type": "unsignedInt", @@ -36238,9 +37680,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -36251,9 +37695,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -36301,9 +37747,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Reset": { "type": "boolean", @@ -36323,10 +37771,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 64, - "max": 65535 - } + "range": [ + { + "min": 64, + "max": 65535 + } + ] }, "Type": { "type": "string", @@ -36453,9 +37903,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "IPAddress": { "type": "string", @@ -36466,9 +37918,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -36497,9 +37951,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -36753,9 +38209,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Port": { "type": "unsignedInt", @@ -36766,9 +38224,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "MaximumTTL": { "type": "unsignedInt", @@ -36779,10 +38239,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 255 - } + "range": [ + { + "min": 1, + "max": 255 + } + ] }, "IPAllowedList": { "type": "string", @@ -36874,9 +38336,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "IPAddress": { "type": "string", @@ -36887,9 +38351,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - }, + "range": [ + { + "max": 45 + } + ], "mapping": [ { "type": "uci", @@ -37054,9 +38520,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Prefix": { "type": "string", @@ -37067,9 +38535,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - }, + "range": [ + { + "max": 49 + } + ], "mapping": [ { "type": "uci", @@ -37139,9 +38609,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "OnLink": { "type": "boolean", @@ -37202,9 +38674,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "LocalPort": { "type": "unsignedInt", @@ -37215,10 +38689,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "RemoteIPAddress": { "type": "string", @@ -37229,9 +38705,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "RemotePort": { "type": "unsignedInt", @@ -37242,10 +38720,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Status": { "type": "string", @@ -37404,9 +38884,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProtocolVersion": { "type": "string", @@ -37430,9 +38912,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NumberOfRepetitions": { "type": "unsignedInt", @@ -37442,9 +38926,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -37454,9 +38940,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "DataBlockSize": { @@ -37467,10 +38955,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "DSCP": { "type": "unsignedInt", @@ -37480,10 +38970,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] } }, "output": { @@ -37513,9 +39005,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SuccessCount": { "type": "unsignedInt", @@ -37611,9 +39105,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProtocolVersion": { "type": "string", @@ -37637,9 +39133,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NumberOfTries": { "type": "unsignedInt", @@ -37649,10 +39147,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 3 - } + "range": [ + { + "min": 1, + "max": 3 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -37662,9 +39162,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "DataBlockSize": { @@ -37675,10 +39177,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "DSCP": { "type": "unsignedInt", @@ -37688,10 +39192,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "MaxHopCount": { "type": "unsignedInt", @@ -37701,10 +39207,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 64 - } + "range": [ + { + "min": 1, + "max": 64 + } + ] } }, "output": { @@ -37735,9 +39243,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ResponseTime": { "type": "unsignedInt", @@ -37774,9 +39284,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "DownloadDiagnosticsMaxIncrementalResult": { "type": "unsignedInt", @@ -37786,9 +39298,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "DownloadDiagnostics()": { "type": "command", @@ -37804,9 +39318,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DownloadURL": { "type": "string", @@ -37816,9 +39332,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DSCP": { "type": "unsignedInt", @@ -37828,10 +39346,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "EthernetPriority": { "type": "unsignedInt", @@ -37841,10 +39361,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "TimeBasedTestDuration": { "type": "unsignedInt", @@ -37854,10 +39376,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "seconds" }, "TimeBasedTestMeasurementInterval": { @@ -37868,10 +39392,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "seconds" }, "TimeBasedTestMeasurementOffset": { @@ -37882,10 +39408,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "seconds" }, "ProtocolVersion": { @@ -37910,9 +39438,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "EnablePerConnectionResults": { "type": "boolean", @@ -37958,9 +39488,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ROMTime": { "type": "dateTime", @@ -38102,9 +39634,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "UploadDiagnosticsMaxIncrementalResult": { "type": "unsignedInt", @@ -38114,9 +39648,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "UploadDiagnostics()": { "type": "command", @@ -38132,9 +39668,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UploadURL": { "type": "string", @@ -38144,9 +39682,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DSCP": { "type": "unsignedInt", @@ -38156,10 +39696,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "EthernetPriority": { "type": "unsignedInt", @@ -38169,10 +39711,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "TestFileLength": { "type": "unsignedInt", @@ -38191,10 +39735,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "seconds" }, "TimeBasedTestMeasurementInterval": { @@ -38205,10 +39751,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "seconds" }, "TimeBasedTestMeasurementOffset": { @@ -38219,10 +39767,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "seconds" }, "ProtocolVersion": { @@ -38247,9 +39797,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "EnablePerConnectionResults": { "type": "boolean", @@ -38296,9 +39848,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ROMTime": { "type": "dateTime", @@ -38425,9 +39979,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "UDPEchoDiagnostics()": { "type": "command", @@ -38443,9 +39999,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Host": { "type": "string", @@ -38455,9 +40013,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -38467,10 +40027,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "NumberOfRepetitions": { "type": "unsignedInt", @@ -38480,9 +40042,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -38492,9 +40056,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "DataBlockSize": { @@ -38505,10 +40071,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "bytes" }, "DSCP": { @@ -38519,10 +40087,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "InterTransmissionTime": { "type": "unsignedInt", @@ -38532,10 +40102,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "milliseconds" }, "ProtocolVersion": { @@ -38586,9 +40158,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SuccessCount": { "type": "unsignedInt", @@ -38654,9 +40228,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProtocolVersion": { "type": "string", @@ -38697,9 +40273,11 @@ "item": { "max": 10 }, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "NumberOfRepetitions": { @@ -38710,9 +40288,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -38722,9 +40302,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" } }, @@ -38791,9 +40373,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] } } }, @@ -38828,9 +40412,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProtocolVersion": { "type": "string", @@ -38854,9 +40440,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NumberOfRepetitions": { "type": "unsignedInt", @@ -38866,9 +40454,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -38878,9 +40468,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "DataBlockSize": { @@ -38891,10 +40483,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "DSCP": { "type": "unsignedInt", @@ -38904,10 +40498,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "IPAddressUsed": { "type": "string", @@ -38917,9 +40513,11 @@ "cwmp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SuccessCount": { "type": "unsignedInt", @@ -39031,9 +40629,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProtocolVersion": { "type": "string", @@ -39057,9 +40657,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NumberOfTries": { "type": "unsignedInt", @@ -39069,10 +40671,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 3 - } + "range": [ + { + "min": 1, + "max": 3 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -39082,9 +40686,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "DataBlockSize": { @@ -39095,10 +40701,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "DSCP": { "type": "unsignedInt", @@ -39108,10 +40716,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "MaxHopCount": { "type": "unsignedInt", @@ -39121,10 +40731,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 64 - } + "range": [ + { + "min": 1, + "max": 64 + } + ] }, "IPAddressUsed": { "type": "string", @@ -39134,9 +40746,11 @@ "cwmp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ResponseTime": { "type": "unsignedInt", @@ -39172,9 +40786,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "HostAddress": { "type": "string", @@ -39244,9 +40860,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DownloadURL": { "type": "string", @@ -39256,9 +40874,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DownloadTransports": { "type": "string", @@ -39283,9 +40903,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "DownloadDiagnosticsMaxIncrementalResult": { "type": "unsignedInt", @@ -39295,9 +40917,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "DSCP": { "type": "unsignedInt", @@ -39307,10 +40931,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "EthernetPriority": { "type": "unsignedInt", @@ -39320,10 +40946,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "TimeBasedTestDuration": { "type": "unsignedInt", @@ -39333,10 +40961,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "seconds" }, "TimeBasedTestMeasurementInterval": { @@ -39347,10 +40977,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "seconds" }, "TimeBasedTestMeasurementOffset": { @@ -39361,10 +40993,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "seconds" }, "ProtocolVersion": { @@ -39389,9 +41023,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "IPAddressUsed": { "type": "string", @@ -39401,9 +41037,11 @@ "cwmp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ROMTime": { "type": "dateTime", @@ -39718,9 +41356,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UploadURL": { "type": "string", @@ -39730,9 +41370,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UploadTransports": { "type": "string", @@ -39757,9 +41399,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "UploadDiagnosticsMaxIncrementalResult": { "type": "unsignedInt", @@ -39769,9 +41413,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "DSCP": { "type": "unsignedInt", @@ -39781,10 +41427,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "EthernetPriority": { "type": "unsignedInt", @@ -39794,10 +41442,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "TestFileLength": { "type": "unsignedInt", @@ -39816,10 +41466,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "seconds" }, "TimeBasedTestMeasurementInterval": { @@ -39830,10 +41482,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 999 - }, + "range": [ + { + "min": 0, + "max": 999 + } + ], "unit": "seconds" }, "TimeBasedTestMeasurementOffset": { @@ -39844,10 +41498,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "seconds" }, "ProtocolVersion": { @@ -39872,9 +41528,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "IPAddressUsed": { "type": "string", @@ -39884,9 +41542,11 @@ "cwmp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ROMTime": { "type": "dateTime", @@ -40197,9 +41857,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SourceIPAddress": { "type": "string", @@ -40210,9 +41872,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "UDPPort": { "type": "unsignedInt", @@ -40336,9 +42000,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Host": { "type": "string", @@ -40348,9 +42014,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -40360,10 +42028,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "NumberOfRepetitions": { "type": "unsignedInt", @@ -40373,9 +42043,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -40385,9 +42057,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "DataBlockSize": { @@ -40398,10 +42072,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "bytes" }, "DSCP": { @@ -40412,10 +42088,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 63 - } + "range": [ + { + "min": 0, + "max": 63 + } + ] }, "InterTransmissionTime": { "type": "unsignedInt", @@ -40425,10 +42103,12 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "milliseconds" }, "ProtocolVersion": { @@ -40453,9 +42133,11 @@ "cwmp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SuccessCount": { "type": "unsignedInt", @@ -40531,9 +42213,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.": { "type": "object", @@ -40649,9 +42333,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ProtocolVersion": { "type": "string", @@ -40692,9 +42378,11 @@ "item": { "max": 10 }, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "NumberOfRepetitions": { @@ -40705,9 +42393,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -40717,9 +42407,11 @@ "cwmp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "FastestHost": { @@ -40769,9 +42461,11 @@ "cwmp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] } } } @@ -40829,9 +42523,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "ChassisID": { "type": "string", @@ -40842,10 +42538,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 1, - "max": 255 - } + "range": [ + { + "min": 1, + "max": 255 + } + ] }, "Host": { "type": "string", @@ -40858,9 +42556,11 @@ "list": { "datatype": "string", "maxsize": 1024, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "PortNumberOfEntries": { @@ -40890,9 +42590,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "PortID": { "type": "string", @@ -40903,10 +42605,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 1, - "max": 255 - } + "range": [ + { + "min": 1, + "max": 255 + } + ] }, "TTL": { "type": "unsignedInt", @@ -40917,9 +42621,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - }, + "range": [ + { + "max": 65535 + } + ], "unit": "seconds" }, "PortDescription": { @@ -40931,9 +42637,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "MACAddressList": { "type": "string", @@ -40948,9 +42656,11 @@ "item": { "max": 255 }, - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -40997,9 +42707,11 @@ "item": { "max": 255 }, - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -41036,10 +42748,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 0, - "max": 6 - }, + "range": [ + { + "min": 0, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -41053,9 +42767,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 31 - } + "range": [ + { + "max": 31 + } + ] }, "ModelNumber": { "type": "string", @@ -41066,9 +42782,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 31 - } + "range": [ + { + "max": 31 + } + ] }, "VendorSpecificNumberOfEntries": { "type": "unsignedInt", @@ -41097,10 +42815,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -41114,9 +42834,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "Information": { "type": "string", @@ -41127,9 +42849,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 248 - } + "range": [ + { + "max": 248 + } + ] } } } @@ -41561,9 +43285,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Alias": { "type": "string", @@ -41574,9 +43300,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -41587,9 +43315,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AllInterfaces": { "type": "boolean", @@ -41610,9 +43340,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "DestMask": { "type": "string", @@ -41623,9 +43355,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "DestIPExclude": { "type": "boolean", @@ -41646,9 +43380,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SourceMask": { "type": "string", @@ -41659,9 +43395,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SourceIPExclude": { "type": "boolean", @@ -41682,10 +43420,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 255 - } + "range": [ + { + "min": -1, + "max": 255 + } + ] }, "ProtocolExclude": { "type": "boolean", @@ -41706,10 +43446,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "DestPortRangeMax": { "type": "int", @@ -41720,10 +43462,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "DestPortExclude": { "type": "boolean", @@ -41744,10 +43488,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "SourcePortRangeMax": { "type": "int", @@ -41758,10 +43504,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "SourcePortExclude": { "type": "boolean", @@ -41816,9 +43564,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "MaxChildSAs": { "type": "unsignedInt", @@ -41843,9 +43593,11 @@ "item": { "max": 4 }, - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "ForwardingPolicy": { @@ -42022,10 +43774,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -2, - "max": 63 - } + "range": [ + { + "min": -2, + "max": 63 + } + ] }, "IKEv2SATrafficLimit": { "type": "unsignedLong", @@ -42136,9 +43890,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Type": { "type": "unsignedInt", @@ -42149,10 +43905,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 32767 - } + "range": [ + { + "min": 0, + "max": 32767 + } + ] }, "Value": { "type": "hexBinary", @@ -42163,9 +43921,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] } } }, @@ -42186,9 +43946,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "TunnelInterface": { "type": "string", @@ -42316,9 +44078,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Tunnel": { "type": "string", @@ -42339,9 +44103,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "RemoteAddress": { "type": "string", @@ -42352,9 +44118,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "EncryptionAlgorithm": { "type": "string", @@ -42365,9 +44133,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EncryptionKeyLength": { "type": "unsignedInt", @@ -42389,9 +44159,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "IntegrityAlgorithm": { "type": "string", @@ -42402,9 +44174,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "DiffieHellmanGroupTransform": { "type": "string", @@ -42415,9 +44189,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "CreationTime": { "type": "dateTime", @@ -42571,10 +44347,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 32767 - } + "range": [ + { + "min": 0, + "max": 32767 + } + ] }, "Value": { "type": "hexBinary", @@ -42585,9 +44363,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] } }, "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.": { @@ -42624,9 +44404,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "InboundSPI": { "type": "unsignedInt", @@ -42840,9 +44622,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RemoteEndpoints": { "type": "string", @@ -42857,9 +44641,11 @@ "item": { "max": 4 }, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "KeepAlivePolicy": { @@ -42930,9 +44716,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "InterfaceNumberOfEntries": { "type": "unsignedInt", @@ -43079,9 +44867,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -43092,9 +44882,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -43309,9 +45101,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Alias": { "type": "string", @@ -43322,9 +45116,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -43335,9 +45131,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AllInterfaces": { "type": "boolean", @@ -43358,9 +45156,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "VLANIDExclude": { "type": "boolean", @@ -43381,10 +45181,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -2, - "max": 63 - } + "range": [ + { + "min": -2, + "max": 63 + } + ] } } }, @@ -43458,9 +45260,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RemoteEndpoints": { "type": "string", @@ -43475,9 +45279,11 @@ "item": { "max": 4 }, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "KeepAlivePolicy": { @@ -43562,9 +45368,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "InterfaceNumberOfEntries": { "type": "unsignedInt", @@ -43593,9 +45401,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "RemotePort": { "type": "unsignedInt", @@ -43606,9 +45416,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "EnableChecksum": { "type": "boolean", @@ -43756,9 +45568,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -43769,9 +45583,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -43806,10 +45622,16 @@ "usp" ], "datatype": "int", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": -1 + }, + { + "min": 1, + "max": 65535 + } + ] }, "CookiePolicy": { "type": "string", @@ -43970,9 +45792,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Alias": { "type": "string", @@ -43983,9 +45807,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -43996,9 +45822,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AllInterfaces": { "type": "boolean", @@ -44019,9 +45847,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "VLANIDExclude": { "type": "boolean", @@ -44042,10 +45872,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -2, - "max": 63 - } + "range": [ + { + "min": -2, + "max": 63 + } + ] } } }, @@ -44119,9 +45951,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RemoteEndpoints": { "type": "string", @@ -44136,9 +45970,11 @@ "item": { "max": 4 }, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "KeepAlivePolicy": { @@ -44209,9 +46045,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "InterfaceNumberOfEntries": { "type": "unsignedInt", @@ -44232,9 +46070,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "RemotePort": { "type": "unsignedInt", @@ -44245,9 +46085,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Device.VXLAN.Tunnel.{i}.Stats.": { "type": "object", @@ -44384,9 +46226,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -44397,9 +46241,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -44434,10 +46280,16 @@ "usp" ], "datatype": "int", - "range": { - "min": 0, - "max": 16777215 - } + "range": [ + { + "min": -1, + "max": -1 + }, + { + "min": 0, + "max": 16777215 + } + ] }, "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.": { "type": "object", @@ -44573,9 +46425,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Alias": { "type": "string", @@ -44586,9 +46440,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -44599,9 +46455,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AllInterfaces": { "type": "boolean", @@ -44622,9 +46480,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "VLANIDExclude": { "type": "boolean", @@ -44645,10 +46505,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -2, - "max": 63 - } + "range": [ + { + "min": -2, + "max": 63 + } + ] } } }, @@ -44723,9 +46585,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "TransportMode": { "type": "string", @@ -44770,9 +46634,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "DSCPMarkPolicy": { "type": "int", @@ -44783,10 +46649,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -2, - "max": 63 - } + "range": [ + { + "min": -2, + "max": 63 + } + ] }, "PSIDOffset": { "type": "unsignedInt", @@ -44797,10 +46665,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 15 - }, + "range": [ + { + "min": 0, + "max": 15 + } + ], "unit": "bits" }, "PSIDLength": { @@ -44812,10 +46682,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 16 - }, + "range": [ + { + "min": 0, + "max": 16 + } + ], "unit": "bits" }, "PSID": { @@ -44827,10 +46699,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "IncludeSystemPorts": { "type": "boolean", @@ -44894,9 +46768,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Origin": { "type": "string", @@ -44921,9 +46797,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "IPv4Prefix": { "type": "string", @@ -44934,9 +46812,11 @@ "usp" ], "datatype": "IPv4Prefix", - "range": { - "max": 18 - }, + "range": [ + { + "max": 18 + } + ], "pattern": [ "/(3[0-2]|[012]?[0-9])", "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/(3[0-2]|[012]?[0-9])" @@ -44951,10 +46831,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 48 - }, + "range": [ + { + "min": 0, + "max": 48 + } + ], "unit": "bits" }, "IsFMR": { @@ -44976,10 +46858,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 15 - }, + "range": [ + { + "min": 0, + "max": 15 + } + ], "unit": "bits" }, "PSIDLength": { @@ -44991,10 +46875,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 16 - }, + "range": [ + { + "min": 0, + "max": 16 + } + ], "unit": "bits" }, "PSID": { @@ -45006,10 +46892,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } }, "Device.MAP.Domain.{i}.Interface.": { @@ -45058,9 +46946,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -45071,9 +46961,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "unsignedInt", @@ -45317,9 +47209,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 2000 - } + "range": [ + { + "max": 2000 + } + ] } }, "Device.Routing.": { @@ -45382,9 +47276,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "IPv4ForwardingNumberOfEntries": { "type": "unsignedInt", @@ -45481,9 +47377,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "StaticRoute": { "type": "boolean", @@ -45504,9 +47402,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -45535,9 +47435,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -45566,9 +47468,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "GatewayIPAddress": { "type": "string", @@ -45579,9 +47483,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -45610,9 +47516,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Origin": { "type": "string", @@ -45640,9 +47548,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "mapping": [ { "type": "uci", @@ -45713,9 +47623,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "DestIPPrefix": { "type": "string", @@ -45726,9 +47638,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - }, + "range": [ + { + "max": 49 + } + ], "mapping": [ { "type": "uci", @@ -45754,9 +47668,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "NextHop": { "type": "string", @@ -45767,9 +47683,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - }, + "range": [ + { + "max": 45 + } + ], "mapping": [ { "type": "uci", @@ -45795,9 +47713,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Origin": { "type": "string", @@ -45825,9 +47745,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "mapping": [ { "type": "uci", @@ -45942,9 +47864,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -45955,9 +47879,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AcceptRA": { "type": "boolean", @@ -46041,9 +47967,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SourceRouter": { "type": "string", @@ -46054,9 +47982,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "PreferredRouteFlag": { "type": "string", @@ -46082,9 +48012,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "RouteLifetime": { "type": "dateTime", @@ -46170,9 +48102,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -46203,9 +48137,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "milliseconds" }, "RtrSolicitationInterval": { @@ -46217,9 +48153,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 4000 - }, + "range": [ + { + "min": 4000 + } + ], "unit": "milliseconds" }, "MaxRtrSolicitations": { @@ -46325,9 +48263,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -46378,10 +48318,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 4, - "max": 1800 - }, + "range": [ + { + "min": 4, + "max": 1800 + } + ], "unit": "seconds" }, "MinRtrAdvInterval": { @@ -46393,10 +48335,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 3, - "max": 1350 - }, + "range": [ + { + "min": 3, + "max": 1350 + } + ], "unit": "seconds" }, "AdvDefaultLifetime": { @@ -46408,9 +48352,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - }, + "range": [ + { + "max": 65535 + } + ], "unit": "seconds" }, "AdvManagedFlag": { @@ -46487,9 +48433,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 3600000 - }, + "range": [ + { + "max": 3600000 + } + ], "unit": "milliseconds" }, "AdvRetransTimer": { @@ -46512,9 +48460,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "OptionNumberOfEntries": { "type": "unsignedInt", @@ -46553,9 +48503,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Tag": { "type": "unsignedInt", @@ -46566,10 +48518,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Value": { "type": "hexBinary", @@ -46580,10 +48534,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } } } @@ -46658,9 +48614,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "BorderRelayIPv4Addresses": { "type": "string", @@ -46675,9 +48633,11 @@ "item": { "max": 4 }, - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -46702,9 +48662,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "IPv4MaskLength": { "type": "unsignedInt", @@ -46715,10 +48677,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 32 - }, + "range": [ + { + "min": 0, + "max": 32 + } + ], "unit": "bits" }, "AddressSource": { @@ -46730,9 +48694,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TunnelInterface": { "type": "string", @@ -46743,9 +48709,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TunneledInterface": { "type": "string", @@ -46756,9 +48724,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -46832,9 +48802,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EndpointAssignmentPrecedence": { "type": "string", @@ -46873,9 +48845,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "EndpointName": { "type": "string", @@ -46886,9 +48860,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "EndpointAddress": { "type": "string", @@ -46899,9 +48875,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "Origin": { "type": "string", @@ -46926,9 +48904,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TunneledInterface": { "type": "string", @@ -46939,9 +48919,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -47134,9 +49116,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DefaultQueue": { "type": "string", @@ -47147,9 +49131,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DefaultDSCPMark": { "type": "int", @@ -47160,9 +49146,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "DefaultEthernetPriorityMark": { "type": "int", @@ -47173,9 +49161,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "DefaultInnerEthernetPriorityMark": { "type": "int", @@ -47186,9 +49176,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "AvailableAppList": { "type": "string", @@ -47256,9 +49248,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Alias": { "type": "string", @@ -47269,9 +49263,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "DHCPType": { "type": "string", @@ -47296,9 +49292,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AllInterfaces": { "type": "boolean", @@ -47319,9 +49317,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - }, + "range": [ + { + "max": 45 + } + ], "mapping": [ { "type": "uci", @@ -47347,9 +49347,11 @@ "usp" ], "datatype": "IPPrefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "DestIPExclude": { "type": "boolean", @@ -47370,9 +49372,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - }, + "range": [ + { + "max": 45 + } + ], "mapping": [ { "type": "uci", @@ -47398,9 +49402,11 @@ "usp" ], "datatype": "IPPrefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "SourceIPExclude": { "type": "boolean", @@ -47421,10 +49427,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 255 - }, + "range": [ + { + "min": -1, + "max": 255 + } + ], "mapping": [ { "type": "uci", @@ -47460,10 +49468,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - }, + "range": [ + { + "min": -1, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -47489,10 +49499,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - }, + "range": [ + { + "min": -1, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -47528,10 +49540,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - }, + "range": [ + { + "min": -1, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -47557,10 +49571,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "SourcePortExclude": { "type": "boolean", @@ -47581,9 +49597,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -47597,9 +49615,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -47623,9 +49643,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -47639,9 +49661,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -47665,9 +49689,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "EthertypeExclude": { "type": "boolean", @@ -47688,9 +49714,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "SSAPExclude": { "type": "boolean", @@ -47711,9 +49739,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "DSAPExclude": { "type": "boolean", @@ -47734,9 +49764,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "LLCControlExclude": { "type": "boolean", @@ -47757,9 +49789,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "SNAPOUIExclude": { "type": "boolean", @@ -47780,9 +49814,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "SourceVendorClassIDv6": { "type": "hexBinary", @@ -47793,9 +49829,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SourceVendorClassIDExclude": { "type": "boolean", @@ -47832,9 +49870,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "DestVendorClassIDv6": { "type": "hexBinary", @@ -47845,9 +49885,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DestVendorClassIDExclude": { "type": "boolean", @@ -47884,9 +49926,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SourceClientIDExclude": { "type": "boolean", @@ -47907,9 +49951,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DestClientIDExclude": { "type": "boolean", @@ -47930,9 +49976,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SourceUserClassIDExclude": { "type": "boolean", @@ -47953,9 +50001,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DestUserClassIDExclude": { "type": "boolean", @@ -47976,9 +50026,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SourceVendorSpecificInfoExclude": { "type": "boolean", @@ -48009,10 +50061,12 @@ "usp" ], "datatype": "int", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "DestVendorSpecificInfo": { "type": "hexBinary", @@ -48023,9 +50077,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "DestVendorSpecificInfoExclude": { "type": "boolean", @@ -48056,10 +50112,12 @@ "usp" ], "datatype": "int", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "TCPACK": { "type": "boolean", @@ -48120,10 +50178,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 63 - } + "range": [ + { + "min": -1, + "max": 63 + } + ] }, "DSCPExclude": { "type": "boolean", @@ -48144,9 +50204,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - }, + "range": [ + { + "min": -2 + } + ], "mapping": [ { "type": "uci", @@ -48172,9 +50234,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "EthernetPriorityExclude": { "type": "boolean", @@ -48195,9 +50259,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "InnerEthernetPriorityCheck": { "type": "int", @@ -48208,9 +50274,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "InnerEthernetPriorityExclude": { "type": "boolean", @@ -48231,9 +50299,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "EthernetDEICheck": { "type": "int", @@ -48244,9 +50314,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "EthernetDEIExclude": { "type": "boolean", @@ -48267,9 +50339,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "VLANIDExclude": { "type": "boolean", @@ -48290,9 +50364,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "ForwardingPolicy": { "type": "unsignedInt", @@ -48313,9 +50389,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "Policer": { "type": "string", @@ -48326,9 +50404,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "App": { "type": "string", @@ -48339,9 +50419,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.QoS.App.{i}.": { @@ -48386,9 +50468,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProtocolIdentifier": { "type": "string", @@ -48399,9 +50483,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Name": { "type": "string", @@ -48412,9 +50498,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "DefaultForwardingPolicy": { "type": "unsignedInt", @@ -48445,9 +50533,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DefaultDSCPMark": { "type": "int", @@ -48458,9 +50548,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "DefaultEthernetPriorityMark": { "type": "int", @@ -48471,9 +50563,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "DefaultInnerEthernetPriorityMark": { "type": "int", @@ -48484,9 +50578,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] } }, "Device.QoS.Flow.{i}.": { @@ -48531,9 +50627,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Type": { "type": "string", @@ -48544,9 +50642,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TypeParameters": { "type": "string", @@ -48557,9 +50657,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Name": { "type": "string", @@ -48570,9 +50672,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "App": { "type": "string", @@ -48583,9 +50687,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ForwardingPolicy": { "type": "unsignedInt", @@ -48616,9 +50722,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DSCPMark": { "type": "int", @@ -48629,9 +50737,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "EthernetPriorityMark": { "type": "int", @@ -48642,9 +50752,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] }, "InnerEthernetPriorityMark": { "type": "int", @@ -48655,9 +50767,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -2 - } + "range": [ + { + "min": -2 + } + ] } }, "Device.QoS.Policer.{i}.": { @@ -48702,9 +50816,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "CommittedRate": { "type": "unsignedInt", @@ -48970,9 +51086,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "TrafficClasses": { "type": "string", @@ -48996,9 +51114,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AllInterfaces": { "type": "boolean", @@ -49064,9 +51184,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "REDThreshold": { "type": "unsignedInt", @@ -49077,9 +51199,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 100 - } + "range": [ + { + "max": 100 + } + ] }, "REDPercentage": { "type": "unsignedInt", @@ -49090,9 +51214,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 100 - } + "range": [ + { + "max": 100 + } + ] }, "DropAlgorithm": { "type": "string", @@ -49134,9 +51260,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "mapping": [ { "type": "uci", @@ -49206,9 +51334,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Queue": { "type": "string", @@ -49219,9 +51349,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Interface": { "type": "string", @@ -49232,9 +51364,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "OutputPackets": { "type": "unsignedInt", @@ -49295,10 +51429,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - }, + "range": [ + { + "min": 0, + "max": 100 + } + ], "unit": "percent" } }, @@ -49345,9 +51481,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -49358,9 +51496,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ShapingRate": { "type": "int", @@ -49371,9 +51511,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "ShapingBurstSize": { "type": "unsignedInt", @@ -49404,9 +51546,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "Device.Hosts.": { @@ -49444,9 +51588,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "PhysAddress": { "type": "string", @@ -49457,9 +51603,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "IPAddress": { "type": "string", @@ -49470,9 +51618,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "AddressSource": { "type": "string", @@ -49514,9 +51664,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" }, "AssociatedDevice": { @@ -49528,9 +51680,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Layer1Interface": { "type": "string", @@ -49541,9 +51695,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Layer3Interface": { "type": "string", @@ -49554,9 +51710,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "InterfaceType": { "type": "string", @@ -49587,9 +51745,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "ClientID": { "type": "hexBinary", @@ -49600,9 +51760,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "UserClassID": { "type": "hexBinary", @@ -49613,9 +51775,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "HostName": { "type": "string", @@ -49626,9 +51790,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Active": { "type": "boolean", @@ -49687,9 +51853,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -49712,9 +51880,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] } }, "Device.Hosts.Host.{i}.WANStats.": { @@ -49909,9 +52079,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "DNSServer": { "type": "string", @@ -49922,9 +52094,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "Interface": { "type": "string", @@ -49935,9 +52109,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Type": { "type": "string", @@ -50044,9 +52220,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "DNSServer": { "type": "string", @@ -50057,9 +52235,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "Interface": { "type": "string", @@ -50070,9 +52250,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Type": { "type": "string", @@ -50116,9 +52298,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "HostName": { "type": "string", @@ -50128,9 +52312,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DNSServer": { "type": "string", @@ -50140,9 +52326,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -50222,9 +52410,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "HostName": { "type": "string", @@ -50234,9 +52424,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DNSServer": { "type": "string", @@ -50246,9 +52438,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Timeout": { "type": "unsignedInt", @@ -50332,9 +52526,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "IPAddresses": { "type": "string", @@ -50348,9 +52544,11 @@ "item": { "max": 10 }, - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] } }, "DNSServerIP": { @@ -50361,9 +52559,11 @@ "cwmp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "ResponseTime": { "type": "unsignedInt", @@ -50435,9 +52635,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 63 - } + "range": [ + { + "max": 63 + } + ] }, "ApplicationProtocol": { "type": "string", @@ -50448,9 +52650,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 15 - } + "range": [ + { + "max": 15 + } + ] }, "TransportProtocol": { "type": "string", @@ -50475,9 +52679,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -50488,9 +52694,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Target": { "type": "string", @@ -50501,9 +52709,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Status": { "type": "string", @@ -50541,9 +52751,11 @@ "list": { "datatype": "string", "maxsize": 1024, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "TimeToLive": { @@ -50555,9 +52767,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 2147483647 - } + "range": [ + { + "max": 2147483647 + } + ] }, "Priority": { "type": "unsignedInt", @@ -50568,9 +52782,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Weight": { "type": "unsignedInt", @@ -50581,9 +52797,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "TextRecordNumberOfEntries": { "type": "unsignedInt", @@ -50612,9 +52830,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "Value": { "type": "string", @@ -50625,9 +52845,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] } } } @@ -50768,9 +52990,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -50781,9 +53005,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TCPTranslationTimeout": { "type": "int", @@ -50794,9 +53020,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" }, "UDPTranslationTimeout": { @@ -50808,9 +53036,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" } }, @@ -50897,9 +53127,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -50910,9 +53142,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AllInterfaces": { "type": "boolean", @@ -50969,10 +53203,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -50998,10 +53234,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -51027,10 +53265,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -51085,9 +53325,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -51113,9 +53355,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -51152,10 +53396,12 @@ ], "list": { "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } }, "PreferredVersion": { @@ -51167,10 +53413,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "OptionList": { "type": "string", @@ -51182,10 +53430,12 @@ ], "list": { "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 254 - } + "range": [ + { + "min": 0, + "max": 254 + } + ] } }, "ClientNumberOfEntries": { @@ -51225,9 +53475,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "WANInterface": { "type": "string", @@ -51356,10 +53608,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Status": { "type": "string", @@ -51459,9 +53713,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Origin": { "type": "string", @@ -51487,9 +53743,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ServerAddressInUse": { "type": "string", @@ -51500,9 +53758,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "AdditionalServerAddresses": { "type": "string", @@ -51514,9 +53774,11 @@ ], "list": { "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] } }, "ExternalIPAddress": { @@ -51528,9 +53790,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "CurrentVersion": { "type": "unsignedInt", @@ -51541,10 +53805,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "MaximumFilters": { "type": "unsignedInt", @@ -51565,9 +53831,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "PreferredLifetime": { "type": "unsignedInt", @@ -51668,10 +53936,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 255 - } + "range": [ + { + "min": 1, + "max": 255 + } + ] }, "Alias": { "type": "string", @@ -51682,9 +53952,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Origin": { "type": "string", @@ -51722,9 +53994,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SuggestedExternalPort": { "type": "unsignedInt", @@ -51735,10 +54009,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "SuggestedExternalPortEndRange": { "type": "unsignedInt", @@ -51749,10 +54025,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "InternalPort": { "type": "unsignedInt", @@ -51763,10 +54041,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "ProtocolNumber": { "type": "int", @@ -51777,10 +54057,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 255 - } + "range": [ + { + "min": -1, + "max": 255 + } + ] }, "ThirdPartyAddress": { "type": "string", @@ -51791,9 +54073,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "Description": { "type": "string", @@ -51804,9 +54088,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AssignedExternalIPAddress": { "type": "string", @@ -51817,9 +54103,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "AssignedExternalPort": { "type": "unsignedInt", @@ -51830,10 +54118,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "AssignedExternalPortEndRange": { "type": "unsignedInt", @@ -51844,10 +54134,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "FilterNumberOfEntries": { "type": "unsignedInt", @@ -51876,9 +54168,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RemoteHostIPAddress": { "type": "string", @@ -51889,9 +54183,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "PrefixLength": { "type": "unsignedInt", @@ -51902,10 +54198,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 128 - } + "range": [ + { + "min": 1, + "max": 128 + } + ] }, "RemotePort": { "type": "unsignedInt", @@ -51916,10 +54214,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "RemotePortEndRange": { "type": "unsignedInt", @@ -51930,10 +54230,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } } }, @@ -51980,10 +54282,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 255 - } + "range": [ + { + "min": 1, + "max": 255 + } + ] }, "Alias": { "type": "string", @@ -51994,9 +54298,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Origin": { "type": "string", @@ -52034,9 +54340,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SuggestedExternalPort": { "type": "unsignedInt", @@ -52047,10 +54355,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "RemoteHostIPAddress": { "type": "string", @@ -52061,9 +54371,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "InternalPort": { "type": "unsignedInt", @@ -52074,10 +54386,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "RemotePort": { "type": "unsignedInt", @@ -52088,10 +54402,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "ProtocolNumber": { "type": "int", @@ -52102,10 +54418,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 255 - } + "range": [ + { + "min": -1, + "max": 255 + } + ] }, "ThirdPartyAddress": { "type": "string", @@ -52116,9 +54434,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "Description": { "type": "string", @@ -52129,9 +54449,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AssignedExternalIPAddress": { "type": "string", @@ -52142,9 +54464,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "AssignedExternalPort": { "type": "unsignedInt", @@ -52155,10 +54479,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } } } @@ -52234,9 +54560,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -52247,9 +54575,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Status": { "type": "string", @@ -52331,9 +54661,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -52347,9 +54679,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -52365,9 +54699,11 @@ "list": { "datatype": "IPv4Address", "maxsize": 256, - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -52397,9 +54733,11 @@ "list": { "datatype": "IPv4Address", "maxsize": 256, - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -52427,9 +54765,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds", "mapping": [ { @@ -52454,9 +54794,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -52480,9 +54822,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SentOptionNumberOfEntries": { "type": "unsignedInt", @@ -52567,9 +54911,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Tag": { "type": "unsignedInt", @@ -52580,10 +54926,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 254 - } + "range": [ + { + "min": 1, + "max": 254 + } + ] }, "Value": { "type": "hexBinary", @@ -52594,10 +54942,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] } }, "Device.DHCPv4.Client.{i}.ReqOption.{i}.": { @@ -52627,9 +54977,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Alias": { "type": "string", @@ -52640,9 +54992,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Tag": { "type": "unsignedInt", @@ -52653,10 +55007,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 254 - } + "range": [ + { + "min": 1, + "max": 254 + } + ] }, "Value": { "type": "hexBinary", @@ -52667,10 +55023,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] } } }, @@ -52785,9 +55143,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Order": { "type": "unsignedInt", @@ -52798,9 +55158,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Interface": { "type": "string", @@ -52811,9 +55173,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "VendorClassID": { "type": "string", @@ -52824,9 +55188,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "VendorClassIDExclude": { "type": "boolean", @@ -52863,9 +55229,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "ClientIDExclude": { "type": "boolean", @@ -52886,9 +55254,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "UserClassIDExclude": { "type": "boolean", @@ -52909,9 +55279,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -52925,9 +55297,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -52966,9 +55340,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -52997,9 +55373,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -53032,9 +55410,11 @@ "item": { "max": 32 }, - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -53049,9 +55429,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -53084,9 +55466,11 @@ "item": { "max": 4 }, - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -53114,9 +55498,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "IPRouters": { "type": "string", @@ -53131,9 +55517,11 @@ "item": { "max": 4 }, - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -53148,9 +55536,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds", "mapping": [ { @@ -53246,9 +55636,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Chaddr": { "type": "string", @@ -53259,9 +55651,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ], @@ -53290,9 +55684,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ], @@ -53340,9 +55736,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Tag": { "type": "unsignedInt", @@ -53353,10 +55751,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 254 - } + "range": [ + { + "min": 1, + "max": 254 + } + ] }, "Value": { "type": "hexBinary", @@ -53367,10 +55767,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] } }, "Device.DHCPv4.Server.Pool.{i}.Client.{i}.": { @@ -53390,9 +55792,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Chaddr": { "type": "string", @@ -53403,9 +55807,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -53457,9 +55863,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -53492,10 +55900,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "Value": { "type": "hexBinary", @@ -53506,10 +55916,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] } } } @@ -53641,9 +56053,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Order": { "type": "unsignedInt", @@ -53654,9 +56068,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Interface": { "type": "string", @@ -53667,9 +56083,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "VendorClassID": { "type": "string", @@ -53680,9 +56098,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - }, + "range": [ + { + "max": 255 + } + ], "mapping": [ { "type": "uci", @@ -53734,9 +56154,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 255 - } + "range": [ + { + "max": 255 + } + ] }, "ClientIDExclude": { "type": "boolean", @@ -53757,9 +56179,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 255 - }, + "range": [ + { + "max": 255 + } + ], "mapping": [ { "type": "uci", @@ -53795,9 +56219,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ], @@ -53826,9 +56252,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ], @@ -53877,9 +56305,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -53957,9 +56387,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -53970,9 +56402,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Status": { "type": "string", @@ -54014,9 +56448,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 130 - }, + "range": [ + { + "max": 130 + } + ], "mapping": [ { "type": "ubus", @@ -54109,9 +56545,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" }, "SuggestedT2": { @@ -54123,9 +56561,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" }, "SupportedOptions": { @@ -54220,9 +56660,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "DUID": { "type": "hexBinary", @@ -54233,9 +56675,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 130 - } + "range": [ + { + "max": 130 + } + ] }, "InformationRefreshTime": { "type": "dateTime", @@ -54275,9 +56719,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Tag": { "type": "unsignedInt", @@ -54288,10 +56734,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Value": { "type": "hexBinary", @@ -54302,10 +56750,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } }, "Device.DHCPv6.Client.{i}.ReceivedOption.{i}.": { @@ -54325,10 +56775,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Value": { "type": "hexBinary", @@ -54339,10 +56791,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Server": { "type": "string", @@ -54467,9 +56921,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Order": { "type": "unsignedInt", @@ -54480,9 +56936,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Interface": { "type": "string", @@ -54493,9 +56951,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DUID": { "type": "hexBinary", @@ -54506,9 +56966,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 130 - } + "range": [ + { + "max": 130 + } + ] }, "DUIDExclude": { "type": "boolean", @@ -54529,9 +56991,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - }, + "range": [ + { + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -54567,9 +57031,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - }, + "range": [ + { + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -54605,9 +57071,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SourceAddressMask": { "type": "string", @@ -54618,9 +57086,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SourceAddressExclude": { "type": "boolean", @@ -54721,9 +57191,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ClientNumberOfEntries": { "type": "unsignedInt", @@ -54762,9 +57234,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SourceAddress": { "type": "string", @@ -54775,9 +57249,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "Active": { "type": "boolean", @@ -54836,9 +57312,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "PreferredLifetime": { "type": "dateTime", @@ -54878,9 +57356,11 @@ "usp" ], "datatype": "IPv6Prefix", - "range": { - "max": 49 - } + "range": [ + { + "max": 49 + } + ] }, "PreferredLifetime": { "type": "dateTime", @@ -54920,10 +57400,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Value": { "type": "hexBinary", @@ -54934,10 +57416,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } } }, @@ -54968,9 +57452,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Tag": { "type": "unsignedInt", @@ -54981,10 +57467,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Value": { "type": "hexBinary", @@ -54995,10 +57483,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "PassthroughClient": { "type": "string", @@ -55009,9 +57499,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -55078,9 +57570,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Interface": { "type": "string", @@ -55091,9 +57585,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "PAEState": { "type": "string", @@ -55125,9 +57621,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "MaxStart": { "type": "unsignedInt", @@ -55138,10 +57636,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 10 - } + "range": [ + { + "min": 1, + "max": 10 + } + ] }, "StartPeriod": { "type": "unsignedInt", @@ -55152,9 +57652,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "HeldPeriod": { @@ -55166,9 +57668,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "AuthPeriod": { @@ -55383,9 +57887,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -55418,9 +57924,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.IEEE8021x.Supplicant.{i}.EAPTLS.": { @@ -55510,9 +58018,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -55573,9 +58083,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Password": { "type": "string", @@ -55586,9 +58098,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -55614,9 +58128,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 16 - }, + "range": [ + { + "max": 16 + } + ], "mapping": [ { "type": "uci", @@ -55670,9 +58186,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -55708,9 +58226,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Reset": { "type": "boolean", @@ -55821,9 +58341,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ATR": { "type": "string", @@ -55834,9 +58356,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1024 - } + "range": [ + { + "max": 1024 + } + ] } } } @@ -56172,9 +58696,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 36 - }, + "range": [ + { + "max": 36 + } + ], "pattern": [ "[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}" ], @@ -56199,9 +58725,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56234,9 +58762,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56258,9 +58788,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Host": { "type": "string", @@ -56273,9 +58805,11 @@ "list": { "datatype": "string", "maxsize": 1024, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "LastUpdate": { @@ -56321,9 +58855,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 36 - }, + "range": [ + { + "max": 36 + } + ], "pattern": [ "[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}" ], @@ -56348,9 +58884,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56383,9 +58921,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56407,9 +58947,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Host": { "type": "string", @@ -56422,9 +58964,11 @@ "list": { "datatype": "string", "maxsize": 1024, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "LastUpdate": { @@ -56470,9 +59014,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56505,9 +59051,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56529,9 +59077,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Host": { "type": "string", @@ -56544,9 +59094,11 @@ "list": { "datatype": "string", "maxsize": 1024, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "LastUpdate": { @@ -56568,9 +59120,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -56629,9 +59183,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56653,9 +59209,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "pattern": [ "\\d+\\.\\d+" ] @@ -56671,9 +59229,11 @@ "list": { "datatype": "string", "maxsize": 1024, - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -56694,10 +59254,12 @@ "usp" ], "datatype": "UUID", - "range": { - "min": 36, - "max": 36 - }, + "range": [ + { + "min": 36, + "max": 36 + } + ], "pattern": [ "[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}" ], @@ -56722,9 +59284,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DiscoveryDevice": { "type": "string", @@ -56735,9 +59299,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DeviceType": { "type": "string", @@ -56748,9 +59314,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56772,9 +59340,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - }, + "range": [ + { + "max": 128 + } + ], "mapping": [ { "type": "ubus", @@ -56808,9 +59378,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - }, + "range": [ + { + "max": 128 + } + ], "mapping": [ { "type": "ubus", @@ -56832,10 +59404,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 0, - "max": 6 - }, + "range": [ + { + "min": 0, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -56849,9 +59423,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56873,9 +59449,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56897,9 +59475,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "ubus", @@ -56921,9 +59501,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "ubus", @@ -56945,9 +59527,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -56969,9 +59553,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - }, + "range": [ + { + "max": 128 + } + ], "mapping": [ { "type": "ubus", @@ -56993,9 +59579,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 12 - }, + "range": [ + { + "max": 12 + } + ], "mapping": [ { "type": "ubus", @@ -57017,9 +59605,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -57050,9 +59640,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ServiceId": { "type": "string", @@ -57063,9 +59655,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -57087,9 +59681,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ServiceType": { "type": "string", @@ -57100,9 +59696,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "ubus", @@ -57334,9 +59932,11 @@ "cwmp" ], "datatype": "string", - "range": { - "max": 1024 - } + "range": [ + { + "max": 1024 + } + ] } }, "Device.Firewall.": { @@ -57406,9 +60006,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 16 - } + "range": [ + { + "max": 16 + } + ] }, "LastChange": { "type": "dateTime", @@ -57457,9 +60059,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -57470,9 +60074,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Description": { "type": "string", @@ -57483,9 +60089,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Order": { "type": "unsignedInt", @@ -57496,9 +60104,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Chain": { "type": "string", @@ -57573,9 +60183,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -57586,9 +60198,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Creator": { "type": "string", @@ -57712,9 +60326,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Alias": { "type": "string", @@ -57725,9 +60341,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Description": { "type": "string", @@ -57738,9 +60356,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Target": { "type": "string", @@ -57823,9 +60443,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SourceInterfaceExclude": { "type": "boolean", @@ -57856,9 +60478,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "DestInterfaceExclude": { "type": "boolean", @@ -57889,10 +60513,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 15 - }, + "range": [ + { + "min": -1, + "max": 15 + } + ], "mapping": [ { "type": "uci", @@ -57918,9 +60544,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "DestMask": { "type": "string", @@ -57931,9 +60559,11 @@ "usp" ], "datatype": "IPPrefix", - "range": { - "max": 49 - }, + "range": [ + { + "max": 49 + } + ], "mapping": [ { "type": "uci", @@ -57969,9 +60599,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "SourceMask": { "type": "string", @@ -57982,9 +60614,11 @@ "usp" ], "datatype": "IPPrefix", - "range": { - "max": 49 - }, + "range": [ + { + "max": 49 + } + ], "mapping": [ { "type": "uci", @@ -58020,10 +60654,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 255 - }, + "range": [ + { + "min": -1, + "max": 255 + } + ], "mapping": [ { "type": "uci", @@ -58059,10 +60695,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - }, + "range": [ + { + "min": -1, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -58088,10 +60726,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - }, + "range": [ + { + "min": -1, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -58127,10 +60767,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - }, + "range": [ + { + "min": -1, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -58156,10 +60798,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 65535 - }, + "range": [ + { + "min": -1, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -58195,10 +60839,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 63 - } + "range": [ + { + "min": -1, + "max": 63 + } + ] }, "DSCPExclude": { "type": "boolean", @@ -58269,9 +60915,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -58307,9 +60955,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "SampleInterval": { "type": "unsignedInt", @@ -58320,9 +60970,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "ReportSamples": { @@ -58334,9 +60986,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "TimeReference": { "type": "dateTime", @@ -58433,9 +61087,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -58456,9 +61112,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SampleMode": { "type": "string", @@ -58533,9 +61191,11 @@ ], "list": { "datatype": "unsignedInt", - "range": { - "max": 1 - } + "range": [ + { + "max": 1 + } + ] } }, "Values": { @@ -58648,9 +61308,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProbableCause": { "type": "string", @@ -58661,9 +61323,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SpecificProblem": { "type": "string", @@ -58674,9 +61338,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "PerceivedSeverity": { "type": "string", @@ -58732,9 +61398,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "AlarmRaisedTime": { "type": "dateTime", @@ -58765,9 +61433,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 512 - } + "range": [ + { + "max": 512 + } + ] }, "EventType": { "type": "string", @@ -58778,9 +61448,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProbableCause": { "type": "string", @@ -58791,9 +61463,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SpecificProblem": { "type": "string", @@ -58804,9 +61478,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "PerceivedSeverity": { "type": "string", @@ -58834,9 +61510,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AdditionalInformation": { "type": "string", @@ -58847,9 +61525,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.FaultMgmt.HistoryEvent.{i}.": { @@ -58879,9 +61559,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NotificationType": { "type": "string", @@ -58907,9 +61589,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 512 - } + "range": [ + { + "max": 512 + } + ] }, "EventType": { "type": "string", @@ -58920,9 +61604,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProbableCause": { "type": "string", @@ -58933,9 +61619,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SpecificProblem": { "type": "string", @@ -58946,9 +61634,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "PerceivedSeverity": { "type": "string", @@ -58977,9 +61667,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AdditionalInformation": { "type": "string", @@ -58990,9 +61682,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.FaultMgmt.ExpeditedEvent.{i}.": { @@ -59022,9 +61716,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NotificationType": { "type": "string", @@ -59050,9 +61746,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 512 - } + "range": [ + { + "max": 512 + } + ] }, "EventType": { "type": "string", @@ -59063,9 +61761,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProbableCause": { "type": "string", @@ -59076,9 +61776,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SpecificProblem": { "type": "string", @@ -59089,9 +61791,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "PerceivedSeverity": { "type": "string", @@ -59120,9 +61824,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AdditionalInformation": { "type": "string", @@ -59133,9 +61839,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.FaultMgmt.QueuedEvent.{i}.": { @@ -59165,9 +61873,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "NotificationType": { "type": "string", @@ -59193,9 +61903,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 512 - } + "range": [ + { + "max": 512 + } + ] }, "EventType": { "type": "string", @@ -59206,9 +61918,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ProbableCause": { "type": "string", @@ -59219,9 +61933,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "SpecificProblem": { "type": "string", @@ -59232,9 +61948,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "PerceivedSeverity": { "type": "string", @@ -59263,9 +61981,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "AdditionalInformation": { "type": "string", @@ -59276,9 +61996,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -59337,9 +62059,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Issuer": { "type": "string", @@ -59350,9 +62074,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NotBefore": { "type": "dateTime", @@ -59383,9 +62109,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "SubjectAlt": { "type": "string", @@ -59409,9 +62137,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -59519,9 +62249,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "LastScanTime": { "type": "dateTime", @@ -59552,10 +62284,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -90000000, - "max": 90000000 - } + "range": [ + { + "min": -90000000, + "max": 90000000 + } + ] }, "LockedLongitude": { "type": "int", @@ -59566,10 +62300,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -180000000, - "max": 180000000 - } + "range": [ + { + "min": -180000000, + "max": 180000000 + } + ] }, "NumberOfSatellites": { "type": "unsignedInt", @@ -59643,10 +62379,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -90000000, - "max": 90000000 - } + "range": [ + { + "min": -90000000, + "max": 90000000 + } + ] }, "Longitude": { "type": "int", @@ -59657,10 +62395,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -180000000, - "max": 180000000 - } + "range": [ + { + "min": -180000000, + "max": 180000000 + } + ] }, "Elevation": { "type": "int", @@ -59671,10 +62411,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -5000000, - "max": 25000000 - }, + "range": [ + { + "min": -5000000, + "max": 25000000 + } + ], "unit": "millimeters" }, "LastFixTime": { @@ -59707,9 +62449,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds" }, "SatellitesTracked": { @@ -59731,10 +62475,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 60, - "max": 3600 - }, + "range": [ + { + "min": 60, + "max": 3600 + } + ], "unit": "seconds" }, "ReceiverStatus": { @@ -59746,9 +62492,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "LocationType": { "type": "string", @@ -59773,10 +62521,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 120, - "max": 86400 - }, + "range": [ + { + "min": 120, + "max": 86400 + } + ], "unit": "seconds" } }, @@ -59807,9 +62557,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ServerPort": { "type": "unsignedInt", @@ -59820,9 +62572,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Username": { "type": "string", @@ -59833,9 +62587,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Password": { "type": "string", @@ -59846,9 +62602,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ReferenceLatitude": { "type": "int", @@ -59859,10 +62617,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -90000000, - "max": 90000000 - } + "range": [ + { + "min": -90000000, + "max": 90000000 + } + ] }, "ReferenceLongitude": { "type": "int", @@ -59873,10 +62633,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -180000000, - "max": 180000000 - } + "range": [ + { + "min": -180000000, + "max": 180000000 + } + ] }, "ServerInUse": { "type": "boolean", @@ -59935,9 +62697,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "URL": { "type": "string", @@ -59948,9 +62712,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Username": { "type": "string", @@ -59961,9 +62727,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -59974,9 +62742,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "PeriodicUploadInterval": { "type": "unsignedInt", @@ -59987,9 +62757,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "PeriodicUploadTime": { @@ -60021,9 +62793,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -60257,9 +63031,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TunnelInst": { "type": "string", @@ -60270,9 +63046,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Device.FAP.ApplicationPlatform.Control.FemtoAwareness.": { "type": "object", @@ -60325,10 +63103,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "FemtozoneID": { "type": "string", @@ -60339,9 +63119,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NotificationsUserIdentifierMSISDN": { "type": "boolean", @@ -60425,10 +63207,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "MinSendSMSTimeInterval": { "type": "unsignedInt", @@ -60439,10 +63223,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 3599 - }, + "range": [ + { + "min": 0, + "max": 3599 + } + ], "unit": "seconds" }, "EnableQuerySMSDeliveryStatus": { @@ -60517,10 +63303,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "MinSendMMSTimeInterval": { "type": "unsignedInt", @@ -60531,10 +63319,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 3599 - }, + "range": [ + { + "min": 0, + "max": 3599 + } + ], "unit": "seconds" }, "EnableQueryMMSDeliveryStatus": { @@ -60609,10 +63399,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueryMobileLocationResponseAddress": { "type": "string", @@ -60657,10 +63449,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 86399 - }, + "range": [ + { + "min": 0, + "max": 86399 + } + ], "unit": "seconds" } } @@ -60741,10 +63535,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueueState": { "type": "string", @@ -60770,10 +63566,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueueReceived": { "type": "unsignedInt", @@ -60823,10 +63621,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueueState": { "type": "string", @@ -60852,10 +63652,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueueReceived": { "type": "unsignedInt", @@ -60905,10 +63707,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueueState": { "type": "string", @@ -60934,10 +63738,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueueReceived": { "type": "unsignedInt", @@ -60987,10 +63793,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueueState": { "type": "string", @@ -61016,10 +63824,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - } + "range": [ + { + "min": 0, + "max": 255 + } + ] }, "QueueReceived": { "type": "unsignedInt", @@ -61173,9 +63983,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "MaxNumberOfParameterReferences": { "type": "int", @@ -61186,9 +63998,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "ProfileNumberOfEntries": { "type": "unsignedInt", @@ -61263,9 +64077,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -61291,9 +64107,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 255 - }, + "range": [ + { + "max": 255 + } + ], "mapping": [ { "type": "uci", @@ -61319,9 +64137,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "mapping": [ { "type": "uci", @@ -61397,9 +64217,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds", "mapping": [ { @@ -61451,9 +64273,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "StreamingPort": { "type": "unsignedInt", @@ -61464,10 +64288,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "StreamingSessionID": { "type": "unsignedInt", @@ -61478,10 +64304,16 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 65, - "max": 90 - } + "range": [ + { + "min": 48, + "max": 57 + }, + { + "min": 65, + "max": 90 + } + ] }, "FileTransferURL": { "type": "string", @@ -61492,9 +64324,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "FileTransferUsername": { "type": "string", @@ -61505,9 +64339,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "FileTransferPassword": { "type": "string", @@ -61518,9 +64354,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ControlFileFormat": { "type": "string", @@ -61531,9 +64369,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "ParameterNumberOfEntries": { "type": "unsignedInt", @@ -61596,9 +64436,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -61624,9 +64466,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -61872,9 +64716,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1024 - }, + "range": [ + { + "max": 1024 + } + ], "mapping": [ { "type": "uci", @@ -61900,9 +64746,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -61928,9 +64776,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -62089,10 +64939,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -62118,10 +64970,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 65535 - }, + "range": [ + { + "min": 1000, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -62215,9 +65069,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -62243,9 +65099,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -62365,9 +65223,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -62393,9 +65253,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -62421,9 +65283,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -62449,9 +65313,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -62477,9 +65343,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -62586,9 +65454,11 @@ "usp" ], "datatype": "long", - "range": { - "min": -1 - }, + "range": [ + { + "min": -1 + } + ], "unit": "seconds", "mapping": [ { @@ -62640,10 +65510,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "seconds", "mapping": [ { @@ -62670,10 +65542,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 65535 - }, + "range": [ + { + "min": 1000, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -62699,9 +65573,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds", "mapping": [ { @@ -62806,9 +65682,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -62834,10 +65712,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Weight": { "type": "long", @@ -62848,10 +65728,12 @@ "usp" ], "datatype": "long", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "ServerAddress": { "type": "string", @@ -62862,9 +65744,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -62890,10 +65774,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -63001,9 +65887,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63099,9 +65987,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63158,9 +66048,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "MediaType": { "type": "string", @@ -63197,10 +66089,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -63214,10 +66108,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "GenericPhyURL": { "type": "string", @@ -63228,9 +66124,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1024 - } + "range": [ + { + "max": 1024 + } + ] }, "SetIntfPowerStateEnabled": { "type": "boolean", @@ -63295,10 +66193,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -63312,9 +66212,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] } }, "Device.IEEE1905.AL.Interface.{i}.Link.{i}.": { @@ -63334,9 +66236,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63350,9 +66254,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63392,10 +66298,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -63409,10 +66317,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "GenericPhyURL": { "type": "string", @@ -63423,9 +66333,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1024 - } + "range": [ + { + "max": 1024 + } + ] }, "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.": { "type": "object", @@ -63505,10 +66417,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - }, + "range": [ + { + "min": 0, + "max": 100 + } + ], "unit": "percent" }, "PHYRate": { @@ -63531,10 +66445,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "dB" } } @@ -63586,9 +66502,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "MACDestinationAddress": { @@ -63600,9 +66518,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63626,9 +66546,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63672,10 +66594,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 4095 - } + "range": [ + { + "min": 0, + "max": 4095 + } + ] }, "VidFlag": { "type": "boolean", @@ -63696,10 +66620,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 7 - } + "range": [ + { + "min": 0, + "max": 7 + } + ] }, "PCPFlag": { "type": "boolean", @@ -63755,9 +66681,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "LastChange": { "type": "string", @@ -63768,9 +66696,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "IEEE1905DeviceNumberOfEntries": { "type": "unsignedInt", @@ -63833,9 +66763,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63849,9 +66781,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63879,9 +66813,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63904,9 +66840,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -63952,9 +66890,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "ManufacturerName": { "type": "string", @@ -63965,9 +66905,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "ManufacturerModel": { "type": "string", @@ -63978,9 +66920,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "ControlURL": { "type": "string", @@ -63991,9 +66935,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1024 - } + "range": [ + { + "max": 1024 + } + ] }, "AssocWiFiNetworkDeviceRef": { "type": "string", @@ -64102,9 +67048,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64118,9 +67066,11 @@ "usp" ], "datatype": "IPv4Address", - "range": { - "max": 15 - }, + "range": [ + { + "max": 15 + } + ], "pattern": [ "((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])" ] @@ -64150,9 +67100,11 @@ "usp" ], "datatype": "IPAddress", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] } }, "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IPv6Address.{i}.": { @@ -64172,9 +67124,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64188,9 +67142,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] }, "IPv6AddressType": { "type": "string", @@ -64218,9 +67174,11 @@ "usp" ], "datatype": "IPv6Address", - "range": { - "max": 45 - } + "range": [ + { + "max": 45 + } + ] } }, "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.VendorProperties.{i}.": { @@ -64240,10 +67198,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "OUI": { "type": "string", @@ -64254,10 +67214,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -64271,10 +67233,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] } }, "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.Interface.{i}.": { @@ -64294,9 +67258,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64352,10 +67318,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 6, - "max": 6 - }, + "range": [ + { + "min": 6, + "max": 6 + } + ], "pattern": [ "[0-9A-F]{6}" ] @@ -64369,10 +67337,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "GenericPhyURL": { "type": "string", @@ -64383,9 +67353,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 1024 - } + "range": [ + { + "max": 1024 + } + ] }, "NetworkMembership": { "type": "string", @@ -64396,9 +67368,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64429,10 +67403,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "FrequencyIndex1": { "type": "hexBinary", @@ -64443,10 +67419,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] }, "FrequencyIndex2": { "type": "hexBinary", @@ -64457,10 +67435,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 1, - "max": 1 - } + "range": [ + { + "min": 1, + "max": 1 + } + ] } }, "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.NonIEEE1905Neighbor.{i}.": { @@ -64480,9 +67460,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NeighborInterfaceId": { "type": "string", @@ -64493,9 +67475,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64518,9 +67502,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NeighborInterfaceId": { "type": "string", @@ -64531,9 +67517,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64549,9 +67537,11 @@ "list": { "datatype": "MACAddress", "maxsize": 1024, - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64575,9 +67565,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "NeighborDeviceId": { "type": "string", @@ -64588,9 +67580,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64622,9 +67616,11 @@ "usp" ], "datatype": "MACAddress", - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64699,10 +67695,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 100 - }, + "range": [ + { + "min": 0, + "max": 100 + } + ], "unit": "percent" }, "PHYRate": { @@ -64725,10 +67723,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 255 - }, + "range": [ + { + "min": 0, + "max": 255 + } + ], "unit": "dB" } } @@ -64751,9 +67751,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -64815,9 +67817,11 @@ "list": { "datatype": "MACAddress", "maxsize": 1024, - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64834,9 +67838,11 @@ "list": { "datatype": "MACAddress", "maxsize": 1024, - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64853,9 +67859,11 @@ "list": { "datatype": "MACAddress", "maxsize": 1024, - "range": { - "max": 17 - }, + "range": [ + { + "max": 17 + } + ], "pattern": [ "([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])" ] @@ -64982,9 +67990,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -64995,9 +68005,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -65046,9 +68058,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "BrokerPort": { "type": "unsignedInt", @@ -65059,10 +68073,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "TransportProtocol": { "type": "string", @@ -65113,10 +68129,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 2 - } + "range": [ + { + "min": 0, + "max": 2 + } + ] }, "WillRetain": { "type": "boolean", @@ -65137,9 +68155,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - }, + "range": [ + { + "max": 65535 + } + ], "unit": "seconds" }, "ForceReconnect": { @@ -65192,9 +68212,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "RequestResponseInfo": { "type": "boolean", @@ -65225,10 +68247,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 0, - "max": 256 - } + "range": [ + { + "min": 0, + "max": 256 + } + ] }, "ClientID": { "type": "string", @@ -65239,10 +68263,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "WillDelayInterval": { "type": "unsignedInt", @@ -65275,9 +68301,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "WillResponseTopic": { "type": "string", @@ -65288,9 +68316,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "WillTopic": { "type": "string", @@ -65301,9 +68331,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "WillValue": { "type": "string", @@ -65314,9 +68346,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Username": { "type": "string", @@ -65327,9 +68361,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -65340,9 +68376,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "PublishMessageExpiryInterval": { "type": "unsignedInt", @@ -65364,9 +68402,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "ConnectRetryTime": { @@ -65378,9 +68418,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "ConnectRetryIntervalMultiplier": { @@ -65392,10 +68434,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 65535 - } + "range": [ + { + "min": 1000, + "max": 65535 + } + ] }, "ConnectRetryMaxInterval": { "type": "unsignedInt", @@ -65406,9 +68450,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "ResponseInformation": { @@ -65420,9 +68466,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "SubscriptionNumberOfEntries": { "type": "unsignedInt", @@ -65467,9 +68515,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -65507,9 +68557,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "QoS": { "type": "unsignedInt", @@ -65520,10 +68572,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 2 - } + "range": [ + { + "min": 0, + "max": 2 + } + ] } }, "Device.MQTT.Client.{i}.UserProperty.{i}.": { @@ -65543,9 +68597,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -65566,9 +68622,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Value": { "type": "string", @@ -65579,9 +68637,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "PacketType": { "type": "string", @@ -65746,9 +68806,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -65759,9 +68821,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -65798,10 +68862,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "Interface": { "type": "string", @@ -65812,9 +68878,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Username": { "type": "string", @@ -65825,9 +68893,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -65838,9 +68908,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "BridgeNumberOfEntries": { "type": "unsignedInt", @@ -65869,9 +68941,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -65882,9 +68956,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -65964,9 +69040,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 65535 - }, + "range": [ + { + "max": 65535 + } + ], "unit": "seconds" }, "ForceReconnect": { @@ -65987,10 +69065,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Username": { "type": "string", @@ -66001,9 +69081,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -66014,9 +69096,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "MessageRetryTime": { "type": "unsignedInt", @@ -66027,9 +69111,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "ConnectRetryTime": { @@ -66041,9 +69127,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "ServerSelectionAlgorithm": { @@ -66124,9 +69212,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Priority": { "type": "unsignedInt", @@ -66137,10 +69227,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - } + "range": [ + { + "min": 0, + "max": 65535 + } + ] }, "Weight": { "type": "long", @@ -66151,10 +69243,12 @@ "usp" ], "datatype": "long", - "range": { - "min": -1, - "max": 65535 - } + "range": [ + { + "min": -1, + "max": 65535 + } + ] }, "Address": { "type": "string", @@ -66165,9 +69259,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -66178,10 +69274,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] } }, "Device.MQTT.Broker.{i}.Bridge.{i}.Subscription.{i}.": { @@ -66201,9 +69299,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -66239,9 +69339,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "Direction": { "type": "string", @@ -66267,10 +69369,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 2 - } + "range": [ + { + "min": 0, + "max": 2 + } + ] }, "LocalPrefix": { "type": "string", @@ -66281,9 +69385,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "RemotePrefix": { "type": "string", @@ -66294,9 +69400,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -66537,9 +69645,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastError": { "type": "string", @@ -66569,9 +69679,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -66597,9 +69709,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -66625,9 +69739,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -66653,9 +69769,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -66756,9 +69874,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -66814,9 +69934,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - }, + "range": [ + { + "max": 64 + } + ], "mapping": [ { "type": "uci", @@ -66842,9 +69964,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Alias": { "type": "string", @@ -66855,9 +69979,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "ServiceName": { "type": "string", @@ -66868,9 +69994,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -66896,9 +70024,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - }, + "range": [ + { + "max": 256 + } + ], "mapping": [ { "type": "uci", @@ -66924,10 +70054,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 65535 - }, + "range": [ + { + "min": 0, + "max": 65535 + } + ], "mapping": [ { "type": "uci", @@ -67099,9 +70231,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -67148,9 +70282,11 @@ "usp" ], "datatype": "int", - "range": { - "min": -1 - } + "range": [ + { + "min": -1 + } + ] }, "Location": { "type": "string", @@ -67217,9 +70353,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -67240,9 +70378,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - } + "range": [ + { + "min": 1 + } + ] }, "Color": { "type": "hexBinary", @@ -67253,10 +70393,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "Duration": { "type": "unsignedInt", @@ -67308,10 +70450,12 @@ "usp" ], "datatype": "hexBinary", - "range": { - "min": 3, - "max": 3 - } + "range": [ + { + "min": 3, + "max": 3 + } + ] }, "Duration": { "type": "unsignedInt", @@ -67362,9 +70506,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -67409,9 +70555,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "InternetDomain": { "type": "string", @@ -67422,9 +70570,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "UseMeasurementEndpointInReports": { "type": "boolean", @@ -67492,9 +70642,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "CustomerIdentifier": { "type": "string", @@ -67505,9 +70657,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -67567,9 +70721,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -67622,10 +70778,12 @@ "usp" ], "datatype": "UUID", - "range": { - "min": 36, - "max": 36 - }, + "range": [ + { + "min": 36, + "max": 36 + } + ], "pattern": [ "[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}" ] @@ -67639,9 +70797,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "MeasurementPoint": { "type": "string", @@ -67652,9 +70812,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UseAgentIdentifierInReports": { "type": "boolean", @@ -67783,9 +70945,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Version": { "type": "string", @@ -67796,9 +70960,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TaskCapabilityRegistryNumberOfEntries": { "type": "unsignedInt", @@ -67838,9 +71004,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -67862,9 +71030,11 @@ "usp" ], "datatype": "int", - "range": { - "min": 0 - }, + "range": [ + { + "min": 0 + } + ], "unit": "seconds" }, "ControlSchedules": { @@ -67931,9 +71101,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -67944,9 +71116,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "State": { "type": "string", @@ -68141,9 +71315,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "State": { "type": "string", @@ -68384,9 +71560,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Order": { "type": "unsignedInt", @@ -68448,9 +71626,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -68461,9 +71641,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Tags": { "type": "string", @@ -68524,9 +71706,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "RegistryEntry": { "type": "string", @@ -68548,9 +71732,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -68581,9 +71767,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Order": { "type": "unsignedInt", @@ -68644,9 +71832,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -68657,9 +71847,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "UseBulkDataProfile": { "type": "boolean", @@ -68690,9 +71882,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "TargetPublicCredential": { "type": "string", @@ -68742,9 +71936,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "LastChange": { "type": "dateTime", @@ -68829,9 +72025,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -68842,9 +72040,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "State": { "type": "string", @@ -68933,10 +72133,12 @@ "usp" ], "datatype": "UUID", - "range": { - "min": 36, - "max": 36 - }, + "range": [ + { + "min": 36, + "max": 36 + } + ], "pattern": [ "[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}" ] @@ -68960,9 +72162,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ResultNumberOfEntries": { "type": "unsignedInt", @@ -68991,9 +72195,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ScheduleName": { "type": "string", @@ -69004,9 +72210,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ActionName": { "type": "string", @@ -69017,9 +72225,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "EventTime": { "type": "dateTime", @@ -69172,9 +72382,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ScheduleName": { "type": "string", @@ -69185,9 +72397,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "ActionName": { "type": "string", @@ -69198,9 +72412,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.LMAP.Report.{i}.Result.{i}.ReportTable.{i}.": { @@ -69292,9 +72508,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } @@ -69328,9 +72546,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -69341,9 +72561,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Type": { "type": "string", @@ -69533,10 +72755,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -23, - "max": 23 - }, + "range": [ + { + "min": -23, + "max": 23 + } + ], "unit": "hours" } }, @@ -69585,9 +72809,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "UpTime": { "type": "unsignedInt", @@ -69613,9 +72839,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Certificate": { "type": "string", @@ -69625,9 +72853,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] } } }, @@ -69706,9 +72936,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 5 - }, + "range": [ + { + "min": 5 + } + ], "unit": "seconds" }, "MTPNumberOfEntries": { @@ -69780,9 +73012,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -69851,10 +73085,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "Path": { "type": "string", @@ -69945,10 +73181,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "Path": { "type": "string", @@ -69984,9 +73222,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "ResponseTopicDiscovered": { "type": "string", @@ -69996,9 +73236,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] }, "PublishQoS ": { "type": "unsignedInt", @@ -70008,10 +73250,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0, - "max": 2 - } + "range": [ + { + "min": 0, + "max": 2 + } + ] } } }, @@ -70030,9 +73274,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -70108,9 +73354,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "EndpointID": { "type": "string", @@ -70129,9 +73377,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] }, "ProvisioningCode": { "type": "string", @@ -70141,9 +73391,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -70193,9 +73445,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "PeriodicNotifTime": { @@ -70215,10 +73469,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "seconds" }, "USPNotifRetryIntervalMultiplier": { @@ -70229,10 +73485,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 65535 - } + "range": [ + { + "min": 1000, + "max": 65535 + } + ] }, "ScheduleTimer()": { "type": "command", @@ -70248,9 +73506,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" } } @@ -70269,9 +73529,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Certificate": { "type": "string", @@ -70281,9 +73543,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] } } }, @@ -70326,9 +73590,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -70363,9 +73629,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -70375,10 +73643,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "Path": { "type": "string", @@ -70440,9 +73710,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -70452,10 +73724,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "Path": { "type": "string", @@ -70483,9 +73757,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "CurrentRetryCount": { @@ -70505,10 +73781,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "seconds" }, "SessionRetryIntervalMultiplier": { @@ -70519,10 +73797,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 65535 - } + "range": [ + { + "min": 1000, + "max": 65535 + } + ] }, "Reset()": { "type": "command", @@ -70555,9 +73835,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 65535 - } + "range": [ + { + "max": 65535 + } + ] } } }, @@ -70598,9 +73880,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -70619,9 +73903,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Device.LocalAgent.Controller.{i}.E2ESession.": { @@ -70662,9 +73948,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 0 - }, + "range": [ + { + "min": 0 + } + ], "unit": "seconds" }, "SessionRetryMinimumWaitInterval": { @@ -70675,10 +73963,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "seconds" }, "SessionRetryIntervalMultiplier": { @@ -70689,10 +73979,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 65535 - } + "range": [ + { + "min": 1000, + "max": 65535 + } + ] }, "CurrentRetryCount": { "type": "unsignedInt", @@ -70711,9 +74003,15 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 512 - }, + "range": [ + { + "min": 0, + "max": 0 + }, + { + "min": 512 + } + ], "unit": "bytes" }, "MaxRetransmitTries": { @@ -70724,10 +74022,12 @@ "usp" ], "datatype": "int", - "range": { - "min": -1, - "max": 10 - } + "range": [ + { + "min": -1, + "max": 10 + } + ] }, "PayloadSecurity": { "type": "string", @@ -70765,9 +74065,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -70795,9 +74097,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "CreationDate": { "type": "dateTime", @@ -70833,9 +74137,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } }, "Persistent": { @@ -70892,9 +74198,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Originator": { "type": "string", @@ -70962,9 +74270,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -70983,9 +74293,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Issuer": { "type": "string", @@ -70995,9 +74307,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Delete()": { "type": "command", @@ -71037,9 +74351,11 @@ "usp" ], "datatype": "hexBinary", - "range": { - "max": 128 - } + "range": [ + { + "max": 128 + } + ] } } } @@ -71116,9 +74432,11 @@ "usp" ], "datatype": "int", - "range": { - "min": 0 - }, + "range": [ + { + "min": 0 + } + ], "unit": "seconds" } }, @@ -71229,9 +74547,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -71275,9 +74595,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -71316,10 +74638,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 4, - "max": 4 - } + "range": [ + { + "min": 4, + "max": 4 + } + ] }, "Obj": { "type": "string", @@ -71329,10 +74653,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 4, - "max": 4 - } + "range": [ + { + "min": 4, + "max": 4 + } + ] }, "InstantiatedObj": { "type": "string", @@ -71342,10 +74668,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 4, - "max": 4 - } + "range": [ + { + "min": 4, + "max": 4 + } + ] }, "CommandEvent": { "type": "string", @@ -71355,10 +74683,12 @@ "usp" ], "datatype": "string", - "range": { - "min": 4, - "max": 4 - } + "range": [ + { + "min": 4, + "max": 4 + } + ] } } }, @@ -71377,9 +74707,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -71440,9 +74772,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Description": { "type": "string", @@ -71547,9 +74881,11 @@ "usp" ], "datatype": "int", - "range": { - "min": 0 - }, + "range": [ + { + "min": 0 + } + ], "unit": "seconds" } } @@ -71586,9 +74922,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Enable": { "type": "boolean", @@ -71635,9 +74973,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Port": { "type": "unsignedInt", @@ -71647,10 +74987,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - } + "range": [ + { + "min": 1, + "max": 65535 + } + ] }, "Username": { "type": "string", @@ -71660,9 +75002,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Password": { "type": "string", @@ -71672,9 +75016,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "VirtualHost": { "type": "string", @@ -71684,9 +75030,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "EnableHeartbeats": { "type": "boolean", @@ -71725,10 +75073,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1, - "max": 65535 - }, + "range": [ + { + "min": 1, + "max": 65535 + } + ], "unit": "seconds" }, "ServerRetryIntervalMultiplier": { @@ -71739,10 +75089,12 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1000, - "max": 65535 - } + "range": [ + { + "min": 1000, + "max": 65535 + } + ] }, "ServerRetryMaxInterval": { "type": "unsignedInt", @@ -71752,9 +75104,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "min": 1 - }, + "range": [ + { + "min": 1 + } + ], "unit": "seconds" }, "IsEncrypted": { @@ -71809,9 +75163,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Type": { "type": "string", @@ -71830,9 +75186,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Name": { "type": "string", @@ -71842,9 +75200,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Online": { "type": "boolean", @@ -71911,9 +75271,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Type": { "type": "string", @@ -71932,9 +75294,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } }, @@ -71953,9 +75317,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Name": { "type": "string", @@ -71965,9 +75331,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Class": { "type": "string", @@ -72015,9 +75383,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Value": { "type": "boolean", @@ -72059,9 +75429,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Value": { "type": "decimal", @@ -72145,9 +75517,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Value": { "type": "string", @@ -72167,9 +75541,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } }, "StepUp()": { @@ -72218,9 +75594,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Value": { "type": "boolean", @@ -72248,9 +75626,11 @@ "usp" ], "datatype": "unsignedInt", - "range": { - "max": 100 - } + "range": [ + { + "max": 100 + } + ] }, "HoldTime": { "type": "unsignedInt", @@ -72297,9 +75677,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Value": { "type": "decimal", @@ -72393,9 +75775,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Values": { "type": "string", @@ -72468,9 +75852,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] }, "Value": { "type": "string", @@ -72499,9 +75885,11 @@ ], "list": { "datatype": "string", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] } } } @@ -72521,9 +75909,11 @@ "usp" ], "datatype": "Alias", - "range": { - "max": 64 - } + "range": [ + { + "max": 64 + } + ] }, "Type": { "type": "string", @@ -72542,9 +75932,11 @@ "usp" ], "datatype": "string", - "range": { - "max": 256 - } + "range": [ + { + "max": 256 + } + ] } } } diff --git a/libbbf_api/dmbbf.c b/libbbf_api/dmbbf.c index 49ea8010..f8f6caba 100644 --- a/libbbf_api/dmbbf.c +++ b/libbbf_api/dmbbf.c @@ -133,7 +133,7 @@ char *DMT_TYPE[] = { [DMT_LONG] = "xsd:long", [DMT_BOOL] = "xsd:boolean", [DMT_TIME] = "xsd:dateTime", -[DMT_HEXBIN] = "xsd:hexbin", +[DMT_HEXBIN] = "xsd:hexBinary", }; #ifdef BBF_TR064 diff --git a/libbbf_api/dmcommon.c b/libbbf_api/dmcommon.c index ab6d81f7..eec52df6 100644 --- a/libbbf_api/dmcommon.c +++ b/libbbf_api/dmcommon.c @@ -23,47 +23,50 @@ char *array_notifcation_char[__MAX_notification] = { [notification_passive_active_lw] = "6", }; -char *Encapsulation[] = {"LLC", "VCMUX", NULL}; -char *LinkType[] = {"EoA", "IPoA", "PPPoA", "CIP", "Unconfigured", NULL}; -char *BridgeStandard[] = {"802.1D-2004", "802.1Q-2005", "802.1Q-2011", NULL}; -char *BridgeType[] = {"ProviderNetworkPort", "CustomerNetworkPort", "CustomerEdgePort", "CustomerVLANPort", "VLANUnawarePort", NULL}; -char *VendorClassIDMode[] = {"Exact", "Prefix", "Suffix", "Substring", NULL}; -char *DiagnosticsState[] = {"None", "Requested", "Canceled", "Complete", "Error", NULL}; -char *SupportedProtocols[] = {"HTTP", "HTTPS", NULL}; -char *InstanceMode[] = {"InstanceNumber", "InstanceAlias", NULL}; -char *NATProtocol[] = {"TCP", "UDP", "TCP/UDP", NULL}; -char *Config[] = {"High", "Low", "Off", "Advanced", NULL}; -char *Target[] = {"Drop", "Accept", "Reject", "Return", "TargetChain", NULL}; -char *ServerConnectAlgorithm[] = {"DNS-SRV", "DNS", "ServerTable", "WebSocket", NULL}; -char *KeepAlivePolicy[] = {"ICMP", "None", NULL}; -char *DeliveryHeaderProtocol[] = {"IPv4", "IPv6", NULL}; -char *KeyIdentifierGenerationPolicy[] = {"Disabled", "Provisioned", "CPE_Generated", NULL}; -char *PreambleType[] = {"short", "long", "auto", NULL}; -char *MFPConfig[] = {"Disabled", "Optional", "Required", NULL}; -char *DuplexMode[] = {"Half", "Full", "Auto", NULL}; -char *RequestedState[] = {"Idle", "Active", NULL}; -char *BulkDataProtocols[] = {"Streaming", "File", "HTTP", NULL}; -char *EncodingTypes[] = {"XML", "XDR", "CSV", "JSON", NULL}; -char *CSVReportFormat[] = {"ParameterPerRow", "ParameterPerColumn", NULL}; -char *RowTimestamp[] = {"Unix-Epoch", "ISO-8601", "None", NULL}; -char *JSONReportFormat[] = {"ObjectHierarchy", "NameValuePair", NULL}; -char *StaticType[] = {"Static", "Inapplicable", "PrefixDelegation", "Child", NULL}; -char *ProtocolVersion[] = {"Any", "IPv4", "IPv6", NULL}; -char *ServerSelectionProtocol[] = {"ICMP", "UDP Echo", NULL}; -char *DHCPType[] = {"DHCPv4", "DHCPv6", NULL}; -char *DropAlgorithm[] = {"RED", "DT", "WRED", "BLUE", NULL}; -char *SchedulerAlgorithm[] = {"WFQ", "WRR", "SP", NULL}; -char *DTMFMethod[] = {"InBand", "RFC2833", "SIPInfo", NULL}; -char *ProfileEnable[] = {"Disabled", "Quiescent", "Enabled", NULL}; +char *Encapsulation[] = {"LLC", "VCMUX"}; +char *LinkType[] = {"EoA", "IPoA", "PPPoA", "CIP", "Unconfigured"}; +char *BridgeStandard[] = {"802.1D-2004", "802.1Q-2005", "802.1Q-2011"}; +char *BridgeType[] = {"ProviderNetworkPort", "CustomerNetworkPort", "CustomerEdgePort", "CustomerVLANPort", "VLANUnawarePort"}; +char *VendorClassIDMode[] = {"Exact", "Prefix", "Suffix", "Substring"}; +char *DiagnosticsState[] = {"None", "Requested", "Canceled", "Complete", "Error"}; +char *SupportedProtocols[] = {"HTTP", "HTTPS"}; +char *InstanceMode[] = {"InstanceNumber", "InstanceAlias"}; +char *NATProtocol[] = {"TCP", "UDP", "TCP/UDP"}; +char *Config[] = {"High", "Low", "Off", "Advanced"}; +char *Target[] = {"Drop", "Accept", "Reject", "Return", "TargetChain"}; +char *ServerConnectAlgorithm[] = {"DNS-SRV", "DNS", "ServerTable", "WebSocket"}; +char *KeepAlivePolicy[] = {"ICMP", "None"}; +char *DeliveryHeaderProtocol[] = {"IPv4", "IPv6"}; +char *KeyIdentifierGenerationPolicy[] = {"Disabled", "Provisioned", "CPE_Generated"}; +char *PreambleType[] = {"short", "long", "auto"}; +char *MFPConfig[] = {"Disabled", "Optional", "Required"}; +char *DuplexMode[] = {"Half", "Full", "Auto"}; +char *RequestedState[] = {"Idle", "Active"}; +char *BulkDataProtocols[] = {"Streaming", "File", "HTTP"}; +char *EncodingTypes[] = {"XML", "XDR", "CSV", "JSON"}; +char *CSVReportFormat[] = {"ParameterPerRow", "ParameterPerColumn"}; +char *RowTimestamp[] = {"Unix-Epoch", "ISO-8601", "None"}; +char *JSONReportFormat[] = {"ObjectHierarchy", "NameValuePair"}; +char *StaticType[] = {"Static", "Inapplicable", "PrefixDelegation", "Child"}; +char *ProtocolVersion[] = {"Any", "IPv4", "IPv6"}; +char *ServerSelectionProtocol[] = {"ICMP", "UDP Echo"}; +char *DHCPType[] = {"DHCPv4", "DHCPv6"}; +char *DropAlgorithm[] = {"RED", "DT", "WRED", "BLUE"}; +char *SchedulerAlgorithm[] = {"WFQ", "WRR", "SP"}; +char *DTMFMethod[] = {"InBand", "RFC2833", "SIPInfo"}; +char *ProfileEnable[] = {"Disabled", "Quiescent", "Enabled"}; -char *PIN[] = {"^\\d{4}|\\d{8}$", NULL}; -char *DestinationAddress[] = {"^\\d+/\\d+$", NULL}; -char *RegulatoryDomain[] = {"^[A-Z][A-Z][ OI]$", NULL}; -char *ConformingAction[] = {"^Null$", "^Drop$", "^[0-9]|[1-5][0-9]|6[0-3]$", "^:[0-7]$", "^([0-9]|[1-5][0-9]|6[0-3]):[0-7]$", NULL}; -char *IPv4Address[] = {"^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$", NULL}; -char *IPv6Address[] = {"^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", NULL}; -char *IPAddress[] = {"^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$", "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", NULL}; -char *MACAddress[] = {"^([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])$", NULL}; +char *PIN[] = {"^\\d{4}|\\d{8}$"}; +char *DestinationAddress[] = {"^\\d+/\\d+$"}; +char *RegulatoryDomain[] = {"^[A-Z][A-Z][ OI]$"}; +char *ConformingAction[] = {"^Null$", "^Drop$", "^[0-9]|[1-5][0-9]|6[0-3]$", "^:[0-7]$", "^([0-9]|[1-5][0-9]|6[0-3]):[0-7]$"}; +char *IPv4Address[] = {"^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$"}; +char *IPv6Address[] = {"^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$"}; +char *IPAddress[] = {"^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$", "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$"}; +char *MACAddress[] = {"^([0-9A-Fa-f][0-9A-Fa-f]:){5}([0-9A-Fa-f][0-9A-Fa-f])$"}; +char *IPPrefix[] = {"^/(3[0-2]|[012]?[0-9])$", "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/(3[0-2]|[012]?[0-9])$"}; +char *IPv4Prefix[] = {"^/(3[0-2]|[012]?[0-9])$", "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/(3[0-2]|[012]?[0-9])$"}; +char *IPv6Prefix[] = {}; //TODO void compress_spaces(char *str) { @@ -1727,55 +1730,46 @@ bool match(const char *string, const char *pattern) return true; } -int dm_validate_string_length(char *value, char *min, char *max) +static int dm_validate_string_length(char *value, int min_length, int max_length) { - if (min != NULL && max != NULL) { - if ((strlen(value) > atoi(max)) || (strlen(value) < atoi(min))) return -1; - } else if (min != NULL && max == NULL) { - if (strlen(value) < atoi(min)) return -1; - } else if (min == NULL && max != NULL) { - if (strlen(value) > atoi(max)) return -1; - } + if (((min_length > 0) && (strlen(value) < min_length)) || ((max_length > 0) && (strlen(value) > max_length))) + return -1; return 0; } -int dm_validate_string_enumeration(char *value, char *enumeration[]) +static int dm_validate_string_enumeration(char *value, char *enumeration[], int enumeration_size) { - for (; *enumeration; enumeration++) { - if (strcmp(*enumeration, value) == 0) + int i; + for (i = 0; i < enumeration_size; i++) { + if (strcmp(enumeration[i], value) == 0) return 0; } return -1; } -int dm_validate_string_pattern(char *value, char *pattern[]) +static int dm_validate_string_pattern(char *value, char *pattern[], int pattern_size) { - for (; *pattern; pattern++) { - if (match(value, *pattern)) + int i; + for (i = 0; i < pattern_size; i++) { + if (match(value, pattern[i])) return 0; } return -1; } -int dm_validate_string(char *value, char *min, char *max, char *enumeration[], char *pattern[]) +int dm_validate_string(char *value, int min_length, int max_length, char *enumeration[], int enumeration_size, char *pattern[], int pattern_size) { /* check size */ - if (min != NULL || max != NULL) { - if (dm_validate_string_length(value, min, max)) - return -1; - } + if (dm_validate_string_length(value, min_length, max_length)) + return -1; /* check enumeration */ - if (enumeration != NULL) { - if (dm_validate_string_enumeration(value, enumeration)) - return -1; - } + if (enumeration && dm_validate_string_enumeration(value, enumeration, enumeration_size)) + return -1; /* check pattern */ - if (pattern != NULL) { - if (dm_validate_string_pattern(value, pattern)) - return -1; - } + if (pattern && dm_validate_string_pattern(value, pattern, pattern_size)) + return -1; return 0; } @@ -1784,121 +1778,115 @@ int dm_validate_boolean(char *value) { /* check format */ if ((value[0] == '1' && value[1] == '\0') || (value[0] == '0' && value[1] == '\0') - || (strcasecmp(value, "true") == 0) || (strcasecmp(value, "false") == 0)) { + || (strcmp(value, "true") == 0) || (strcmp(value, "false") == 0)) { return 0; } return -1; } -int dm_validate_unsignedInt(char *value, char *min, char *max) +int dm_validate_unsignedInt(char *value, struct range_args r_args[], int r_args_size) { - unsigned long val = 0, minval = 0, maxval = 0; - char *endval = NULL, *endmin = NULL, *endmax = NULL; + int i; - if (min) minval = strtoul(min, &endmin, 10); - if (max) maxval = strtoul(max, &endmax, 10); + /* check size for each range */ + for (i = 0; i < r_args_size; i++) { + unsigned long val = 0, minval = 0, maxval = 0; + char *endval = NULL, *endmin = NULL, *endmax = NULL; - /* reset errno to 0 before call */ - errno = 0; + if (r_args[i].min) minval = strtoul(r_args[i].min, &endmin, 10); + if (r_args[i].max) maxval = strtoul(r_args[i].max, &endmax, 10); - val = strtoul(value, &endval, 10); + /* reset errno to 0 before call */ + errno = 0; - if ((*endval != 0) || (errno != 0)) return -1; + val = strtoul(value, &endval, 10); - /* check size */ - if (min != NULL && max != NULL) { - if ((val > maxval) || (val < minval)) return -1; - } else if (min != NULL && max == NULL) { - if (val < minval) return -1; - } else if (min == NULL && max != NULL) { - if (val > maxval) return -1; - } else { - if ((val > (unsigned int)UINT_MAX) || (val < 0)) return -1; + if ((*endval != 0) || (errno != 0)) return -1; + + /* check size */ + if ((r_args[i].min && val < minval) || (r_args[i].max && val > maxval) || (val < 0) || (val > (unsigned int)UINT_MAX)) + return -1; } return 0; } -int dm_validate_int(char *value, char *min, char *max) +int dm_validate_int(char *value, struct range_args r_args[], int r_args_size) { - long val = 0, minval = 0, maxval = 0; - char *endval = NULL, *endmin = NULL, *endmax = NULL; + int i; - if (min) minval = strtol(min, &endmin, 10); - if (max) maxval = strtol(max, &endmax, 10); + /* check size for each range */ + for (i = 0; i < r_args_size; i++) { + long val = 0, minval = 0, maxval = 0; + char *endval = NULL, *endmin = NULL, *endmax = NULL; - /* reset errno to 0 before call */ - errno = 0; + if (r_args[i].min) minval = strtol(r_args[i].min, &endmin, 10); + if (r_args[i].max) maxval = strtol(r_args[i].max, &endmax, 10); - val = strtol(value, &endval, 10); + /* reset errno to 0 before call */ + errno = 0; - if ((*endval != 0) || (errno != 0)) return -1; + val = strtol(value, &endval, 10); - /* check size */ - if (min != NULL && max != NULL) { - if ((val > maxval) || (val < minval)) return -1; - } else if (min != NULL && max == NULL) { - if (val < minval) return -1; - } else if (min == NULL && max != NULL) { - if (val > maxval) return -1; - } else { - if ((val > INT_MAX) || (val < INT_MIN)) return -1; + if ((*endval != 0) || (errno != 0)) return -1; + + /* check size */ + if ((r_args[i].min && val < minval) || (r_args[i].max && val > maxval) || (val < INT_MIN) || (val > INT_MAX)) + return -1; } return 0; } -int dm_validate_unsignedLong(char *value, char *min, char *max) +int dm_validate_unsignedLong(char *value, struct range_args r_args[], int r_args_size) { - unsigned long val = 0, minval = 0, maxval = 0; - char *endval = NULL, *endmin = NULL, *endmax = NULL; + int i; - if (min) minval = strtoul(min, &endmin, 10); - if (max) maxval = strtoul(max, &endmax, 10); + /* check size for each range */ + for (i = 0; i < r_args_size; i++) { + unsigned long val = 0, minval = 0, maxval = 0; + char *endval = NULL, *endmin = NULL, *endmax = NULL; - /* reset errno to 0 before call */ - errno = 0; + if (r_args[i].min) minval = strtoul(r_args[i].min, &endmin, 10); + if (r_args[i].max) maxval = strtoul(r_args[i].max, &endmax, 10); - val = strtoul(value, &endval, 10); + /* reset errno to 0 before call */ + errno = 0; - if ((*endval != 0) || (errno != 0)) return -1; + val = strtoul(value, &endval, 10); - /* check size */ - if (min != NULL && max != NULL) { - if ((val > maxval) || (val < minval)) return -1; - } else if (min != NULL && max == NULL) { - if (val < minval) return -1; - } else if (min == NULL && max != NULL) { - if (val > maxval) return -1; - } else { - if ((val > (unsigned long)ULONG_MAX) || (val < 0)) return -1; + if ((*endval != 0) || (errno != 0)) return -1; + + /* check size */ + if ((r_args[i].min && val < minval) || (r_args[i].max && val > maxval) || (val < 0) || (val > (unsigned long)ULONG_MAX)) + return -1; } return 0; } -int dm_validate_long(char *value, char *min, char *max) +int dm_validate_long(char *value, struct range_args r_args[], int r_args_size) { - long val = 0, minval = 0, maxval = 0; - char *endval = NULL, *endmin = NULL, *endmax = NULL; + int i; - if (min) minval = strtol(min, &endmin, 10); - if (max) maxval = strtol(max, &endmax, 10); + /* check size for each range */ + for (i = 0; i < r_args_size; i++) { + long val = 0, minval = 0, maxval = 0; + char *endval = NULL, *endmin = NULL, *endmax = NULL; - /* reset errno to 0 before call */ - errno = 0; + if (r_args[i].min) minval = strtol(r_args[i].min, &endmin, 10); + if (r_args[i].max) maxval = strtol(r_args[i].max, &endmax, 10); - val = strtol(value, &endval, 10); + /* reset errno to 0 before call */ + errno = 0; - if ((*endval != 0) || (errno != 0)) return -1; + val = strtol(value, &endval, 10); - /* check size */ - if (min != NULL && max != NULL) { - if ((val > maxval) || (val < minval)) return -1; - } else if (min != NULL && max == NULL) { - if (val < minval) return -1; - } else if (min == NULL && max != NULL) { - if (val > maxval) return -1; + if ((*endval != 0) || (errno != 0)) return -1; + + /* check size */ + if ((r_args[i].min && val < minval) || (r_args[i].max && val > maxval)) + return -1; } return 0; @@ -1908,63 +1896,51 @@ int dm_validate_dateTime(char *value) { /* check format */ struct tm tm; - if (!(strptime(value, "%Y-%m-%dT%H:%M:%S", &tm))) + if (!(strptime(value, "%Y-%m-%dT%H:%M:%SZ", &tm))) return -1; return 0; } -int dm_validate_hexBinary(char *value, char *min, char *max) +int dm_validate_hexBinary(char *value, struct range_args r_args[], int r_args_size) { - /* check format */ int i; + + /* check format */ for (i = 0; i < strlen(value); i++) { if (!isxdigit(value[i])) return -1; } /* check size */ - if (min != NULL && max != NULL) { - if (strcmp(min, max) == 0) { - if (strlen(value) != (2 * atoi(max))) return -1; - } else { - if ((strlen(value) > atoi(max)) || (strlen(value) < atoi(min))) return -1; + for (i = 0; i < r_args_size; i++) { + if ((r_args[i].min && r_args[i].max && (atoi(r_args[i].min) == atoi(r_args[i].max)) && (strlen(value) != 2 * atoi(r_args[i].max))) || + (r_args[i].min && !r_args[i].max && (strlen(value) < atoi(r_args[i].min))) || + (!r_args[i].min && r_args[i].max && (strlen(value) > atoi(r_args[i].max)))) { + return -1; } - } else if (min != NULL && max == NULL) { - if (strlen(value) < atoi(min)) return -1; - } else if (min == NULL && max != NULL) { - if (strlen(value) > atoi(max)) return -1; } return 0; } -int dm_validate_size_list(char *min_item, char *max_item, int nbr_item) +static int dm_validate_size_list(int min_item, int max_item, int nbr_item) { - if (min_item != NULL && max_item != NULL) { - if (strcmp(min_item, max_item) == 0) { - if (nbr_item != (2 * atoi(max_item))) return -1; - } else { - if ((nbr_item > atoi(max_item)) || (nbr_item < atoi(min_item))) return -1; - } - } else if (min_item != NULL && max_item == NULL) { - if (nbr_item < atoi(min_item)) return -1; - } else if (min_item == NULL && max_item != NULL) { - if (nbr_item > atoi(max_item)) return -1; + if (((min_item > 0) && (max_item > 0) && (min_item == max_item) && (nbr_item != 2 * max_item)) || + ((min_item > 0) && (nbr_item < min_item)) || + ((max_item > 0) && (nbr_item > max_item))) { + return -1; } - return 0; } -int dm_validate_string_list(char *value, char *min_item, char *max_item, char *max_size, char *min, char *max, char *enumeration[], char *pattern[]) +int dm_validate_string_list(char *value, int min_item, int max_item, int max_size, int min, int max, char *enumeration[], int enumeration_size, char *pattern[], int pattern_size) { char *pch, *pchr; int nbr_item = 0; /* check length of list */ - if (max_size != NULL) { - if (strlen(value) > atoi(max_size)) + if ((max_size > 0) && (strlen(value) > max_size)) return -1; - } /* copy data in buffer */ char buf[strlen(value)+1]; @@ -1973,30 +1949,26 @@ int dm_validate_string_list(char *value, char *min_item, char *max_item, char *m /* for each value, validate string */ for (pch = strtok_r(buf, ",", &pchr); pch != NULL; pch = strtok_r(NULL, ",", &pchr)) { - if (dm_validate_string(pch, min, max, enumeration, pattern)) + if (dm_validate_string(pch, min, max, enumeration, enumeration_size, pattern, pattern_size)) return -1; nbr_item ++; } /* check size of list */ - if (min_item != NULL || max_item != NULL) { - if (dm_validate_size_list(min_item, max_item, nbr_item)) - return -1; - } + if (dm_validate_size_list(min_item, max_item, nbr_item)) + return -1; return 0; } -int dm_validate_unsignedInt_list(char *value, char *min_item, char *max_item, char *max_size, char *min, char *max) +int dm_validate_unsignedInt_list(char *value, int min_item, int max_item, int max_size, struct range_args r_args[], int r_args_size) { char *pch, *pchr; int nbr_item = 0; /* check length of list */ - if (max_size != NULL) { - if (strlen(value) > atoi(max_size)) + if ((max_size > 0) && (strlen(value) > max_size)) return -1; - } /* copy data in buffer */ char buf[strlen(value)+1]; @@ -2005,48 +1977,14 @@ int dm_validate_unsignedInt_list(char *value, char *min_item, char *max_item, ch /* for each value, validate string */ for (pch = strtok_r(buf, ",", &pchr); pch != NULL; pch = strtok_r(NULL, ",", &pchr)) { - if (dm_validate_unsignedInt(pch, min, max)) + if (dm_validate_unsignedInt(pch, r_args, r_args_size)) return -1; nbr_item ++; } /* check size of list */ - if (min_item != NULL || max_item != NULL) { - if (dm_validate_size_list(min_item, max_item, nbr_item)) - return -1; - } - - return 0; -} - -int dm_validate_int_list(char *value, char *min_item, char *max_item, char *max_size, char *min, char *max) -{ - char *pch, *pchr; - int nbr_item = 0; - - /* check length of list */ - if (max_size != NULL) { - if (strlen(value) > atoi(max_size)) - return -1; - } - - /* copy data in buffer */ - char buf[strlen(value)+1]; - strncpy(buf, value, sizeof(buf)); - buf[strlen(value)] = '\0'; - - /* for each value, validate string */ - for (pch = strtok_r(buf, ",", &pchr); pch != NULL; pch = strtok_r(NULL, ",", &pchr)) { - if (dm_validate_int(pch, min, max)) - return -1; - nbr_item ++; - } - - /* check size of list */ - if (min_item != NULL || max_item != NULL) { - if (dm_validate_size_list(min_item, max_item, nbr_item)) - return -1; - } + if (dm_validate_size_list(min_item, max_item, nbr_item)) + return -1; return 0; } @@ -2055,19 +1993,19 @@ int get_base64char_value(char b64) { char *base64C = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; int i; - for (i = 0; i<64; i++) - if ( base64C[i] == b64 ) + for (i = 0; i < 64; i++) + if (base64C[i] == b64) return i; return -1; } -char *decode64 (char *enc) +char *decode64(char *enc) { - int i, j=0; + int i, j = 0; size_t decsize = strlen(enc)*6/8; char *dec = (char *)dmmalloc((decsize +1) * sizeof(char)); - for (i=0; i> (j%3==0?4:(j%3==1? 2:0))); if (j%3 == 2) i++; @@ -2081,7 +2019,7 @@ int is_string_exist_in_str_array(char **cert_paths, int length, char *dirpath, c { int i; - for (i=0; i0) { + if (dirpath && strlen(dirpath) > 0) { DIR *dir; struct dirent *ent; if ((dir = opendir(dirpath)) == NULL) @@ -2140,6 +2077,7 @@ char **get_all_iop_certificates(int* length) dmasprintf(&certificates_paths[j],"%s%s", dirpath, ent->d_name); j++; } + closedir(dir); dmfree(dirpath); dirpath = NULL; } @@ -2148,26 +2086,26 @@ char **get_all_iop_certificates(int* length) return certificates_paths; } -char* stringToHex(char *text, int length) +char *stringToHex(char *text, int length) { char *hex = NULL; int i, j; hex = (char *)dmcalloc(100, sizeof(char)); - for (i = 0, j = 0; i < length; ++i, j += 3){ + for (i = 0, j = 0; i < length; ++i, j += 3) { sprintf(hex + j, "%02x", text[i] & 0xff); - if (i> fp, "\"%s\" : {" % dmparam.get('name') @@ -451,42 +454,48 @@ def printPARAM( dmparam, dmobject, bbfdm_type ): print >> fp, "\"list\" : {" # add datatype - print >> fp, ("\"datatype\" : \"%s\"," % datatype) if (listmaxsize != None or listminItem != None or listmaxItem != None or paramvalmin != None or paramvalmax != None or paramunit != None or paramenum != None or parampattern != None or (hasmapping and islist == 0)) else ("\"datatype\" : \"%s\"" % datatype) + print >> fp, ("\"datatype\" : \"%s\"," % datatype) if (listmaxsize != None or listminItem != None or listmaxItem != None or paramvalrange != None or paramunit != None or paramenum != None or parampattern != None or (hasmapping and islist == 0)) else ("\"datatype\" : \"%s\"" % datatype) if islist == 1: # add maximum size of list if listmaxsize != None: - print >> fp, ("\"maxsize\" : %s," % listmaxsize) if (listminItem != None or listmaxItem != None or paramvalmin != None or paramvalmax != None or paramunit != None or paramenum != None or parampattern != None) else ("\"maxsize\" : %s" % listmaxsize) + print >> fp, ("\"maxsize\" : %s," % listmaxsize) if (listminItem != None or listmaxItem != None or paramvalrange != None or paramunit != None or paramenum != None or parampattern != None) else ("\"maxsize\" : %s" % listmaxsize) # add minimun and maximum item values if listminItem != None and listmaxItem != None: print >> fp, "\"item\" : {" print >> fp, "\"min\" : %s," % listminItem print >> fp, "\"max\" : %s" % listmaxItem - print >> fp, ("},") if (paramvalmin != None or paramvalmax != None or paramunit != None or paramenum != None or parampattern != None) else ("}") + print >> fp, ("},") if (paramvalrange != None or paramunit != None or paramenum != None or parampattern != None) else ("}") elif listminItem != None and listmaxItem == None: print >> fp, "\"item\" : {" print >> fp, "\"min\" : %s" % listminItem - print >> fp, ("},") if (paramvalmin != None or paramvalmax != None or paramunit != None or paramenum != None or parampattern != None) else ("}") + print >> fp, ("},") if (paramvalrange != None or paramunit != None or paramenum != None or parampattern != None) else ("}") elif listminItem == None and listmaxItem != None: print >> fp, "\"item\" : {" print >> fp, "\"max\" : %s" % listmaxItem - print >> fp, ("},") if (paramvalmin != None or paramvalmax != None or paramunit != None or paramenum != None or parampattern != None) else ("}") + print >> fp, ("},") if (paramvalrange != None or paramunit != None or paramenum != None or parampattern != None) else ("}") # add minimun and maximum values - if paramvalmin != None and paramvalmax != None: - print >> fp, "\"range\" : {" - print >> fp, "\"min\" : %s," % paramvalmin - print >> fp, "\"max\" : %s" % paramvalmax - print >> fp, ("},") if (paramunit != None or paramenum != None or parampattern != None or (hasmapping and islist == 0)) else ("}") - elif paramvalmin != None and paramvalmax == None: - print >> fp, "\"range\" : {" - print >> fp, "\"min\" : %s" % paramvalmin - print >> fp, ("},") if (paramunit != None or paramenum != None or parampattern != None or (hasmapping and islist == 0)) else ("}") - elif paramvalmin == None and paramvalmax != None: - print >> fp, "\"range\" : {" - print >> fp, "\"max\" : %s" % paramvalmax - print >> fp, ("},") if (paramunit != None or paramenum != None or parampattern != None or (hasmapping and islist == 0)) else ("}") + if paramvalrange != None: + valranges = paramvalrange.split(";") + print >> fp, "\"range\" : [" + for eachvalrange in valranges: + valrange = eachvalrange.split(",") + if valrange[0] != "None" and valrange[1] != "None": + print >> fp, "{" + print >> fp, "\"min\" : %s," % valrange[0] + print >> fp, "\"max\" : %s" % valrange[1] + print >> fp, ("},") if (eachvalrange == valranges[len(valranges)-1]) else ("}") + elif valrange[0] != "None" and valrange[1] == "None": + print >> fp, "{" + print >> fp, "\"min\" : %s" % valrange[0] + print >> fp, ("},") if (eachvalrange == valranges[len(valranges)-1]) else ("}") + elif valrange[0] == "None" and valrange[1] != "None": + print >> fp, "{" + print >> fp, "\"max\" : %s" % valrange[1] + print >> fp, ("},") if (eachvalrange == valranges[len(valranges)-1]) else ("}") + print >> fp, ("],") if (paramunit != None or paramenum != None or parampattern != None or (hasmapping and islist == 0)) else ("]") # add unit if paramunit != None: