[asterisk-commits] bebuild: tag 10.4.0-rc3 r364762 - in /tags/10.4.0-rc3: ./ channels/

[SVN commits to the Asterisk project]

Author: bebuild
Date: Tue May  1 12:29:10 2012
New Revision: 364762

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364762
Log:
Merge 364707 for 10.4.0-rc3

Removed:
    tags/10.4.0-rc3/asterisk-10.4.0-rc2-summary.html
    tags/10.4.0-rc3/asterisk-10.4.0-rc2-summary.txt
Modified:
    tags/10.4.0-rc3/   (props changed)
    tags/10.4.0-rc3/.version
    tags/10.4.0-rc3/ChangeLog
    tags/10.4.0-rc3/channels/chan_sip.c

Propchange: tags/10.4.0-rc3/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: tags/10.4.0-rc3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  1 12:29:10 2012
@@ -1,1 +1,1 @@
-/branches/10:363103-363104,363107,363156
+/branches/10:363103-363104,363107,363156,364707

Modified: tags/10.4.0-rc3/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.4.0-rc3/.version?view=diff&rev=364762&r1=364761&r2=364762
==============================================================================
--- tags/10.4.0-rc3/.version (original)
+++ tags/10.4.0-rc3/.version Tue May  1 12:29:10 2012
@@ -1,1 +1,1 @@
-10.4.0-rc2
+10.4.0-rc3

Modified: tags/10.4.0-rc3/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/10.4.0-rc3/ChangeLog?view=diff&rev=364762&r1=364761&r2=364762
==============================================================================
--- tags/10.4.0-rc3/ChangeLog (original)
+++ tags/10.4.0-rc3/ChangeLog Tue May  1 12:29:10 2012
@@ -1,3 +1,20 @@
+2012-05-01  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 10.4.0-rc3 Released.
+
+	* channels/chan_sip.c: Revert revision 360862
+
+	Revision 360862 was intended to improve identities sent in dialog-info
+	NOTIFY requests. Some users reported that hint became broken once this
+	was done. It's not clear exactly what part of the patch has caused
+	this regression, but broken hints are bad.
+
+	For now, this revision is being reverted so that the next releases of
+	Asterisk do not have bad behavior in them. The original reported issue
+	will have to be fixed differently in the next version of Asterisk.
+
+	(issue ASTERISK-16735)
+
 2012-04-24  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 10.4.0-rc2 Released.

Modified: tags/10.4.0-rc3/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.4.0-rc3/channels/chan_sip.c?view=diff&rev=364762&r1=364761&r2=364762
==============================================================================
--- tags/10.4.0-rc3/channels/chan_sip.c (original)
+++ tags/10.4.0-rc3/channels/chan_sip.c Tue May  1 12:29:10 2012
@@ -12987,8 +12987,6 @@
 		if ((state & AST_EXTENSION_RINGING) && sip_cfg.notifyringing) {
 			const char *local_display = exten;
 			char *local_target = ast_strdupa(mto);
-			const char *remote_display = exten;
-			char *remote_target = ast_strdupa(mfrom);
 
 			/* There are some limitations to how this works.  The primary one is that the
 			   callee must be dialing the same extension that is being monitored.  Simply dialing
@@ -12998,28 +12996,16 @@
 
 				if ((caller = ast_channel_callback(find_calling_channel, NULL, p, 0))) {
 					char *cid_num;
-					char *connected_num;
 					int need;
 
 					ast_channel_lock(caller);
 					cid_num = S_COR(caller->caller.id.number.valid,
 						caller->caller.id.number.str, "");
 					need = strlen(cid_num) + strlen(p->fromdomain) + sizeof("sip:@");
-					remote_target = alloca(need);
-					snprintf(remote_target, need, "sip:%s@%s", cid_num, p->fromdomain);
-
-					remote_display = ast_strdupa(S_COR(caller->caller.id.name.valid,
+					local_target = alloca(need);
+					snprintf(local_target, need, "sip:%s@%s", cid_num, p->fromdomain);
+					local_display = ast_strdupa(S_COR(caller->caller.id.name.valid,
 						caller->caller.id.name.str, ""));
-
-					connected_num = S_COR(caller->connected.id.number.valid,
-						caller->connected.id.number.str, "");
-					need = strlen(connected_num) + strlen(p->fromdomain) + sizeof("sip:@");
-					local_target = alloca(need);
-					snprintf(local_target, need, "sip:%s@%s", connected_num, p->fromdomain);
-
-					local_display = ast_strdupa(S_COR(caller->connected.id.name.valid,
-						caller->connected.id.name.str, ""));
-
 					ast_channel_unlock(caller);
 					caller = ast_channel_unref(caller);
 				}
@@ -13041,10 +13027,10 @@
 						"<target uri=\"%s\"/>\n"
 						"</remote>\n"
 						"<local>\n"
-						"<identity display=\"%s\">%s</identity>\n"
+						"<identity>%s</identity>\n"
 						"<target uri=\"%s\"/>\n"
 						"</local>\n",
-						remote_display, remote_target, remote_target, local_display, local_target, local_target);
+						local_display, local_target, local_target, mto, mto);
 			} else {
 				ast_str_append(tmp, 0, "<dialog id=\"%s\" direction=\"recipient\">\n", exten);
 			}