diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-21 20:30:54 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-21 20:30:54 +0000 |
| commit | 5f936e6d21b66a586e9278b39d62806182e283d6 (patch) | |
| tree | deccd9bec825039cecb28c8778f85d1ed7d47110 /channels/chan_jingle.c | |
| parent | 62c7fd4d0f149e16a05df826703961e1eaf4ccf7 (diff) | |
Merged revisions 55954 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r55954 | qwell | 2007-02-21 14:27:08 -0600 (Wed, 21 Feb 2007) | 4 lines
Fix locking issue, and accept "transport-accept" as a valid accept message.
This should solve issues 8970 and 8503.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@55955 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_jingle.c')
| -rw-r--r-- | channels/chan_jingle.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 50f11538d..1d3032465 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -242,17 +242,18 @@ static struct jingle *find_jingle(char *name, char *connection) if (!jingle) { /* guest call */ ASTOBJ_CONTAINER_TRAVERSE(&jingles, 1, { - ASTOBJ_WRLOCK(iterator); + ASTOBJ_RDLOCK(iterator); if (!strcasecmp(iterator->name, "guest")) { if (!strcasecmp(iterator->connection->jid->partial, connection)) { jingle = iterator; - break; } else if (!strcasecmp(iterator->connection->name, connection)) { jingle = iterator; - break; } } ASTOBJ_UNLOCK(iterator); + + if (jingle) + break; }); } @@ -1376,9 +1377,11 @@ static struct ast_channel *jingle_request(const char *type, int format, void *da ast_log(LOG_WARNING, "Could not find recipient.\n"); return NULL; } + ASTOBJ_WRLOCK(client); p = jingle_alloc(client, to, NULL); if (p) chan = jingle_new(client, p, AST_STATE_DOWN, to); + ASTOBJ_UNLOCK(client); return chan; } |