retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

New "execute" command in extmodule allows executing arbitrary programs logged through Yate. 

The behavior is the same as listing in the [execute] section.


git-svn-id: http://yate.null.ro/svn/yate/trunk@4796 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2012-01-05 17:52:01 +00:00
parent 9b83538a2b
commit 28983898f8
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/extmodule.cpp
View File

@ -69,6 +69,7 @@ static const char* s_cmds[] = {
"start",
"stop",
"restart",
"execute",
0
};
@ -362,6 +363,17 @@ static bool runProgram(const char *script, const char *args)
return true;
}
static void adjustPath(String& script)
{
if (script.null() || script.startsWith(Engine::pathSeparator()))
return;
String tmp = Engine::sharedPath();
tmp << Engine::pathSeparator() << "scripts";
tmp = s_cfg.getValue("general","scripts_dir",tmp);
if (!tmp.endsWith(Engine::pathSeparator()))
tmp += Engine::pathSeparator();
script = tmp + script;
}
ExtModSource::ExtModSource(Stream* str, ExtModChan* chan)
: m_str(str), m_brate(16000), m_total(0), m_chan(chan)
@ -948,14 +960,7 @@ bool ExtModReceiver::create(const char *script, const char *args)
HANDLE ext2yate[2];
HANDLE yate2ext[2];
int x;
if (script[0] != '/') {
tmp = Engine::sharedPath();
tmp << Engine::pathSeparator() << "scripts";
tmp = s_cfg.getValue("general","scripts_dir",tmp);
if (!tmp.endsWith(Engine::pathSeparator()))
tmp += Engine::pathSeparator();
tmp += script;
}
adjustPath(tmp);
script = tmp.c_str();
if (::pipe(ext2yate)) {
Debug(DebugWarn, "Unable to create ext->yate pipe: %s",strerror(errno));
@ -1642,6 +1647,20 @@ bool ExtModCommand::received(Message& msg)
if (!restart)
return true;
}
else if (line.startSkip("execute")) {
if (line.null())
return false;
blank = line.find(' ');
String exe = line.substr(0,blank);
adjustPath(exe);
if (blank >= 0)
line = line.substr(blank+1);
else
line.clear();
bool ok = runProgram(exe,line);
msg.retValue() = ok ? "External exec attempt\r\n" : "External exec failed\r\n";
return true;
}
ExtModReceiver *r = ExtModReceiver::build(line.substr(0,blank),
(blank >= 0) ? line.substr(blank+1).c_str() : (const char*)0);
msg.retValue() = r ? "External start attempt\r\n" : "External command failed\r\n";