kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 55954 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@55955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-02-21 20:30:54 +00:00
parent cdf9cab49d
commit 28a6129af8
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
channels/chan_gtalk.c
View File

@@ -257,6 +257,7 @@ static struct gtalk *find_gtalk(char *name, char *connection)
{
struct gtalk *gtalk = NULL;
char *domain = NULL , *s = NULL;
if(strchr(connection, '@')) {
s = ast_strdupa(connection);
domain = strsep(&s, "@");
@@ -268,20 +269,20 @@ static struct gtalk *find_gtalk(char *name, char *connection)
if (!gtalk) { /* guest call */
ASTOBJ_CONTAINER_TRAVERSE(&gtalk_list, 1, {
ASTOBJ_WRLOCK(iterator);
ASTOBJ_RDLOCK(iterator);
if (!strcasecmp(iterator->name, "guest")) {
if (!strcasecmp(iterator->connection->jid->partial, connection)) {
gtalk = iterator;
break;
} else if (!strcasecmp(iterator->connection->name, connection)) {
gtalk = iterator;
break;
} else if (iterator->connection->component && !strcasecmp(iterator->connection->user,domain)) {
gtalk = iterator;
break;
}
}
ASTOBJ_UNLOCK(iterator);
if (gtalk)
break;
});
}
@@ -1493,10 +1494,12 @@ static struct ast_channel *gtalk_request(const char *type, int format, void *dat
ast_log(LOG_WARNING, "Could not find recipient.\n");
return NULL;
}
ASTOBJ_WRLOCK(client);
p = gtalk_alloc(client, strchr(sender, '@') ? sender : client->connection->jid->full, strchr(to, '@') ? to : client->user, NULL);
if (p)
chan = gtalk_new(client, p, AST_STATE_DOWN, to);
ASTOBJ_UNLOCK(client);
return chan;
}
@@ -1526,13 +1529,13 @@ static int gtalk_parser(void *data, ikspak *pak)
if (iks_find_with_attrib(pak->x, "session", "type", "initiate")) {
/* New call */
gtalk_newcall(client, pak);
} else if (iks_find_with_attrib(pak->x, "session", "type", "candidates") || iks_find_with_attrib(pak->x, "session", "type", "transport-info") ) {
} else if (iks_find_with_attrib(pak->x, "session", "type", "candidates") || iks_find_with_attrib(pak->x, "session", "type", "transport-info")) {
if (option_debug > 2)
ast_log(LOG_DEBUG, "About to add candidate!\n");
gtalk_add_candidate(client, pak);
if (option_debug > 2)
ast_log(LOG_DEBUG, "Candidate Added!\n");
} else if (iks_find_with_attrib(pak->x, "session", "type", "accept")) {
} else if (iks_find_with_attrib(pak->x, "session", "type", "accept") || iks_find_with_attrib(pak->x, "session", "type", "transport-accept")) {
gtalk_is_answered(client, pak);
} else if (iks_find_with_attrib(pak->x, "session", "type", "content-info")) {
gtalk_handle_dtmf(client, pak);

9
channels/chan_jingle.c
View File

@@ -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;
}