[asterisk-commits] murf: branch murf/config_comments r41438 - in /team/murf/config_comments: ./ ...

[asterisk-commits at lists.digium.com]

Author: murf
Date: Wed Aug 30 14:51:43 2006
New Revision: 41438

URL: http://svn.digium.com/view/asterisk?rev=41438&view=rev
Log:
Merged revisions 41429,41433-41436 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r41429 | russell | 2006-08-30 13:02:34 -0600 (Wed, 30 Aug 2006) | 13 lines

Blocked revisions 41411 via svnmerge

........
r41411 | russell | 2006-08-30 14:59:44 -0400 (Wed, 30 Aug 2006) | 6 lines

Restore original functionality of 1.2 in places where ANI was not set, but was
changed to be set.  The original change was done to ensure that the behavior of
the "callerid" option in each channel driver was consistent, but it caused an
unexpected behavior change of CDR records for users, so this change is being
reverted in 1.2.  (issue #7695)

........

................
r41433 | oej | 2006-08-30 13:07:21 -0600 (Wed, 30 Aug 2006) | 2 lines

Issue #7572 (Boesl) - hangup channel that get buggy 487 response (imported from 1.2)

................
r41434 | russell | 2006-08-30 13:07:59 -0600 (Wed, 30 Aug 2006) | 2 lines

add a note about behavior of the "clid" field in the CDR

................
r41435 | oej | 2006-08-30 13:16:53 -0600 (Wed, 30 Aug 2006) | 3 lines

Mark ALERT_INFO as deprecated. This can now be done with the sipaddheader() application and
does not need special code in chan_sip any more.

................
r41436 | oej | 2006-08-30 13:20:29 -0600 (Wed, 30 Aug 2006) | 2 lines

Note to myself: Remember Russell's note: Always compile first...

................

Modified:
    team/murf/config_comments/   (props changed)
    team/murf/config_comments/UPGRADE.txt
    team/murf/config_comments/channels/chan_sip.c

Propchange: team/murf/config_comments/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/murf/config_comments/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/murf/config_comments/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 30 14:51:43 2006
@@ -1,1 +1,1 @@
-/trunk:1-41421
+/trunk:1-41436

Modified: team/murf/config_comments/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/murf/config_comments/UPGRADE.txt?rev=41438&r1=41437&r2=41438&view=diff
==============================================================================
--- team/murf/config_comments/UPGRADE.txt (original)
+++ team/murf/config_comments/UPGRADE.txt Wed Aug 30 14:51:43 2006
@@ -302,6 +302,10 @@
   in coming versions of Asterisk. Please use the dialplan function
   SIPCHANINFO(useragent) instead.
 
+* The ALERT_INFO dialplan variable is deprecated and will be removed
+  in coming versions of Asterisk. Please use the dialplan application
+  sipaddheader() to add the "Alert-Info" header to the outbound invite.
+
 The Zap channel:
 
 * Support for MFC/R2 has been removed, as it has not been functional for some
@@ -383,3 +387,13 @@
   server puts a phone on a different server on hold, the remote server will be
   responsible for playing the hold music to its local phone that was put on
   hold instead of the far end server across the network playing the music.
+
+CDR Records:
+
+* The behavior of the "clid" field of the CDR has always been that it will
+  contain the callerid ANI if it is set, or the callerid number if ANI was not
+  set.  When using the "callerid" option for various channel drivers, some
+  would set ANI and some would not.  This has been cleared up so that all
+  channel drivers set ANI.  If you would like to change the callerid number
+  on the channel from the dialplan and have that change also show up in the 
+  CDR, then you *must* set CALLERID(ANI) as well as CALLERID(num).

Modified: team/murf/config_comments/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/murf/config_comments/channels/chan_sip.c?rev=41438&r1=41437&r2=41438&view=diff
==============================================================================
--- team/murf/config_comments/channels/chan_sip.c (original)
+++ team/murf/config_comments/channels/chan_sip.c Wed Aug 30 14:51:43 2006
@@ -81,6 +81,10 @@
  * The PBX issues a hangup on both incoming and outgoing calls through
  * the sip_hangup() function
  *
+ * \par Deprecated stuff
+ * This is deprecated and will be removed after the 1.4 release
+ * - the SIPUSERAGENT dialplan variable
+ * - the ALERT_INFO dialplan variable
  */
 
 
@@ -11827,6 +11831,8 @@
 					break;
 				case 487:	/* Response on INVITE that has been CANCELled */
 					/* channel now destroyed - dec the inUse counter */
+					if (owner)
+						ast_queue_hangup(p->owner);
 					update_call_counter(p, DEC_CALL_LIMIT);
 					break;
 				case 482: /*