diff options
| author | Philippe Sultan <philippe.sultan@gmail.com> | 2008-06-02 14:35:24 +0000 |
|---|---|---|
| committer | Philippe Sultan <philippe.sultan@gmail.com> | 2008-06-02 14:35:24 +0000 |
| commit | 001c95b5955ff4253f1b9b5261b2d00cf4c06be5 (patch) | |
| tree | 140d1cc53f9866d48523c833478f4ddb99f38613 /res | |
| parent | 2feb90d5116cc493497fb168b5b8290217c43cb0 (diff) | |
Do not link the guest account with any configured XMPP client (in
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
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_jabber.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 653537df4..20189c78d 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -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; } |