ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-29 14:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Core, mod_commands] Add posix_spawn replacement for the system call. Add unit-tests.

Browse Source
This commit is contained in:
Andrey Volk committed 2021-07-16 17:34:42 +03:00
1 parent f1dd4390c8
commit 9aee9b8e24
8 files changed
+392 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mod/applications/mod_commands/Makefile.am
+7
View File
@@ -6,3 +6,10 @@ mod_commands_la_SOURCES = mod_commands.c
mod_commands_la_CFLAGS = $(AM_CFLAGS)
mod_commands_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_commands_la_LDFLAGS = -avoid-version -module -no-undefined -shared
noinst_PROGRAMS = test/test_mod_commands
test_test_mod_commands_CFLAGS = $(SWITCH_AM_CFLAGS) -I../ -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\"
test_test_mod_commands_LDFLAGS = -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS)
test_test_mod_commands_LDADD = mod_commands.la $(switch_builddir)/libfreeswitch.la
TESTS = $(noinst_PROGRAMS)
src/mod/applications/mod_commands/mod_commands.c
+50
View File
@@ -6522,6 +6522,53 @@ SWITCH_STANDARD_API(bg_system_function)
return SWITCH_STATUS_SUCCESS;
}
#define SPAWN_SYNTAX "<command>"
SWITCH_STANDARD_API(spawn_stream_function)
{
if (zstr(cmd)) {
stream->write_function(stream, "-USAGE: %s\n", SPAWN_SYNTAX);
return SWITCH_STATUS_SUCCESS;
}
if (switch_stream_spawn(cmd, SWITCH_TRUE, stream) < 0) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd);
}
return SWITCH_STATUS_SUCCESS;
}
#define SPAWN_SYNTAX "<command>"
SWITCH_STANDARD_API(spawn_function)
{
if (zstr(cmd)) {
stream->write_function(stream, "-USAGE: %s\n", SPAWN_SYNTAX);
return SWITCH_STATUS_SUCCESS;
}
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd);
if (switch_spawn(cmd, SWITCH_TRUE) < 0) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd);
}
stream->write_function(stream, "+OK\n");
return SWITCH_STATUS_SUCCESS;
}
#define SPAWN_SYNTAX "<command>"
SWITCH_STANDARD_API(bg_spawn_function)
{
if (zstr(cmd)) {
stream->write_function(stream, "-USAGE: %s\n", SPAWN_SYNTAX);
return SWITCH_STATUS_SUCCESS;
}
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd);
if (switch_spawn(cmd, SWITCH_FALSE) < 0) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd);
}
stream->write_function(stream, "+OK\n");
return SWITCH_STATUS_SUCCESS;
}
SWITCH_STANDARD_API(strftime_tz_api_function)
{
char *format = NULL;
@@ -7456,6 +7503,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
if (use_system_commands) {
SWITCH_ADD_API(commands_api_interface, "bg_system", "Execute a system command in the background", bg_system_function, SYSTEM_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "system", "Execute a system command", system_function, SYSTEM_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "bg_spawn", "Execute a spawn command in the background", bg_spawn_function, SPAWN_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "spawn", "Execute a spawn command without capturing it's output", spawn_function, SPAWN_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "spawn_stream", "Execute a spawn command and capture it's output", spawn_stream_function, SPAWN_SYNTAX);
}
SWITCH_ADD_API(commands_api_interface, "acl", "Compare an ip to an acl list", acl_function, "<ip> <list_name>");
src/mod/applications/mod_commands/test/.gitignore
+5
View File
@@ -0,0 +1,5 @@
.dirstamp
.libs/
.deps/
test_mod_commands*.o
test_mod_commands
src/mod/applications/mod_commands/test/conf/freeswitch.xml
+37
View File
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<document type="freeswitch/xml">
<section name="configuration" description="Various Configuration">
<configuration name="modules.conf" description="Modules">
<modules>
<load module="mod_console"/>
</modules>
</configuration>
<configuration name="console.conf" description="Console Logger">
<mappings>
<map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
</mappings>
<settings>
<param name="colorize" value="true"/>
<param name="loglevel" value="debug"/>
</settings>
</configuration>
<configuration name="timezones.conf" description="Timezones">
<timezones>
<zone name="GMT" value="GMT0" />
</timezones>
</configuration>
</section>
<section name="dialplan" description="Regex/XML Dialplan">
<context name="default">
<extension name="sample">
<condition>
<action application="info"/>
</condition>
</extension>
</context>
</section>
</document>
src/mod/applications/mod_commands/test/test_mod_commands.c
+72
View File
@@ -0,0 +1,72 @@
/*
* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
* Copyright (C) 2005-2018, Anthony Minessale II <anthm@freeswitch.org>
*
* Version: MPL 1.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
*
* The Initial Developer of the Original Code is
* Andrey Volk <andywolk@gmail.com>
* Portions created by the Initial Developer are Copyright (C)
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Andrey Volk <andywolk@gmail.com>
*
* mod_commands_test -- mod_commands tests
*
*/
#include <test/switch_test.h>
FST_CORE_BEGIN("conf")
{
FST_MODULE_BEGIN(mod_commands, mod_commands_test)
{
FST_SETUP_BEGIN()
{
}
FST_SETUP_END()
FST_TEST_BEGIN(spawn_test)
{
#ifdef __linux__
switch_stream_handle_t stream = { 0 };
SWITCH_STANDARD_STREAM(stream);
switch_api_execute("bg_spawn", "echo TEST_BG_SPAWN", NULL, &stream);
fst_check_string_equals(stream.data, "+OK\n");
switch_safe_free(stream.data);
SWITCH_STANDARD_STREAM(stream);
switch_api_execute("spawn_stream", "echo DEADBEEF", NULL, &stream);
fst_check_string_equals(stream.data, "DEADBEEF\n");
switch_safe_free(stream.data);
SWITCH_STANDARD_STREAM(stream);
switch_api_execute("spawn", "echo TEST_NO_OUTPUT", NULL, &stream);
fst_check_string_equals(stream.data, "+OK\n");
switch_safe_free(stream.data);
#endif
}
FST_TEST_END()
FST_TEARDOWN_BEGIN()
{
}
FST_TEARDOWN_END()
}
FST_MODULE_END()
}
FST_CORE_END()