kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code simplification

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@118614 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Philippe Sultan
2008-05-28 08:39:10 +00:00
parent a06df81624
commit 2ab8f076bf
1 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
channels/chan_jingle.c
View File

@@ -956,7 +956,7 @@ static int jingle_newcall(struct jingle *client, ikspak *pak)
struct jingle_pvt *p, *tmp = client->p; struct jingle_pvt *p, *tmp = client->p;
struct ast_channel *chan; struct ast_channel *chan;
int res; int res;
iks *payload_type; iks *codec;
/* Make sure our new call doesn't exist yet */ /* Make sure our new call doesn't exist yet */
while (tmp) { while (tmp) {
@@ -974,7 +974,10 @@ static int jingle_newcall(struct jingle *client, ikspak *pak)
return -1; return -1;
} }
chan = jingle_new(client, p, AST_STATE_DOWN, pak->from->user); chan = jingle_new(client, p, AST_STATE_DOWN, pak->from->user);
if (chan) { if (!chan) {
jingle_free_pvt(client, p);
return -1;
}
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
ast_copy_string(p->them, pak->from->full, sizeof(p->them)); ast_copy_string(p->them, pak->from->full, sizeof(p->them));
if (iks_find_attrib(pak->query, JINGLE_SID)) { if (iks_find_attrib(pak->query, JINGLE_SID)) {
@@ -982,11 +985,12 @@ static int jingle_newcall(struct jingle *client, ikspak *pak)
sizeof(p->sid)); sizeof(p->sid));
} }
payload_type = iks_child(iks_child(iks_child(iks_child(pak->x)))); /* codec points to the first <payload-type/> tag */
while (payload_type) { codec = iks_child(iks_child(iks_child(iks_child(pak->x))));
ast_rtp_set_m_type(p->rtp, atoi(iks_find_attrib(payload_type, "id"))); while (codec) {
ast_rtp_set_rtpmap_type(p->rtp, atoi(iks_find_attrib(payload_type, "id")), "audio", iks_find_attrib(payload_type, "name"), 0); ast_rtp_set_m_type(p->rtp, atoi(iks_find_attrib(codec, "id")));
payload_type = iks_next(payload_type); ast_rtp_set_rtpmap_type(p->rtp, atoi(iks_find_attrib(codec, "id")), "audio", iks_find_attrib(codec, "name"), 0);
codec = iks_next(codec);
} }
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);
@@ -1010,9 +1014,7 @@ static int jingle_newcall(struct jingle *client, ikspak *pak)
/* nothing to do */ /* nothing to do */
break; break;
} }
} else {
jingle_free_pvt(client, p);
}
return 1; return 1;
} }