mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-02-20 19:33:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Ticket refs #2483: TR-181: most Alias values are empty"

Browse source
This commit is contained in:
Amin Ben Ramdhane 2020-04-17 13:45:45 +01:00
parent 4c4d298b0d
commit 8f500aab97
28 changed files with 76 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dmtree/tr104/voice_services.c
View file

@ -2045,21 +2045,22 @@ static void codec_update_id()
////////////////////////SET AND GET ALIAS/////////////////////////////////
int get_service_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "vsalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
struct uci_section *service_section = (struct uci_section *)data;
dmuci_get_value_by_section_string(service_section, "vsalias", value);
return 0;
}
static int set_service_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
struct uci_section *service_section = (struct uci_section *)data;
switch (action) {
case VALUECHECK:
if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
return FAULT_9007;
return 0;
case VALUESET:
dmuci_set_value_by_section((struct uci_section *)data, "vsalias", value);
dmuci_set_value_by_section(service_section, "vsalias", value);
return 0;
}
return 0;
@ -2067,21 +2068,22 @@ static int set_service_alias(char *refparam, struct dmctx *ctx, void *data, char
int get_cap_codec_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct codec_args *)data)->codec_section, "codecalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
struct codec_args *cur_codec_args = (struct codec_args *)data;
dmuci_get_value_by_section_string(cur_codec_args->codec_section, "codecalias", value);
return 0;
}
static int set_cap_codec_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
struct codec_args *cur_codec_args = (struct codec_args *)data;
switch (action) {
case VALUECHECK:
if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
return FAULT_9007;
return 0;
case VALUESET:
dmuci_set_value_by_section(((struct codec_args *)data)->codec_section, "codecalias", value);
dmuci_set_value_by_section(cur_codec_args->codec_section, "codecalias", value);
return 0;
}
return 0;
@ -2089,17 +2091,18 @@ static int set_cap_codec_alias(char *refparam, struct dmctx *ctx, void *data, ch
static int get_voice_profile_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
struct sip_args *sipargs = (struct sip_args *)data;
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_voice_client", "sip_service_provider", section_name(((struct sip_args *)data)->sip_section), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "profilealias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
get_dmmap_section_of_config_section("dmmap_voice_client", "sip_service_provider", section_name(sipargs->sip_section), &dmmap_section);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "profilealias", value);
return 0;
}
static int set_voice_profile_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
struct sip_args *sipargs = (struct sip_args *)data;
struct uci_section *dmmap_section = NULL;
switch (action) {
@ -2108,7 +2111,7 @@ static int set_voice_profile_alias(char *refparam, struct dmctx *ctx, void *data
return FAULT_9007;
return 0;
case VALUESET:
get_dmmap_section_of_config_section("dmmap_voice_client", "sip_service_provider", section_name(((struct sip_args *)data)->sip_section), &dmmap_section);
get_dmmap_section_of_config_section("dmmap_voice_client", "sip_service_provider", section_name(sipargs->sip_section), &dmmap_section);
if (dmmap_section)
dmuci_set_value_by_section(dmmap_section, "profilealias", value);
return 0;
@ -2118,17 +2121,18 @@ static int set_voice_profile_alias(char *refparam, struct dmctx *ctx, void *data
static int get_line_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
struct tel_args *telarg = (struct tel_args *)data;
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_voice_client", "tel_line", section_name(((struct tel_args *)data)->tel_section), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "linealias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
get_dmmap_section_of_config_section("dmmap_voice_client", "tel_line", section_name(telarg->tel_section), &dmmap_section);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "linealias", value);
return 0;
}
static int set_line_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
struct tel_args *telarg = (struct tel_args *)data;
struct uci_section *dmmap_section = NULL;
switch (action) {
@ -2137,7 +2141,7 @@ static int set_line_alias(char *refparam, struct dmctx *ctx, void *data, char *i
return FAULT_9007;
return 0;
case VALUESET:
get_dmmap_section_of_config_section("dmmap_voice_client", "tel_line", section_name(((struct tel_args *)data)->tel_section), &dmmap_section);
get_dmmap_section_of_config_section("dmmap_voice_client", "tel_line", section_name(telarg->tel_section), &dmmap_section);
if (dmmap_section)
dmuci_set_value_by_section(dmmap_section, "linealias", value);
return 0;
@ -2148,8 +2152,6 @@ static int set_line_alias(char *refparam, struct dmctx *ctx, void *data, char *i
static int get_line_codec_list_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct line_codec_args *)data)->codec_sec, "codecalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

2
dmtree/tr157/bulkdata.c
View file

@ -344,8 +344,6 @@ static int set_BulkDataProfile_Enable(char *refparam, struct dmctx *ctx, void *d
static int get_BulkDataProfile_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "profile_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

6
dmtree/tr157/softwaremodules.c
View file

@ -226,8 +226,6 @@ static int get_SoftwareModulesExecEnv_Alias(char *refparam, struct dmctx *ctx, v
dmuci_get_value_by_section_string(s, "name", &env_name);
if (strcmp(env_name, name) == 0) {
dmuci_get_value_by_section_string(s, "alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
}
@ -386,8 +384,6 @@ static int get_SoftwareModulesDeploymentUnit_Alias(char *refparam, struct dmctx
dmuci_get_value_by_section_string(s, "environment", &du_env);
if ((strcmp(du_name, name) == 0) && (strcmp(du_env, environment) == 0)) {
dmuci_get_value_by_section_string(s, "alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
}
@ -557,8 +553,6 @@ static int get_SoftwareModulesExecutionUnit_Alias(char *refparam, struct dmctx *
dmuci_get_value_by_section_string(s, "environment", &eu_env);
if ((strcmp(eu_euid, euid) == 0) && (strcmp(eu_env, environment) == 0)) {
dmuci_get_value_by_section_string(s, "alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
}

9
dmtree/tr181/atm.c
View file

@ -24,7 +24,7 @@ struct atm_args
static int get_atm_linker(char *refparam, struct dmctx *dmctx, void *data, char *instance, char **linker)
{
if (data && ((struct atm_args *)data)->ifname) {
*linker = ((struct atm_args *)data)->ifname;
*linker = ((struct atm_args *)data)->ifname;
return 0;
}
*linker = "" ;
@ -323,9 +323,8 @@ static int get_atm_alias(char *refparam, struct dmctx *ctx, void *data, char *in
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_dsl", "atm-device", section_name(((struct atm_args *)data)->atm_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "atmlinkalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "atmlinkalias", value);
return 0;
}
@ -386,7 +385,7 @@ DMOBJ tATMLinkObj[] = {
DMLEAF tATMLinkParams[] = {
/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
{"Alias", &DMWRITE, DMT_STRING, get_atm_alias, set_atm_alias, NULL, NULL, BBFDM_BOTH},
{"Alias", &DMWRITE, DMT_STRING, get_atm_alias, set_atm_alias, NULL, NULL, BBFDM_BOTH},
{"Enable", &DMWRITE, DMT_BOOL, get_atm_enable, set_atm_enable, NULL, NULL, BBFDM_BOTH},
{"Name", &DMREAD, DMT_STRING, get_atm_link_name, NULL, NULL, NULL, BBFDM_BOTH},
{"Status", &DMREAD, DMT_STRING, get_atm_status, NULL, NULL, NULL, BBFDM_BOTH},

5
dmtree/tr181/bridging.c
View file

@ -993,8 +993,6 @@ static int get_br_alias(char *refparam, struct dmctx *ctx, void *data, char *ins
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct bridging_args *)data)->bridge_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "bridge_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -1061,10 +1059,9 @@ static int get_br_vlan_alias(char *refparam, struct dmctx *ctx, void *data, char
{
struct uci_section *dmmap_section = NULL;
/* Interface section needs to be browsed to get the value for vlan alias. */
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct bridging_vlan_args *)data)->bridge_vlan_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "bridge_vlan_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

4
dmtree/tr181/deviceinfo.c
View file

@ -171,8 +171,6 @@ static int get_vcf_desc(char *refparam, struct dmctx *ctx, void *data, char *ins
static int get_vcf_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "vcf_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -209,8 +207,6 @@ static int check_file_dir(char *name)
static int get_vlf_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "vlf_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

21
dmtree/tr181/dhcpv4.c
View file

@ -553,9 +553,8 @@ static int get_server_pool_alias(char *refparam, struct dmctx *ctx, void *data,
struct uci_section *dmmap_sect = NULL;
get_dmmap_section_of_config_section("dmmap_dhcp", "dhcp", section_name(((struct dhcp_args *)data)->dhcp_sec), &dmmap_sect);
dmuci_get_value_by_section_string(dmmap_sect, "dhcp_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_sect)
dmuci_get_value_by_section_string(dmmap_sect, "dhcp_alias", value);
return 0;
}
@ -1232,9 +1231,8 @@ static int get_dhcp_static_alias(char *refparam, struct dmctx *ctx, void *data,
{
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_dhcp", "host", section_name(((struct dhcp_static_args *)data)->dhcpsection), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "ldhcpalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "ldhcpalias", value);
return 0;
}
@ -1397,8 +1395,7 @@ static int set_DHCPv4Client_Enable(char *refparam, struct dmctx *ctx, void *data
static int get_DHCPv4Client_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dhcp_client_args *)data)->dhcp_client_dm, "bbf_dhcpv4client_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -1700,8 +1697,6 @@ static int set_DHCPv4ClientSentOption_Enable(char *refparam, struct dmctx *ctx,
static int get_DHCPv4ClientSentOption_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->opt_sect, "bbf_dhcpv4_sentopt_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -1834,8 +1829,6 @@ static int set_DHCPv4ClientReqOption_Enable(char *refparam, struct dmctx *ctx, v
static int get_DHCPv4ClientReqOption_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->opt_sect, "bbf_dhcpv4_reqtopt_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -1965,8 +1958,6 @@ static int get_DHCPv4Server_PoolNumberOfEntries(char *refparam, struct dmctx *ct
static int get_DHCPv4ServerPoolOption_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->opt_sect, "bbf_dhcpv4_servpool_option_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -2101,8 +2092,6 @@ static int set_DHCPv4RelayForwarding_Enable(char *refparam, struct dmctx *ctx, v
static int get_DHCPv4RelayForwarding_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dhcp_client_args *)data)->dhcp_client_dm, "bbf_dhcpv4relay_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

9
dmtree/tr181/dhcpv6.c
View file

@ -509,8 +509,6 @@ static int set_DHCPv6Client_Enable(char *refparam, struct dmctx *ctx, void *data
static int get_DHCPv6Client_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dhcpv6_client_args *)data)->dhcp_client_dm, "bbf_dhcpv6client_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -835,9 +833,8 @@ static int get_DHCPv6ServerPool_Alias(char *refparam, struct dmctx *ctx, void *d
struct uci_section *dmmap_sect = NULL;
get_dmmap_section_of_config_section("dmmap_dhcpv6", "dhcp", section_name(((struct dhcpv6_args *)data)->dhcp_sec), &dmmap_sect);
dmuci_get_value_by_section_string(dmmap_sect, "dhcpv6_serv_pool_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_sect)
dmuci_get_value_by_section_string(dmmap_sect, "dhcpv6_serv_pool_alias", value);
return 0;
}
@ -1239,8 +1236,6 @@ static int set_DHCPv6ServerPoolOption_Enable(char *refparam, struct dmctx *ctx,
static int get_DHCPv6ServerPoolOption_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dhcpv6_client_option_args *)data)->opt_sect, "bbf_dhcpv6_servpool_option_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

4
dmtree/tr181/dns.c
View file

@ -309,8 +309,6 @@ static int get_server_status(char *refparam, struct dmctx *ctx, void *data, char
static int get_server_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "dns_server_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -397,8 +395,6 @@ static int get_forwarding_status(char *refparam, struct dmctx *ctx, void *data,
static int get_forwarding_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "dns_server_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

4
dmtree/tr181/dsl.c
View file

@ -269,8 +269,6 @@ static int get_DSLLine_Status(char *refparam, struct dmctx *ctx, void *data, cha
static int get_DSLLine_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dsl_line_args *)data)->line_sec, "dsl_line_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -898,8 +896,6 @@ static int get_DSLChannel_Status(char *refparam, struct dmctx *ctx, void *data,
static int get_DSLChannel_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dsl_channel_args *)data)->channel_sec, "dsl_channel_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

7
dmtree/tr181/dynamicdns.c
View file

@ -397,9 +397,8 @@ static int get_DynamicDNSClient_Alias(char *refparam, struct dmctx *ctx, void *d
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_ddns", "service", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "clientalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "clientalias", value);
return 0;
}
@ -750,8 +749,6 @@ static int set_DynamicDNSServer_Name(char *refparam, struct dmctx *ctx, void *da
static int get_DynamicDNSServer_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "serveralias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

4
dmtree/tr181/ethernet.c
View file

@ -804,8 +804,6 @@ static int get_EthernetLink_Status(char *refparam, struct dmctx *ctx, void *data
static int get_EthernetLink_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string(((struct dm_args *)data)->section, "link_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -1222,8 +1220,6 @@ static int get_EthernetVLANTermination_Alias(char *refparam, struct dmctx *ctx,
get_dmmap_section_of_config_section("dmmap_network", "device", section_name(((struct dm_args *)data)->section), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "vlan_term_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

10
dmtree/tr181/gre.c
View file

@ -230,9 +230,8 @@ static int get_GRETunnel_Alias(char *refparam, struct dmctx *ctx, void *data, ch
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct dmmap_dup *)data)->config_section), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "gretunnel_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "gretunnel_alias", value);
return 0;
}
@ -335,9 +334,8 @@ static int get_GRETunnelInterface_Alias(char *refparam, struct dmctx *ctx, void
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct dmmap_dup *)data)->config_section), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "greiface_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "greiface_alias", value);
return 0;
}

2
dmtree/tr181/interfacestack.c
View file

@ -467,8 +467,6 @@ static int get_InterfaceStack_Alias(char *refparam, struct dmctx *ctx, void *dat
struct uci_section *s = NULL;
uci_path_foreach_option_eq(bbfdm, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", instance, s) {
dmuci_get_value_by_section_string(s, "interface_stack_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
}
return 0;
}

22
dmtree/tr181/ip.c
View file

@ -1188,8 +1188,6 @@ static int get_IPInterfaceTWAMPReflector_Status(char *refparam, struct dmctx *ct
static int get_IPInterfaceTWAMPReflector_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "twamp_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -1295,9 +1293,8 @@ static int get_IPInterface_Alias(char *refparam, struct dmctx *ctx, void *data,
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct ip_args *)data)->ip_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "ip_int_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "ip_int_alias", value);
return 0;
}
@ -1324,9 +1321,8 @@ static int get_ipv4_alias(char *refparam, struct dmctx *ctx, void *data, char *i
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct ip_args *)data)->ip_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "ipv4_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "ipv4_alias", value);
return 0;
}
@ -1355,11 +1351,8 @@ static int get_IPInterfaceIPv6Address_Alias(char *refparam, struct dmctx *ctx, v
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6", "ipv6_instance", instance, dmmap_section) {
dmuci_get_value_by_section_string(dmmap_section, "section_name", &name);
if (strcmp(name, section_name(((struct ipv6_args *)data)->ip_sec)) == 0) {
if(strcmp(name, section_name(((struct ipv6_args *)data)->ip_sec)) == 0)
dmuci_get_value_by_section_string(dmmap_section, "ipv6_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
}
}
return 0;
}
@ -1394,11 +1387,8 @@ static int get_IPInterfaceIPv6Prefix_Alias(char *refparam, struct dmctx *ctx, vo
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6prefix", "ipv6prefix_instance", instance, dmmap_section) {
dmuci_get_value_by_section_string(dmmap_section, "section_name", &name);
if(strcmp(name, section_name(((struct ipv6prefix_args *)data)->ip_sec)) == 0) {
if(strcmp(name, section_name(((struct ipv6prefix_args *)data)->ip_sec)) == 0)
dmuci_get_value_by_section_string(dmmap_section, "ipv6prefix_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
}
}
return 0;
}

10
dmtree/tr181/nat.c
View file

@ -195,9 +195,8 @@ static int get_nat_interface_setting_alias(char *refparam, struct dmctx *ctx, vo
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_firewall", "zone", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "interface_setting_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "interface_setting_alias", value);
return 0;
}
@ -305,9 +304,8 @@ static int get_nat_port_mapping_alias(char *refparam, struct dmctx *ctx, void *d
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_firewall", "redirect", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "port_mapping_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "port_mapping_alias", value);
return 0;
}

5
dmtree/tr181/ppp.c
View file

@ -21,9 +21,8 @@ static int get_ppp_alias(char *refparam, struct dmctx *ctx, void *data, char *in
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "ppp_int_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "ppp_int_alias", value);
return 0;
}

5
dmtree/tr181/ptm.c
View file

@ -214,9 +214,8 @@ static int get_ptm_alias(char *refparam, struct dmctx *ctx, void *data, char *in
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_dsl", "ptm-device", section_name(((struct ptm_args *)data)->ptm_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "ptmlinkalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "ptmlinkalias", value);
return 0;
}

6
dmtree/tr181/qos-iopsyswrt.c
View file

@ -2803,11 +2803,8 @@ static int get_QoSQueue_Status(char *refparam, struct dmctx *ctx, void *data, ch
static int get_QoSQueue_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_qos", "queue", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "queuealias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -3241,11 +3238,8 @@ static int get_QoSShaper_Status(char *refparam, struct dmctx *ctx, void *data, c
static int get_QoSShaper_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_qos", "shaper", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "shaperalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

4
dmtree/tr181/qos.c
View file

@ -759,8 +759,6 @@ static int get_QoSClassification_Alias(char *refparam, struct dmctx *ctx, void *
{
struct dmmap_dup *p= (struct dmmap_dup*)data;
dmuci_get_value_by_section_string(p->dmmap_section, "classifalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -3546,8 +3544,6 @@ static int get_QoSQueueStats_Alias(char *refparam, struct dmctx *ctx, void *data
{
struct queuestats *qts= (struct queuestats*)data;
dmuci_get_value_by_section_string(qts->dmsect, "queuestatsalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

12
dmtree/tr181/routing.c
View file

@ -1007,8 +1007,6 @@ static int get_RoutingRouteInformationInterfaceSetting_RouteLifetime(char *refpa
static int get_RoutingRouter_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "router_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -1036,9 +1034,8 @@ static int get_router_ipv4forwarding_alias(char *refparam, struct dmctx *ctx, vo
get_dmmap_section_of_config_section("dmmap_route_forwarding", "route", section_name(((struct routingfwdargs *)data)->routefwdsection), &dmmap_section);
else
get_dmmap_section_of_config_section("dmmap_route_forwarding", "route_disabled", section_name(((struct routingfwdargs *)data)->routefwdsection), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "routealias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "routealias", value);
return 0;
}
@ -1073,9 +1070,8 @@ static int get_RoutingRouterIPv6Forwarding_Alias(char *refparam, struct dmctx *c
dmmap_section = ((struct routingfwdargs *)data)->routefwdsection;
else
get_dmmap_section_of_config_section("dmmap_route_forwarding", "route6", section_name(((struct routingfwdargs *)data)->routefwdsection), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "route6alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "route6alias", value);
return 0;
}

6
dmtree/tr181/usb.c
View file

@ -489,8 +489,6 @@ static int get_USBInterface_Alias(char *refparam, struct dmctx *ctx, void *data,
{
struct usb_interface *usbiface= (struct usb_interface *)data;
dmuci_get_value_by_section_string(usbiface->dm_usb_iface, "usb_iface_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -596,8 +594,6 @@ static int get_USBPort_Alias(char *refparam, struct dmctx *ctx, void *data, char
{
struct usb_port* port=(struct usb_port *)data;
dmuci_get_value_by_section_string(port->dm_usb_port, "usb_port_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -700,8 +696,6 @@ static int get_USBUSBHostsHost_Alias(char *refparam, struct dmctx *ctx, void *da
{
struct usb_port* port=(struct usb_port *)data;
dmuci_get_value_by_section_string(port->dm_usb_port, "usb_host_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

5
dmtree/tr181/users.c
View file

@ -108,9 +108,8 @@ static int get_user_alias(char *refparam, struct dmctx *ctx, void *data, char *i
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_users", "user", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "user_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "user_alias", value);
return 0;
}

28
dmtree/tr181/wifi.c
View file

@ -1608,9 +1608,8 @@ static int get_WiFiEndPoint_Alias(char *refparam, struct dmctx *ctx, void *data,
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_wireless", "wifi-iface", section_name(((struct wifi_enp_args *)data)->wifi_enp_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "endpointalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "endpointalias", value);
return 0;
}
@ -1671,11 +1670,11 @@ static int get_WiFiEndPointProfile_Alias(char *refparam, struct dmctx *ctx, void
char *epinst = NULL;
get_dmmap_section_of_config_section("dmmap_wireless", "wifi-iface", section_name((struct uci_section*)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "endpointinstance", &epinst);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "endpointinstance", &epinst);
get_dmmap_section_of_config_section_eq("dmmap_wireless", "ep_profile", "ep_key", epinst, &dm);
dmuci_get_value_by_section_string(dm, "ep_profile_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dm)
dmuci_get_value_by_section_string(dm, "ep_profile_alias", value);
return 0;
}
@ -2036,9 +2035,8 @@ static int get_radio_alias(char *refparam, struct dmctx *ctx, void *data, char *
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_wireless", "wifi-device", section_name(((struct wifi_radio_args *)data)->wifi_radio_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "radioalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "radioalias", value);
return 0;
}
@ -2065,9 +2063,8 @@ static int get_ssid_alias(char *refparam, struct dmctx *ctx, void *data, char *i
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_wireless", "wifi-iface", section_name(((struct wifi_ssid_args *)data)->wifi_ssid_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "ssidalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "ssidalias", value);
return 0;
}
@ -2094,9 +2091,8 @@ static int get_access_point_alias(char *refparam, struct dmctx *ctx, void *data,
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_wireless", "wifi-iface", section_name(((struct wifi_acp_args *)data)->wifi_acp_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "accesspointalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "accesspointalias", value);
return 0;
}

5
dmtree/tr181/x_iopsys_eu_buttons.c
View file

@ -132,9 +132,8 @@ static int get_x_iopsys_eu_button_alias(char *refparam, struct dmctx *ctx, void
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_buttons", "button", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "buttonalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "buttonalias", value);
return 0;
}

5
dmtree/tr181/x_iopsys_eu_dropbear.c
View file

@ -323,9 +323,8 @@ static int get_x_iopsys_eu_dropbear_alias(char *refparam, struct dmctx *ctx, voi
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_dropbear", "dropbear", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "dropbearalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
if (dmmap_section)
dmuci_get_value_by_section_string(dmmap_section, "dropbearalias", value);
return 0;
}

2
dmtree/tr181/x_iopsys_eu_owsd.c
View file

@ -243,8 +243,6 @@ static int get_x_iopsys_eu_owsd_virtualhost_alias(char *refparam, struct dmctx *
get_dmmap_section_of_config_section("dmmap_owsd", "owsd-listen", section_name((struct uci_section *)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "olistenalias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}

4
dmtree/tr181/xmpp.c
View file

@ -121,8 +121,6 @@ static int set_connection_enable(char *refparam, struct dmctx *ctx, void *data,
static int get_xmpp_connection_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "connection_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}
@ -435,8 +433,6 @@ static int set_xmpp_connection_server_enable(char *refparam, struct dmctx *ctx,
static int get_xmpp_connection_server_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
dmuci_get_value_by_section_string((struct uci_section *)data, "connection_server_alias", value);
if ((*value)[0] == '\0')
dmasprintf(value, "cpe-%s", instance);
return 0;
}