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

Consolidate ast_channel.cid.cid_rdnis into ast_channel.redirecting.from.number.

Browse Source 
SWP-1229
ABE-2161

* Ensure chan_local.c:local_call() will not leak cid.cid_dnid when
copying.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@256104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2010-04-03 02:12:33 +00:00
parent 5333a48b17
commit a5a0a5f867
20 changed files with 66 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/asterisk/channel.h
View File

@@ -256,12 +256,6 @@ struct ast_callerid {
*/
char *cid_ani;
/*!
* \brief Malloc'd Redirecting Directory Number Information Service (RDNIS)
* (Field will eventually move to struct ast_channel.redirecting.from.number)
*/
char *cid_rdnis;
/*!
* \brief Callerid Q.931 encoded number presentation/screening fields
* (Field will eventually move to struct ast_channel.caller.id.number_presentation)
@@ -700,12 +694,7 @@ struct ast_channel {
*/
struct ast_party_connected_line connected;
/*!
* \brief Redirecting/Diversion information
* \note Until struct ast_channel.cid.cid_rdnis is replaced
* with ast_channel.redirecting.from.number, the
* ast_channel.redirecting.from.number field is not used.
*/
/*! \brief Redirecting/Diversion information */
struct ast_party_redirecting redirecting;
struct ast_frame dtmff; /*!< DTMF frame */