diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-12-18 20:03:11 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-12-18 20:03:11 +0000 |
| commit | e603fbe04a678e978562ca642e4369c820601c29 (patch) | |
| tree | e40f82d4fe45d62c38689ffa6688e014cc072a59 | |
| parent | 4fad85f9bf58ed2a11acd5559ca9bce097f2f1cf (diff) | |
chan_dahdi: Populate CALLERID(ani2) for incoming calls in featdmf signaling mode.
For the featdmf signaling mode the incoming MF Caller-ID information is
formatted as follows: *${CALLERID(ani2)}${CALLERID(ani)}#*${EXTEN}#
Rather than discarding the ani2 digits, populate the CALLERID(ani2) value
with what is received instead.
AST-1368 #close
Reported by: Denis Martinez
Patches:
extract_ani2_for_featdmf_v11.patch (license #5621) patch uploaded by Richard Mudgett
........
Merged revisions 429783 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429784 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | UPGRADE.txt | 6 | ||||
| -rw-r--r-- | channels/sig_analog.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index 0c500da22..1911c72fb 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -21,6 +21,12 @@ === UPGRADE-12.txt -- Upgrade info for 11 to 12 =========================================================== +From 13.1.0 to 13.2.0: + +chan_dahdi: + - The CALLERID(ani2) value for incoming calls is now populated in featdmf + signaling mode. The information was previously discarded. + From 13.0.0 to 13.1.0: ARI: diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 140f5093b..3740d4b2b 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -1963,6 +1963,8 @@ static void *__analog_ss_thread(void *data) if ((p->sig == ANALOG_SIG_FEATDMF) || (p->sig == ANALOG_SIG_FEATDMF_TA)) { if (exten[0] == '*') { char *stringp=NULL; + struct ast_party_caller *caller; + ast_copy_string(exten2, exten, sizeof(exten2)); /* Parse out extension and callerid */ stringp=exten2 +1; @@ -1980,6 +1982,11 @@ static void *__analog_ss_thread(void *data) } else { ast_copy_string(exten, s1 + 2, sizeof(exten)); } + + /* The first two digits are ani2 information. */ + caller = ast_channel_caller(chan); + s1[2] = '\0'; + caller->ani2 = atoi(s1); } else { ast_log(LOG_WARNING, "Got a non-Feature Group D input on channel %d. Assuming E&M Wink instead\n", p->channel); } |