From: Jeff Peeler <jpeeler@digium.com>
Date: Sat, 17 Oct 2009 01:45:22 +0000 (+0000)
Subject: Merged revisions 224331 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7593e104379d7b5ce4b17eb68119a9bd6dc7da40;p=thirdparty%2Fasterisk.git

Merged revisions 224331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r224331 | jpeeler | 2009-10-16 20:36:08 -0500 (Fri, 16 Oct 2009) | 20 lines

  Merged revisions 224330 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r224330 | jpeeler | 2009-10-16 20:32:47 -0500 (Fri, 16 Oct 2009) | 13 lines

    Fix stale caller id data from being reported in AMI NewChannel event

    The problem here is that chan_dahdi is designed in such a way to set
    certain values in the dahdi_pvt only once. One of those such values
    is the configured caller id data in chan_dahdi.conf. For PRI, the
    configured caller id data could be overwritten during a call. Instead
    of saving the data and restoring, it was decided that for all non-analog
    channels it was simply best to not set the configured caller id in the
    first place and also clear it at the end of the call.

    (closes issue #15883)
    Reported by: jsmith
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@224333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 9811308a54..cea529774e 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -3395,6 +3395,8 @@ static int dahdi_hangup(struct ast_channel *ast)
 	if ((p->sig == SIG_PRI) || (p->sig == SIG_SS7) || (p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP)) {
 		x = 1;
 		ast_channel_setoption(ast,AST_OPTION_AUDIO_MODE,&x,sizeof(char),0);
+		p->cid_num[0] = '\0';
+		p->cid_name[0] = '\0';
 	}
 
 	x = 0;
@@ -9160,10 +9162,15 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 		ast_copy_string(tmp->mohinterpret, conf->chan.mohinterpret, sizeof(tmp->mohinterpret));
 		ast_copy_string(tmp->mohsuggest, conf->chan.mohsuggest, sizeof(tmp->mohsuggest));
 		ast_copy_string(tmp->context, conf->chan.context, sizeof(tmp->context));
-		ast_copy_string(tmp->cid_num, conf->chan.cid_num, sizeof(tmp->cid_num));
 		ast_copy_string(tmp->parkinglot, conf->chan.parkinglot, sizeof(tmp->parkinglot));
 		tmp->cid_ton = 0;
-		ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name));
+		if ((p->sig != SIG_PRI) || (p->sig != SIG_SS7) || (p->sig != SIG_BRI) || (p->sig != SIG_BRI_PTMP)) {
+			ast_copy_string(tmp->cid_num, conf->chan.cid_num, sizeof(tmp->cid_num));
+			ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name));
+		} else {
+			p->cid_num[0] = '\0';
+			p->cid_name[0] = '\0';
+		}
 		ast_copy_string(tmp->mailbox, conf->chan.mailbox, sizeof(tmp->mailbox));
 		if (channel != CHAN_PSEUDO && !ast_strlen_zero(tmp->mailbox)) {
 			char *mailbox, *context;