kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not link the guest account with any configured XMPP client (in

Browse Source 
jabber.conf). The actual connection is made when a call comes in
Asterisk.

Apply this fix to Jingle too.

Fix the ast_aji_get_client function that was not able to retrieve an
XMPP client from its JID.

(closes issue #12085)
Reported by: junky
Tested by: phsultan


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@119741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Philippe Sultan
2008-06-02 14:35:24 +00:00
parent 2feb90d511
commit 001c95b595
3 changed files with 74 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/res_jabber.c
View File

@@ -2884,17 +2884,30 @@ static int aji_load_config(int reload)
}
/*!
* \brief grab a aji_client structure by label name.
* \param name label name
* \brief grab a aji_client structure by label name or JID
* (without the resource string)
* \param name label or JID
* \return aji_client.
*/
struct aji_client *ast_aji_get_client(const char *name)
{
struct aji_client *client = NULL;
char *aux = NULL;
client = ASTOBJ_CONTAINER_FIND(&clients, name);
if (!client && !strchr(name, '@'))
client = ASTOBJ_CONTAINER_FIND_FULL(&clients, name, user,,, strcasecmp);
if (!client && strchr(name, '@')) {
ASTOBJ_CONTAINER_TRAVERSE(&clients, 1, {
aux = ast_strdupa(iterator->user);
if (strchr(aux, '/')) {
/* strip resource for comparison */
aux = strsep(&aux, "/");
}
if (!strcasecmp(aux, name)) {
client = iterator;
}
});
}
return client;
}