[asterisk-commits] tilghman: trunk r94768 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Dec 24 13:43:36 2007
New Revision: 94768

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

........
r94767 | tilghman | 2007-12-24 13:36:59 -0600 (Mon, 24 Dec 2007) | 5 lines

Race: we need to wait to queue a NewChannel event until after the channel is
inserted into the channel list.  The reason is because some manager users
immediately queue requests from the channel when they see that event and are
confused when Asterisk reports no such channel. (Closes issue #11632)

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=94768&r1=94767&r2=94768
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Dec 24 13:43:36 2007
@@ -728,27 +728,6 @@
 		ast_string_field_build_va(tmp, name, name_fmt, ap1, ap2);
 		va_end(ap1);
 		va_end(ap2);
-
-		/* and now, since the channel structure is built, and has its name, let's call the
-		 * manager event generator with this Newchannel event. This is the 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!
-		 */
-		manager_event(EVENT_FLAG_CALL, "Newchannel",
-			      "Channel: %s\r\n"
-			      "ChannelState: %d\r\n"
-			      "ChannelStateDesc: %s\r\n"
-			      "CallerIDNum: %s\r\n"
-			      "CallerIDName: %s\r\n"
-			      "AccountCode: %s\r\n"
-			      "Uniqueid: %s\r\n",
-			      tmp->name, 
-				state, 
-			      ast_state2str(state),
-			      S_OR(cid_num, ""),
-			      S_OR(cid_name, ""),
-			      tmp->accountcode,
-			      tmp->uniqueid);
 	}
 
 	/* Reminder for the future: under what conditions do we NOT want to track cdrs on channels? */
@@ -794,6 +773,30 @@
 	AST_RWLIST_WRLOCK(&channels);
 	AST_RWLIST_INSERT_HEAD(&channels, tmp, chan_list);
 	AST_RWLIST_UNLOCK(&channels);
+
+	/*\!note
+	 * and now, since the channel structure is built, and has its name, let's
+	 * call the manager event generator with this Newchannel event. This is the
+	 * 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_strlen_zero(name_fmt)) {
+		manager_event(EVENT_FLAG_CALL, "Newchannel",
+			"Channel: %s\r\n"
+			"ChannelState: %d\r\n"
+			"ChannelStateDesc: %s\r\n"
+			"CallerIDNum: %s\r\n"
+			"CallerIDName: %s\r\n"
+			"AccountCode: %s\r\n"
+			"Uniqueid: %s\r\n",
+			tmp->name, 
+			state, 
+			ast_state2str(state),
+			S_OR(cid_num, ""),
+			S_OR(cid_name, ""),
+			tmp->accountcode,
+			tmp->uniqueid);
+	}
 
 	return tmp;
 }