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

Fixed bug: don't clear jabber account/proto when validating calls. 

git-svn-id: http://voip.null.ro/svn/yate@5763 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2014-02-10 08:51:22 +00:00
parent 99aac73b42
commit 914df248d5
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
engine/ClientLogic.cpp
View File

@ -7678,42 +7678,48 @@ bool DefaultLogic::callIncoming(Message& msg, const String& dest)
return true;
}
static inline int targetExtraCharPos(const String& s)
{
for (unsigned int i = 0; i < s.length(); i++) {
char c = s[i];
if (c == '@' || c == ':')
return (int)i;
}
return -1;
}
// Validate an outgoing call
bool DefaultLogic::validateCall(NamedList& params, Window* wnd)
{
const String& ns = params[YSTRING("target")];
int pos = ns.find('/');
if (pos > 0) {
params.clearParam(YSTRING("account"));
params.clearParam(YSTRING("protocol"));
params.clearParam(YSTRING("line"));
return true;
}
NamedString* proto = params.getParam(YSTRING("protocol"));
NamedString* acc = params.getParam(YSTRING("account"));
if (!acc)
acc = params.getParam(YSTRING("line"));
bool accountCleared = false;
for (unsigned int i = 0; i < ns.length(); i++) {
char c = ns[i];
if (c == '@' || c == ':') {
NamedString* tmp = params.getParam(YSTRING("account"));
if (tmp) {
int extraPos = -2;
if (!(proto && *proto == s_jabber) && !(acc && acc->startsWith("jabber:"))) {
int pos = ns.find('/');
if (pos > 0) {
params.clearParam(YSTRING("account"));
params.clearParam(YSTRING("line"));
params.clearParam(proto);
return true;
}
if (acc) {
extraPos = targetExtraCharPos(ns);
if (extraPos >= 0) {
accountCleared = true;
params.clearParam(tmp);
params.clearParam(YSTRING("account"));
params.clearParam(YSTRING("line"));
}
else {
tmp = params.getParam(YSTRING("line"));
if (tmp) {
accountCleared = true;
params.clearParam(tmp);
}
}
break;
}
}
if (params[YSTRING("account")])
if (!TelEngine::null(acc))
return true;
const char* error = 0;
if (params[YSTRING("protocol")]) {
if (ns.find('@') <= 0 && ns.find(':') <= 0)
if (!TelEngine::null(proto)) {
if (extraPos >= 0 || (extraPos == -2 && targetExtraCharPos(ns) >= 0))
error = "This is not a valid protocol URI.";
}
else if (accountCleared)