diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-04-03 02:12:33 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-04-03 02:12:33 +0000 |
| commit | a5a0a5f867a45eef2e7ccb6c64f3a4f2e8c3a7ba (patch) | |
| tree | d5314391644adec2c19d0dc0b36644a20a12c759 /include | |
| parent | 5333a48b17e3f0f9cb12a7cb23da9bc509539dd7 (diff) | |
Consolidate ast_channel.cid.cid_rdnis into ast_channel.redirecting.from.number.
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 76206c4f7..a32486a39 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -257,12 +257,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 */ |