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:
@@ -79,7 +79,7 @@ static struct ast_frame *lintogsm_sample(void)
|
||||
f.mallocd = 0;
|
||||
f.offset = 0;
|
||||
f.src = __PRETTY_FUNCTION__;
|
||||
f.data = slin_gsm_ex;
|
||||
f.data.ptr = slin_gsm_ex;
|
||||
return &f;
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ static struct ast_frame *gsmtolin_sample(void)
|
||||
f.mallocd = 0;
|
||||
f.offset = 0;
|
||||
f.src = __PRETTY_FUNCTION__;
|
||||
f.data = gsm_slin_ex;
|
||||
f.data.ptr = gsm_slin_ex;
|
||||
return &f;
|
||||
}
|
||||
|
||||
@@ -119,10 +119,10 @@ static int gsmtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
|
||||
/* XXX what's the point here! we should just work
|
||||
* on the full format.
|
||||
*/
|
||||
conv65(f->data + x, data);
|
||||
conv65(f->data.ptr + x, data);
|
||||
} else {
|
||||
len = GSM_SAMPLES;
|
||||
src = f->data + x;
|
||||
src = f->data.ptr + x;
|
||||
}
|
||||
/* XXX maybe we don't need to check */
|
||||
if (pvt->samples + len > BUFFER_SAMPLES) {
|
||||
@@ -159,7 +159,7 @@ static int lintogsm_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
|
||||
ast_log(LOG_WARNING, "Out of buffer space\n");
|
||||
return -1;
|
||||
}
|
||||
memcpy(tmp->buf + pvt->samples, f->data, f->datalen);
|
||||
memcpy(tmp->buf + pvt->samples, f->data.ptr, f->datalen);
|
||||
pvt->samples += f->samples;
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user