Author: rmudgett
Date: Thu Dec 18 13:35:19 2014
New Revision: 429783
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429783
Log:
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
Modified:
branches/11/UPGRADE.txt
branches/11/channels/sig_analog.c
Modified: branches/11/UPGRADE.txt
URL:
http://svnview.digium.com/svn/asterisk/branches/11/UPGRADE.txt?view=diff&rev=429783&r1=429782&r2=429783
==============================================================================
--- branches/11/UPGRADE.txt (original)
+++ branches/11/UPGRADE.txt Thu Dec 18 13:35:19 2014
@@ -20,6 +20,11 @@
===
===========================================================
+from 11.15 to 11.16
+chan_dahdi:
+ - The CALLERID(ani2) value for incoming calls is now populated in featdmf
+ signaling mode. The information was previously discarded.
+
from 11.13.0 to 11.13.1:
* Due to the POODLE vulnerability (see
Modified: branches/11/channels/sig_analog.c
URL:
http://svnview.digium.com/svn/asterisk/branches/11/channels/sig_analog.c?view=diff&rev=429783&r1=429782&r2=429783
==============================================================================
--- branches/11/channels/sig_analog.c (original)
+++ branches/11/channels/sig_analog.c Thu Dec 18 13:35:19 2014
@@ -1994,6 +1994,8 @@
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;
@@ -2011,6 +2013,11 @@
} 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);
}
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
