[asterisk-commits] rmudgett: branch 13 r429784 - in /branches/13: ./ channels/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Dec 18 14:03:11 2014
New Revision: 429784

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429784
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
........

Merged revisions 429783 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/13/   (props changed)
    branches/13/UPGRADE.txt
    branches/13/channels/sig_analog.c

Propchange: branches/13/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Thu Dec 18 14:03:11 2014
@@ -1,1 +1,1 @@
-/branches/11:1-429517,429539,429632
+/branches/11:1-429517,429539,429632,429783

Modified: branches/13/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/branches/13/UPGRADE.txt?view=diff&rev=429784&r1=429783&r2=429784
==============================================================================
--- branches/13/UPGRADE.txt (original)
+++ branches/13/UPGRADE.txt Thu Dec 18 14:03:11 2014
@@ -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:

Modified: branches/13/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/channels/sig_analog.c?view=diff&rev=429784&r1=429783&r2=429784
==============================================================================
--- branches/13/channels/sig_analog.c (original)
+++ branches/13/channels/sig_analog.c Thu Dec 18 14:03:11 2014
@@ -1963,6 +1963,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;
@@ -1980,6 +1982,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);
 			}