diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 11 | ||||
| -rw-r--r-- | include/asterisk/frame.h | 8 |
2 files changed, 14 insertions, 5 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 5177734a4..96dc52c0f 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -731,7 +731,16 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *f); * * \note The channel does not need to be locked before calling this function. */ -int ast_queue_hangup(struct ast_channel *chan, int cause); +int ast_queue_hangup(struct ast_channel *chan); + +/*! + * \brief Queue a hangup frame with hangupcause set + * + * \note The channel does not need to be locked before calling this function. + * \param chan channel to queue frame onto + * \param cause the hangup cause + */ +int ast_queue_hangup_with_cause(struct ast_channel *chan, int cause); /*! * \brief Queue a control frame with payload diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 0cd748c03..e638b7d8c 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -156,7 +156,7 @@ struct ast_frame { /*! Optional source of frame for debugging */ const char *src; /*! Pointer to actual data */ - void *data; + union { void *ptr; uint32_t uint32; char pad[8]; } data; /*! Global delivery time */ struct timeval delivery; /*! For placing in a linked list */ @@ -181,7 +181,7 @@ struct ast_frame { */ #define AST_FRAME_SET_BUFFER(fr, _base, _ofs, _datalen) \ { \ - (fr)->data = (char *)_base + (_ofs); \ + (fr)->data.ptr = (char *)_base + (_ofs); \ (fr)->offset = (_ofs); \ (fr)->datalen = (_datalen); \ } @@ -446,9 +446,9 @@ void ast_swapcopy_samples(void *dst, const void *src, int samples); little-endian and big-endian. */ #if __BYTE_ORDER == __LITTLE_ENDIAN #define ast_frame_byteswap_le(fr) do { ; } while(0) -#define ast_frame_byteswap_be(fr) do { struct ast_frame *__f = (fr); ast_swapcopy_samples(__f->data, __f->data, __f->samples); } while(0) +#define ast_frame_byteswap_be(fr) do { struct ast_frame *__f = (fr); ast_swapcopy_samples(__f->data.ptr, __f->data.ptr, __f->samples); } while(0) #else -#define ast_frame_byteswap_le(fr) do { struct ast_frame *__f = (fr); ast_swapcopy_samples(__f->data, __f->data, __f->samples); } while(0) +#define ast_frame_byteswap_le(fr) do { struct ast_frame *__f = (fr); ast_swapcopy_samples(__f->data.ptr, __f->data.ptr, __f->samples); } while(0) #define ast_frame_byteswap_be(fr) do { ; } while(0) #endif |