diff --git a/dm/dmtree/common/voice_services.c b/dm/dmtree/common/voice_services.c index b26df0a..ab169b2 100644 --- a/dm/dmtree/common/voice_services.c +++ b/dm/dmtree/common/voice_services.c @@ -153,7 +153,7 @@ DMLEAF tProfileSIPParams[] = { {"ReInviteExpires", &DMWRITE, DMT_UNINT, get_sip_re_invite_expires, set_sip_re_invite_expires, NULL, NULL}, {"RegisterExpires", &DMWRITE, DMT_UNINT, get_sip_re_invite_expires, set_sip_re_invite_expires, NULL, NULL}, {"RegisterRetryInterval", &DMWRITE, DMT_UNINT, get_sip_re_invite_expires, set_sip_re_invite_expires, NULL, NULL}, -{"X_002207_CallLines", &DMWRITE, DMT_STRING, get_sip_x_002207_call_lines, set_sip_x_002207_call_lines, NULL, NULL}, +{CUSTOM_PREFIX"CallLines", &DMWRITE, DMT_STRING, get_sip_call_lines, set_sip_call_lines, NULL, NULL}, {0} }; @@ -219,8 +219,8 @@ DMLEAF tLineParams[] = { {"DirectoryNumber", &DMWRITE, DMT_STRING, get_line_directory_number, set_line_directory_number, NULL, NULL}, {"Status", &DMREAD, DMT_STRING, get_voice_profile_line_status, set_line_alias, NULL, NULL}, {"CallState", &DMREAD, DMT_STRING, get_voice_profile_line_callstate, set_line_alias, NULL, NULL}, -{"X_002207_LineProfile", &DMWRITE, DMT_STRING, get_line_x_002207_line_profile, set_line_x_002207_line_profile, NULL, NULL}, -{"X_002207_BRCMLine", &DMWRITE, DMT_STRING, get_line_x_002207_brcm_line, set_line_x_002207_brcm_line, NULL, NULL}, +{CUSTOM_PREFIX"LineProfile", &DMWRITE, DMT_STRING, get_line_line_profile, set_line_line_profile, NULL, NULL}, +{CUSTOM_PREFIX"BRCMLine", &DMWRITE, DMT_STRING, get_line_brcm_line, set_line_brcm_line, NULL, NULL}, {CUSTOM_PREFIX"Confort_Noise_Enable", &DMWRITE, DMT_BOOL, get_line_confort_noise_enable, set_line_confort_noise_enable, NULL, NULL}, {0} }; @@ -1257,7 +1257,7 @@ int set_sip_re_invite_expires(char *refparam, struct dmctx *ctx, void *data, cha } -int get_sip_x_002207_call_lines(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_sip_call_lines(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct sip_args *sipargs = (struct sip_args *)data; @@ -1265,7 +1265,7 @@ int get_sip_x_002207_call_lines(char *refparam, struct dmctx *ctx, void *data, c return 0; } -int set_sip_x_002207_call_lines(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_sip_call_lines(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { struct sip_args *sipargs = (struct sip_args *)data; @@ -1662,7 +1662,7 @@ int get_voice_profile_line_callstate(char *refparam, struct dmctx *ctx, void *da return 0; } -int get_line_x_002207_line_profile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_line_line_profile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { struct brcm_args *brcmargs = (struct brcm_args *)data; @@ -1670,7 +1670,7 @@ int get_line_x_002207_line_profile(char *refparam, struct dmctx *ctx, void *data return 0; } -int set_line_x_002207_line_profile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_line_line_profile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { char call_lines[32]; char *str; @@ -1706,7 +1706,7 @@ int set_line_x_002207_line_profile(char *refparam, struct dmctx *ctx, void *data return 0; } -int get_line_x_002207_brcm_line(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) +int get_line_brcm_line(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { char *line_name; struct brcm_args *brcmargs = (struct brcm_args *)data; @@ -1716,7 +1716,7 @@ int get_line_x_002207_brcm_line(char *refparam, struct dmctx *ctx, void *data, c return 0; } -int set_line_x_002207_brcm_line(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) +int set_line_brcm_line(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) { int error; char bname[8], *stype = NULL, *sipaccount = NULL; diff --git a/dm/dmtree/common/voice_services.h b/dm/dmtree/common/voice_services.h index 29051ed..46b0ca6 100644 --- a/dm/dmtree/common/voice_services.h +++ b/dm/dmtree/common/voice_services.h @@ -182,7 +182,7 @@ int get_sip_outbound_proxy(char *refparam, struct dmctx *ctx, void *data, char * int get_sip_outbound_proxy_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_sip_registration_period(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_sip_re_invite_expires(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_sip_x_002207_call_lines(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_sip_call_lines(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_voice_service_serviceproviderinfo_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_sip_fax_t38_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_voice_service_vp_rtp_portmin(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); @@ -195,8 +195,8 @@ int get_line_alias(char *refparam, struct dmctx *ctx, void *data, char *instance int get_voice_profile_line_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_voice_profile_line_status(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_voice_profile_line_callstate(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_line_x_002207_line_profile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); -int get_line_x_002207_brcm_line(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_line_line_profile(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); +int get_line_brcm_line(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_line_confort_noise_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_line_voice_processing_cancellation_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); int get_line_calling_features_caller_id_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); @@ -232,7 +232,7 @@ int set_sip_outbound_proxy(char *refparam, struct dmctx *ctx, void *data, char * int set_sip_outbound_proxy_port(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_sip_registration_period(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_sip_re_invite_expires(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_sip_x_002207_call_lines(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_sip_call_lines(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_voice_service_serviceproviderinfo_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_sip_fax_t38_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_voice_service_vp_rtp_portmin(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); @@ -243,8 +243,8 @@ int set_voice_service_vp_rtp_srtp_enable(char *refparam, struct dmctx *ctx, void int set_line_alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_voice_profile_line_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_line_directory_number(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_line_x_002207_line_profile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); -int set_line_x_002207_brcm_line(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_line_line_profile(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); +int set_line_brcm_line(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_line_confort_noise_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_line_calling_features_caller_id_name(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); int set_line_voice_processing_cancellation_enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action); diff --git a/dm/dmtree/tr098/landevice.c b/dm/dmtree/tr098/landevice.c index 9d5d345..0ef8ba9 100644 --- a/dm/dmtree/tr098/landevice.c +++ b/dm/dmtree/tr098/landevice.c @@ -71,7 +71,7 @@ DMLEAF tLanhost_Config_ManagementParam[] = { DMLEAF tIPInterfaceParam[] = { {"Alias", &DMWRITE, DMT_STRING, get_lan_ip_int_alias, set_lan_ip_int_alias, NULL, NULL}, {"Enable", &DMWRITE, DMT_BOOL, get_interface_enable_ipinterface, set_interface_enable_ipinterface, NULL, NULL}, -{"X_BROADCOM_COM_FirewallEnabled", &DMWRITE, DMT_BOOL, get_interface_firewall_enabled_ipinterface, set_interface_firewall_enabled_ipinterface, NULL, NULL}, +{CUSTOM_PREFIX"FirewallEnabled", &DMWRITE, DMT_BOOL, get_interface_firewall_enabled_ipinterface, set_interface_firewall_enabled_ipinterface, NULL, NULL}, {"IPInterfaceIPAddress", &DMWRITE, DMT_STRING, get_interface_ipaddress, set_interface_ipaddress, NULL, NULL}, {"IPInterfaceSubnetMask", &DMWRITE, DMT_STRING, get_interface_subnetmask, set_interface_subnetmask, NULL, NULL}, {"IPInterfaceAddressingType", &DMWRITE, DMT_STRING, get_interface_addressingtype, set_interface_addressingtype, NULL, NULL}, diff --git a/dm/dmtree/tr098/wandevice.c b/dm/dmtree/tr098/wandevice.c index 3f68b35..68ed299 100644 --- a/dm/dmtree/tr098/wandevice.c +++ b/dm/dmtree/tr098/wandevice.c @@ -74,8 +74,8 @@ DMLEAF tWANIPConnectionParam[] = { {"ConnectionType", &DMWRITE, DMT_STRING, get_wan_ip_link_connection_connection_type, set_wan_ip_link_connection_connection_type, NULL, NULL}, {"AddressingType", &DMWRITE, DMT_STRING, get_wan_ip_link_connection_addressing_type, set_wan_ip_link_connection_addressing_type, NULL, NULL}, {"NATEnabled", &DMWRITE, DMT_BOOL, get_wan_ip_link_connection_nat_enabled, set_wan_ip_link_connection_nat_enabled, NULL, NULL}, -{"X_BROADCOM_COM_FirewallEnabled", &DMWRITE, DMT_BOOL, get_interface_firewall_enabled_wanproto, set_interface_firewall_enabled_wanproto, NULL, NULL}, -{"X_BROADCOM_COM_IGMPEnabled", &DMWRITE, DMT_BOOL, get_wan_ip_link_connection_igmp_enabled, set_wan_ip_link_connection_igmp_enabled, NULL, NULL}, +{CUSTOM_PREFIX"FirewallEnabled", &DMWRITE, DMT_BOOL, get_interface_firewall_enabled_wanproto, set_interface_firewall_enabled_wanproto, NULL, NULL}, +{CUSTOM_PREFIX"IGMPEnabled", &DMWRITE, DMT_BOOL, get_wan_ip_link_connection_igmp_enabled, set_wan_ip_link_connection_igmp_enabled, NULL, NULL}, {"DNSEnabled", &DMWRITE, DMT_BOOL, get_wan_ip_link_connection_dns_enabled, set_wan_ip_link_connection_dns_enabled, NULL, NULL}, {"DNSOverrideAllowed", &DMREAD, DMT_STRING, get_empty, NULL, NULL, NULL}, {"Name", &DMWRITE, DMT_STRING, get_wan_ip_link_connection_name, set_wan_ip_link_connection_connection_name, NULL, NULL}, diff --git a/dm/dmtree/tr181/hosts.c b/dm/dmtree/tr181/hosts.c index dd2aefa..a16b5e1 100644 --- a/dm/dmtree/tr181/hosts.c +++ b/dm/dmtree/tr181/hosts.c @@ -44,8 +44,8 @@ DMLEAF thostParam[] = { {"AddressSource", &DMREAD, DMT_STRING, get_host_address_source, NULL, NULL, NULL}, {"LeaseTimeRemaining", &DMREAD, DMT_INT, get_host_leasetime_remaining, NULL, NULL, NULL}, {"DHCPClient", &DMREAD, DMT_STRING, get_host_dhcp_client, NULL, NULL, NULL}, -{"X_IOPSYS_InterfaceType", &DMREAD, DMT_STRING, get_host_interface_type, NULL, NULL, NULL}, -{"X_IOPSYS_ifname", &DMREAD, DMT_STRING, get_host_interfacename, NULL, NULL, NULL}, +{CUSTOM_PREFIX"Interface_Type", &DMREAD, DMT_STRING, get_host_interface_type, NULL, NULL, NULL}, +{CUSTOM_PREFIX"ifname", &DMREAD, DMT_STRING, get_host_interfacename, NULL, NULL, NULL}, {0} }; diff --git a/dm/dmtree/tr181/ip.c b/dm/dmtree/tr181/ip.c index 264c597..16e23cd 100644 --- a/dm/dmtree/tr181/ip.c +++ b/dm/dmtree/tr181/ip.c @@ -60,7 +60,7 @@ DMLEAF tIPv4Params[] = { /* PARAM, permission, type, getvlue, setvalue, forced_inform*/ {"Alias", &DMWRITE, DMT_STRING, get_ipv4_alias, set_ipv4_alias, &IPv4INFRM, NULL}, {"Enable", &DMWRITE, DMT_BOOL, get_ip_interface_enable, set_ip_interface_enable, &IPv4INFRM, NULL}, -{"X_BROADCOM_COM_FirewallEnabled", &DMWRITE, DMT_BOOL, get_firewall_enabled, set_firewall_enabled, &IPv4INFRM, NULL}, +{CUSTOM_PREFIX"FirewallEnabled", &DMWRITE, DMT_BOOL, get_firewall_enabled, set_firewall_enabled, &IPv4INFRM, NULL}, {"IPAddress", &DMWRITE, DMT_STRING, get_ipv4_address, set_ipv4_address, &IPv4INFRM, NULL}, {"SubnetMask", &DMWRITE, DMT_STRING, get_ipv4_netmask, set_ipv4_netmask, &IPv4INFRM, NULL}, {"AddressingType", &DMWRITE, DMT_STRING, get_ipv4_addressing_type, set_ipv4_addressing_type, &IPv4INFRM, NULL},