mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-16 17:53:15 +00:00
- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause
- make data member of the ast_frame struct a named union instead of a void Recently the ast_queue_hangup function got a new parameter, the hangupcause Feedback came in that this is no good and that instead a new function should be created. This I did. The hangupcause was stored in the seqno member of the ast_frame struct. This is not very elegant, and since there's already a data member that one should be used. Problem is, this member was a void *. Now it's a named union so it can hold a pointer, an uint32 and there's a padding in case someone wants to store another type in there in the future. This commit is so massive, because all ast_frame.data uses have to be altered to ast_frame.data.data Thanks russellb and kpfleming for the feedback. (closes issue #12674) Reported by: mvanbaak git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -620,7 +620,7 @@ static int gtalk_is_answered(struct gtalk *client, ikspak *pak)
|
||||
ast_getformatname_multiple(s2, BUFSIZ, tmp->peercapability),
|
||||
ast_getformatname_multiple(s3, BUFSIZ, tmp->jointcapability));
|
||||
/* close session if capabilities don't match */
|
||||
ast_queue_hangup(tmp->owner, -1);
|
||||
ast_queue_hangup(tmp->owner);
|
||||
|
||||
return -1;
|
||||
|
||||
@@ -749,7 +749,7 @@ static int gtalk_hangup_farend(struct gtalk *client, ikspak *pak)
|
||||
if (tmp) {
|
||||
tmp->alreadygone = 1;
|
||||
if (tmp->owner)
|
||||
ast_queue_hangup(tmp->owner, -1);
|
||||
ast_queue_hangup(tmp->owner);
|
||||
} else
|
||||
ast_log(LOG_NOTICE, "Whoa, didn't find call!\n");
|
||||
gtalk_response(client, from, pak, NULL, NULL);
|
||||
|
Reference in New Issue
Block a user