mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Device.Services.VoiceService.{i}.CodecProfile.{i}.Codec: must be readable and its value must refer to 'Device.Services.VoiceService.{i}.Capabilities.Codec.{i}.' according to standard

Browse source
This commit is contained in:
Amin Ben Ramdhane 2020-12-30 20:39:46 +01:00
parent db54efa61d
commit 9464e6e04f
2 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dmtree/tr104/servicesvoiceservicecapabilities.c
View file

@ -11,6 +11,15 @@
#include "servicesvoiceservicecapabilities.h" #include "servicesvoiceservicecapabilities.h"
#include "common.h" #include "common.h"
/**************************************************************************
* LINKER
***************************************************************************/
static int get_voice_service_capabilities_codec_linker(char *refparam, struct dmctx *dmctx, void *data, char *instance, char **linker)
{
*linker = data ? dmstrdup(((struct codec_info *)data)->codec) : "";
return 0;
}
/************************************************************* /*************************************************************
* ENTRY METHOD * ENTRY METHOD
**************************************************************/ **************************************************************/
@ -171,7 +180,7 @@ DMOBJ tServicesVoiceServiceCapabilitiesObj[] = {
/* OBJ, permission, addobj, delobj, checkdep, browseinstobj nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/ /* OBJ, permission, addobj, delobj, checkdep, browseinstobj nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
{"SIP", &DMREAD, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceCapabilitiesSIPObj, NULL, NULL, BBFDM_BOTH}, {"SIP", &DMREAD, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceCapabilitiesSIPObj, NULL, NULL, BBFDM_BOTH},
{"POTS", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceCapabilitiesPOTSParams, NULL, BBFDM_BOTH}, {"POTS", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tServicesVoiceServiceCapabilitiesPOTSParams, NULL, BBFDM_BOTH},
{"Codec", &DMREAD, NULL, NULL, NULL, browseServicesVoiceServiceCapabilitiesCodecInst, NULL, NULL, tServicesVoiceServiceCapabilitiesCodecParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "Codec", "BitRate", NULL}}, {"Codec", &DMREAD, NULL, NULL, NULL, browseServicesVoiceServiceCapabilitiesCodecInst, NULL, NULL, tServicesVoiceServiceCapabilitiesCodecParams, get_voice_service_capabilities_codec_linker, BBFDM_BOTH, LIST_KEY{"Alias", "Codec", "BitRate", NULL}},
{0} {0}
}; };

33
dmtree/tr104/servicesvoiceservicecodecprofile.c
View file

@ -8,6 +8,7 @@
* Author: Yalu Zhang, yalu.zhang@iopsys.eu * Author: Yalu Zhang, yalu.zhang@iopsys.eu
*/ */
#include "dmentry.h"
#include "servicesvoiceservicecodecprofile.h" #include "servicesvoiceservicecodecprofile.h"
#include "common.h" #include "common.h"
@ -17,32 +18,12 @@
/*#Device.Services.VoiceService.{i}.CodecProfile.{i}.Codec!UCI:asterisk/codec_profile,@i-1/name*/ /*#Device.Services.VoiceService.{i}.CodecProfile.{i}.Codec!UCI:asterisk/codec_profile,@i-1/name*/
static int get_ServicesVoiceServiceCodecProfile_Codec(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) static int get_ServicesVoiceServiceCodecProfile_Codec(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{ {
dmuci_get_value_by_section_string((struct uci_section *)data, "name", value); char *linker;
return 0;
}
static int set_ServicesVoiceServiceCodecProfile_Codec(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) dmuci_get_value_by_section_string((struct uci_section *)data, "name", &linker);
{ adm_entry_get_linker_param(ctx, "Device.Services.VoiceService.", linker, value);
int i; if (*value == NULL)
const char *uci_name; *value = "";
switch (action) {
case VALUECHECK:
for (i = 0; i < codecs_num; i++) {
if (strcmp(supported_codecs[i].codec, value) == 0)
return 0;
}
TR104_DEBUG("Wrong codec: [%s]\n", value);
return FAULT_9007;
case VALUESET:
dmuci_set_value_by_section((struct uci_section *)data, "name", value);
// The UCI section name must be changed accordingly. Otherwise it can not be referenced correctly
uci_name = get_codec_uci_name(value);
if (uci_name) {
dmuci_rename_section_by_section((struct uci_section *)data, (char *)uci_name);
}
break;
}
return 0; return 0;
} }
@ -73,7 +54,7 @@ static int set_ServicesVoiceServiceCodecProfile_PacketizationPeriod(char *refpar
/* *** Device.Services.VoiceService.{i}.CodecProfile.{i}. *** */ /* *** Device.Services.VoiceService.{i}.CodecProfile.{i}. *** */
DMLEAF tServicesVoiceServiceCodecProfileParams[] = { DMLEAF tServicesVoiceServiceCodecProfileParams[] = {
/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/ /* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
{"Codec", &DMWRITE, DMT_STRING, get_ServicesVoiceServiceCodecProfile_Codec, set_ServicesVoiceServiceCodecProfile_Codec, BBFDM_BOTH}, {"Codec", &DMREAD, DMT_STRING, get_ServicesVoiceServiceCodecProfile_Codec, NULL, BBFDM_BOTH},
{"PacketizationPeriod", &DMWRITE, DMT_STRING, get_ServicesVoiceServiceCodecProfile_PacketizationPeriod, set_ServicesVoiceServiceCodecProfile_PacketizationPeriod, BBFDM_BOTH}, {"PacketizationPeriod", &DMWRITE, DMT_STRING, get_ServicesVoiceServiceCodecProfile_PacketizationPeriod, set_ServicesVoiceServiceCodecProfile_PacketizationPeriod, BBFDM_BOTH},
{0} {0}
}; };