From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 5 Apr 2005 06:58:02 +0000 (+0000)
Subject: fix *67 (bug #3940)
X-Git-Tag: 1.0.11.1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=621b5be6cd6c0a128bc094d8c5834158c7c196f4;p=thirdparty%2Fasterisk.git

fix *67 (bug #3940)


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

diff --git a/CHANGES b/CHANGES
index 54a5a2e901..9eb6965734 100755
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@
     -- We now respond correctly to an invite for T.38 with a "488 Not acceptable here"
  -- chan_mgcp
     -- Fixed setting of accountcode
+    -- Fixed where *67 to block callerid only worked for first call
  -- res_agi
     -- A fix has been added to prevent calls from being hung up when more than one
        call is executing an AGI script calling the GET DATA command.
@@ -26,6 +27,7 @@
        a new line, it would not be processed
     -- Fixed the logger so that color escape sequences wouldn't be sent to the logs
     -- Fixed a logic error when setting the "rtpchecksums" option
+
 Asterisk 1.0.7
 
  -- chan_sip
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 18aef12627..9aa5b5b9b3 100755
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -936,7 +936,8 @@ static int mgcp_hangup(struct ast_channel *ast)
     /* SC: Decrement use count */
 
     if ((p->hookstate == MGCP_ONHOOK) && (!sub->next->rtp)) {
-        if (has_voicemail(p)) {
+       	p->hidecallerid = 0; 
+	if (has_voicemail(p)) {
             if (mgcpdebug) {
                 ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_hangup(%s) on %s@%s set vmwi(+)\n", ast->name, p->name, p->parent->name);
             }