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

Added support for local (per connection) aliases in rmanager. 

git-svn-id: http://voip.null.ro/svn/yate@4476 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2011-07-06 20:36:46 +00:00
parent 6f7a47715e
commit dfd49af00f
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.d/rmanager.conf.sample
View File

@ -54,3 +54,9 @@
; For acceptable values see the documentation of the openssl module
; By default no client certificate is required
;verify=
; Initial aliases can be created for each connection
; Each declaration line starts with alias: and may include \0 as placeholder
; for the line entered in rmanager and \1 ... \9 for individual components
; Example:
; alias:cgu=control \1/ISUP unblock force=yes circuits=\2

55
modules/rmanager.cpp
View File

@ -119,6 +119,7 @@ static const CommandInfo s_cmdInfo[] =
{ "reload", "[plugin]", 0, "Reloads module configuration files" },
{ "restart", "[now]", s_rnow, "Restarts the engine if executing supervised" },
{ "stop", "[exitcode]", 0, "Stops the engine with optionally provided exit code" },
{ "alias", "[name [command...]]", 0, "Create an alias for a longer command" },
{ 0, 0, 0, 0 }
};
@ -221,6 +222,7 @@ public:
{ return m_listener->cfg(); }
void checkTimer(u_int64_t time);
private:
NamedList m_aliases;
Level m_auth;
bool m_debug;
bool m_output;
@ -401,6 +403,7 @@ Connection* RManagerListener::checkCreate(Socket* sock, const char* addr)
Connection::Connection(Socket* sock, const char* addr, RManagerListener* listener)
: Thread("RManager Connection"),
m_aliases(""),
m_auth(None), m_debug(false), m_output(false), m_colorize(false), m_machine(false),
m_threshold(DebugAll),
m_socket(sock), m_lastch(0), m_escmode(0), m_echoing(false), m_beeping(false),
@ -459,6 +462,14 @@ void Connection::run()
writeStr("\r" + hdr + "\r\n");
hdr.clear();
}
NamedIterator iter(cfg());
while (const NamedString* s = iter.get()) {
if (s->null() || !s->name().startsWith("alias:"))
continue;
String name = s->name().substr(6).trimSpaces();
if (name)
m_aliases.setParam(name,*s);
}
unsigned char buffer[128];
while (m_socket && m_socket->valid()) {
Thread::check();
@ -821,6 +832,11 @@ bool Connection::autoComplete()
if (cmd.startsWith(partWord))
m.retValue().append(cmd,"\t");
}
NamedIterator iter(m_aliases);
while (const NamedString* s = iter.get()) {
if (s->name().startsWith(partWord))
m.retValue().append(s->name(),"\t");
}
}
else {
const CommandInfo* info = s_cmdInfo;
@ -1273,8 +1289,47 @@ bool Connection::processLine(const char *line, bool saveLine)
writeStr(m_machine ? "%%=shutdown\r\n" : "Engine shutting down - bye!\r\n");
Engine::halt(code);
}
else if (str.startSkip("alias"))
{
str.trimSpaces();
if (str.null()) {
NamedIterator iter(m_aliases);
while (const NamedString* s = iter.get())
str << s->name() << "=" << *s << "\r\n";
writeStr(str);
return false;
}
int sep = str.find(' ');
if (sep > 0) {
String val = str.substr(sep+1);
str = str.substr(0,sep);
m_aliases.setParam(str,val);
writeStr("Alias " + str + " set to: " + val + "\r\n");
}
else {
m_aliases.clearParam(str);
writeStr("Alias " + str + " removed\r\n");
}
}
else
{
str.trimSpaces();
int sep = str.find(' ');
const String* cmd = m_aliases.getParam(str.substr(0,sep));
if (cmd) {
if (!saveLine) {
writeStr("Error: possible alias loop in '" + str + "'\r\n");
return false;
}
if (sep > 0)
str = str.substr(sep+1);
else
str.clear();
static const Regexp s_paramSep("^\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *\\([^ ]*\\)\\? *");
str.matches(s_paramSep);
str = str.replaceMatches(*cmd);
return processLine(str,false);
}
Message m("engine.command");
m.addParam("line",str);
if (Engine::dispatch(m))