kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mod_abstraction] Adding Application support and fixing memory corruption.

This commit is contained in:
Marc Olivier Chouinard 2023-06-26 14:56:40 -04:00
parent 244ccaa8a8
commit 92b9b2a2c4
2 changed files with 102 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml
View File

@ -2,4 +2,7 @@
<apis> <apis>
<api name="user_name" description="Return Name for extension" syntax="<exten>" parse="(.*)" destination="user_data" argument="$1@default var effective_caller_id_name"/> <api name="user_name" description="Return Name for extension" syntax="<exten>" parse="(.*)" destination="user_data" argument="$1@default var effective_caller_id_name"/>
</apis> </apis>
<apps>
<app name="bridge_tdm" description="Bridge TDM" syntax="<did>" parse="(.*)" destination="bridge" argument="freetdm/1/a/$1"/>
</apps>
</configuration> </configuration>

115
src/mod/applications/mod_abstraction/mod_abstraction.c
View File

@ -36,29 +36,72 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_abstraction_shutdown);
SWITCH_MODULE_RUNTIME_FUNCTION(mod_abstraction_runtime); SWITCH_MODULE_RUNTIME_FUNCTION(mod_abstraction_runtime);
SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load); SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load);
switch_api_interface_t *api_interface = NULL;
switch_application_interface_t *app_interface = NULL;
const char *global_cf = "abstraction.conf"; const char *global_cf = "abstraction.conf";
typedef enum {
ABS_TYPE_API = 0,
ABS_TYPE_APP = 1
} abs_type_t;
/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) /* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime)
* Defines a switch_loadable_module_function_table_t and a static const char[] modname * Defines a switch_loadable_module_function_table_t and a static const char[] modname
*/ */
SWITCH_MODULE_DEFINITION(mod_abstraction, mod_abstraction_load, mod_abstraction_shutdown, NULL); SWITCH_MODULE_DEFINITION(mod_abstraction, mod_abstraction_load, mod_abstraction_shutdown, NULL);
SWITCH_STANDARD_API(api_abstraction_function) switch_status_t gen_abstraction_function(abs_type_t type, const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) {
{ const char *api_name = NULL;
const char *api_name = switch_event_get_header(stream->param_event, "API-Command"); switch_channel_t *channel = NULL;
switch_xml_t cfg, xml, x_apis, x_api; switch_xml_t cfg = NULL, xml = NULL, x_apis, x_api;
const char *xml_cat = NULL, *xml_entry = NULL;
switch (type) {
case ABS_TYPE_API:
api_name = switch_event_get_header(stream->param_event, "API-Command");
xml_cat = "apis";
xml_entry = "api";
break;
case ABS_TYPE_APP:
if (!session) {
return SWITCH_STATUS_FALSE ;
}
channel = switch_core_session_get_channel(session);
if (!channel) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel not found\n");
goto end;
}
// current_application
api_name = switch_channel_get_variable(channel, SWITCH_CURRENT_APPLICATION_VARIABLE);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "APP %s DETECTED\n", api_name);
xml_cat = "apps";
xml_entry = "app";
break;
default:
return SWITCH_STATUS_FALSE;
}
if (zstr(api_name)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "APP COULDN'T FIND THE APP NAME\n");
goto end;
}
if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) { if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf);
goto end; goto end;
} }
if (!(x_apis = switch_xml_child(cfg, "apis"))) { if (!(x_apis = switch_xml_child(cfg, xml_cat))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n");
goto end; goto end;
} }
if ((x_api = switch_xml_find_child_multi(x_apis, "api", "name", api_name , NULL))) { if ((x_api = switch_xml_find_child_multi(x_apis, xml_entry, "name", api_name , NULL))) {
const char *parse = switch_xml_attr_soft(x_api, "parse"); const char *parse = switch_xml_attr_soft(x_api, "parse");
const char *destination = switch_xml_attr_soft(x_api, "destination"); const char *destination = switch_xml_attr_soft(x_api, "destination");
const char *arguments = switch_xml_attr_soft(x_api, "argument"); const char *arguments = switch_xml_attr_soft(x_api, "argument");
@ -66,7 +109,7 @@ SWITCH_STANDARD_API(api_abstraction_function)
int proceed; int proceed;
switch_regex_t *re = NULL; switch_regex_t *re = NULL;
int ovector[30]; int ovector[30];
if (!cmd) cmd = "";
if ((proceed = switch_regex_perform(cmd, parse, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { if ((proceed = switch_regex_perform(cmd, parse, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
const char *api_args = NULL; const char *api_args = NULL;
char *substituted = NULL; char *substituted = NULL;
@ -83,7 +126,14 @@ SWITCH_STANDARD_API(api_abstraction_function)
} else { } else {
api_args = arguments; api_args = arguments;
} }
switch_api_execute(destination, api_args, session, stream); switch(type) {
case ABS_TYPE_API:
switch_api_execute(destination, api_args, session, stream);
break;
case ABS_TYPE_APP:
switch_core_session_execute_application(session, destination, api_args);
break;
}
switch_safe_free(substituted); switch_safe_free(substituted);
} else { } else {
@ -103,12 +153,22 @@ end:
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
SWITCH_STANDARD_API(api_abstraction_function)
{
return gen_abstraction_function(ABS_TYPE_API, cmd, NULL, session, stream);
}
SWITCH_STANDARD_APP(app_abstraction_function)
{
gen_abstraction_function(ABS_TYPE_APP, data, NULL, session, NULL);
}
/* Macro expands to: switch_status_t mod_abstraction_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */ /* Macro expands to: switch_status_t mod_abstraction_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load) SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load)
{ {
switch_status_t status = SWITCH_STATUS_TERM; switch_status_t status = SWITCH_STATUS_TERM;
switch_api_interface_t *api_interface; switch_xml_t cfg = NULL, xml = NULL, x_apis, x_api;
switch_xml_t cfg, xml, x_apis, x_api;
int count = 0; int count = 0;
/* connect my internal structure to the blank pointer passed to me */ /* connect my internal structure to the blank pointer passed to me */
@ -122,15 +182,38 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load)
if (!(x_apis = switch_xml_child(cfg, "apis"))) { if (!(x_apis = switch_xml_child(cfg, "apis"))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n");
goto end; goto end;
} else {
for (x_api = switch_xml_child(x_apis, "api"); x_api; x_api = x_api->next) {
const char *name = switch_xml_attr_soft(x_api, "name");
const char *description = switch_xml_attr_soft(x_api, "description");
const char *syntax = switch_xml_attr_soft(x_api, "syntax");
char *name_dup = switch_core_strdup(pool, name);
char *description_dup = switch_core_strdup(pool, description);
char *syntax_dup = switch_core_strdup(pool, syntax);
SWITCH_ADD_API(api_interface, name_dup, description_dup, api_abstraction_function, syntax_dup);
count++;
}
} }
if (!(x_apis = switch_xml_child(cfg, "apps"))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apps group\n");
goto end;
} else {
for (x_api = switch_xml_child(x_apis, "api"); x_api; x_api = x_api->next) { for (x_api = switch_xml_child(x_apis, "app"); x_api; x_api = x_api->next) {
const char *name = switch_xml_attr_soft(x_api, "name"); const char *name = switch_xml_attr_soft(x_api, "name");
const char *description = switch_xml_attr_soft(x_api, "description"); const char *description = switch_xml_attr_soft(x_api, "description");
const char *syntax = switch_xml_attr_soft(x_api, "syntax"); const char *syntax = switch_xml_attr_soft(x_api, "syntax");
SWITCH_ADD_API(api_interface, name, description, api_abstraction_function, syntax); char *name_dup = switch_core_strdup(pool, name);
count++; char *description_dup = switch_core_strdup(pool, description);
char *syntax_dup = switch_core_strdup(pool, syntax);
SWITCH_ADD_APP(app_interface, name_dup, description_dup, description_dup, app_abstraction_function, syntax_dup, SAF_NONE);
count++;
}
} }
if (count > 0) { if (count > 0) {
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;