[asterisk-commits] bbryant: branch 1.6.2 r289095 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Tue Sep 28 13:14:19 2010
New Revision: 289095

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289095
Log:
Merged revisions 289094 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r289094 | bbryant | 2010-09-28 14:10:19 -0400 (Tue, 28 Sep 2010) | 14 lines
  
  Fixes an issue with the Newchannel AMI event during the Masquerading process.
  
  Fixes an issue with the Newchannel AMI event during the Masquerading process,
  where no Newchannel AMI event was generated for the psuedo channel used during
  the masquerading process.
  
  (closes issue #17987)
  Reported by: RadicAlish
  Patches: 
        newchannel.patch.txt uploaded by RadicAlish (license 1122)
        Tested by: RadicAlish
  
        Review: https://reviewboard.asterisk.org/r/937/
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=289095&r1=289094&r2=289095
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Tue Sep 28 13:14:19 2010
@@ -778,7 +778,7 @@
 	int x;
 	int flags;
 	struct varshead *headp;
-	char *tech = "";
+	char *tech = "", *tech2 = NULL;
 
 	/* If shutting down, don't allocate any new channels */
 	if (shutting_down) {
@@ -883,7 +883,7 @@
 	tmp->cid.cid_num = ast_strdup(cid_num);
 	
 	if (!ast_strlen_zero(name_fmt)) {
-		char *slash;
+		char *slash, *slash2;
 		/* Almost every channel is calling this function, and setting the name via the ast_string_field_build() call.
 		 * And they all use slightly different formats for their name string.
 		 * This means, to set the name here, we have to accept variable args, and call the string_field_build from here.
@@ -894,6 +894,10 @@
 		ast_string_field_build_va(tmp, name, name_fmt, ap1, ap2);
 		tech = ast_strdupa(tmp->name);
 		if ((slash = strchr(tech, '/'))) {
+			if ((slash2 = strchr(slash + 1, '/'))) {
+				tech2 = slash + 1;
+				*slash2 = '\0';
+			}
 			*slash = '\0';
 		}
 	}
@@ -950,7 +954,7 @@
 	 * proper and correct place to make this call, but you sure do have to pass
 	 * a lot of data into this func to do it here!
 	 */
-	if (ast_get_channel_tech(tech)) {
+	if (ast_get_channel_tech(tech) || (tech2 && ast_get_channel_tech(tech2))) {
 		manager_event(EVENT_FLAG_CALL, "Newchannel",
 			"Channel: %s\r\n"
 			"ChannelState: %d\r\n"