mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +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:
@@ -1501,7 +1501,7 @@ static int sms_generate(struct ast_channel *chan, void *data, int len, int sampl
|
||||
f.datalen = samples * sizeof(*buf);
|
||||
f.offset = AST_FRIENDLY_OFFSET;
|
||||
f.mallocd = 0;
|
||||
f.data = buf;
|
||||
f.data.ptr = buf;
|
||||
f.samples = samples;
|
||||
f.src = "app_sms";
|
||||
/* create a buffer containing the digital sms pattern */
|
||||
@@ -1905,7 +1905,7 @@ static int sms_exec(struct ast_channel *chan, void *data)
|
||||
break;
|
||||
}
|
||||
if (f->frametype == AST_FRAME_VOICE) {
|
||||
sms_process(&h, f->samples, f->data);
|
||||
sms_process(&h, f->samples, f->data.ptr);
|
||||
}
|
||||
|
||||
ast_frfree(f);
|
||||
|
Reference in New Issue
Block a user