Commit b245ed91 authored by Omar Kallel's avatar Omar Kallel

Ticket refs #2618: TR069: Enhance separation between libbbf_api and libbbfdm (upnp_in_user_mask)

parent e2e02f48
......@@ -1062,32 +1062,16 @@ int global_env_init (int argc, char** argv, struct env *env)
case 'u':
upnpuser = optarg;
if (strcmp(upnpuser, "public") == 0) {
#ifdef TR098
upnp_in_user_mask = DM_PUBLIC_MASK;
#else
set_upnp_in_user_mask(DM_PUBLIC_MASK);
#endif
}
else if (strcmp(upnpuser, "basic") == 0) {
#ifdef TR098
upnp_in_user_mask = DM_BASIC_MASK;
#else
set_upnp_in_user_mask(DM_BASIC_MASK);
#endif
}
else if (strcmp(upnpuser, "xxxadmin") == 0) {
#ifdef TR098
upnp_in_user_mask = DM_XXXADMIN_MASK;
#else
set_upnp_in_user_mask(DM_XXXADMIN_MASK);
#endif
}
else if (strcmp(upnpuser, "superadmin") == 0) {
#ifdef TR098
upnp_in_user_mask = DM_SUPERADMIN_MASK;
#else
set_upnp_in_user_mask(DM_SUPERADMIN_MASK);
#endif
}
break;
......
......@@ -505,11 +505,7 @@ struct session *cwmp_add_queue_session (struct cwmp *cwmp)
int run_session_end_func (struct session *session)
{
#ifndef TR098
bbf_apply_end_session();
#else
apply_end_session();
#endif
if (end_session_flag & END_SESSION_EXTERNAL_ACTION)
{
......
......@@ -822,11 +822,7 @@ int cwmp_rpc_acs_prepare_message_inform (struct cwmp *cwmp, struct session *sess
if (xml_prepare_parameters_inform(&dmctx, dm_parameter, parameter_list, &size))
goto error;
#ifdef TR098
del_list_parameter(dm_parameter);
#else
bbf_del_list_parameter(dm_parameter);
#endif
}
if (asprintf(&c, "cwmp:ParameterValueStruct[%d]", size) == -1)
......@@ -1248,11 +1244,7 @@ int cwmp_handle_rpc_cpe_get_parameter_values(struct session *session, struct rpc
counter++;
#ifdef TR098
del_list_parameter(dm_parameter);
#else
bbf_del_list_parameter(dm_parameter);
#endif
}
#ifdef ACS_MULTI
b = mxmlFindElement(session->tree_out, session->tree_out, "ParameterList",
......@@ -1359,11 +1351,7 @@ int cwmp_handle_rpc_cpe_get_parameter_names(struct session *session, struct rpc
counter++;
#ifdef TR098
del_list_parameter(dm_parameter);
#else
bbf_del_list_parameter(dm_parameter);
#endif
}
#ifdef ACS_MULTI
......@@ -1473,11 +1461,7 @@ int cwmp_handle_rpc_cpe_get_parameter_attributes(struct session *session, struct
counter++;
#ifdef TR098
del_list_parameter(dm_parameter);
#else
bbf_del_list_parameter(dm_parameter);
#endif
}
#ifdef ACS_MULTI
b = mxmlFindElement(session->tree_out, session->tree_out, "ParameterList",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment