[asterisk-commits] dlee: trunk r390472 - /trunk/main/channel_internal_api.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Wed Jun  5 09:47:30 2013
New Revision: 390472

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390472
Log:
Fixed a consistency problem with channel snapshot and endpoint state.

When channels are added to an endpoint, the code originally posted a channel
snapshot to the endoint's topic directly. Turns out, this is a bad idea.

This causes the endpoint to see an inconsistent view of the channel, since it
will later receive in-flight messages with old channel snapshots.

This patch instead just publishes channel state immediately after setting up
the forward to the endpoint's topic. This gives the endpoints a consistent
view of the channel's state.

Modified:
    trunk/main/channel_internal_api.c

Modified: trunk/main/channel_internal_api.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel_internal_api.c?view=diff&rev=390472&r1=390471&r2=390472
==============================================================================
--- trunk/main/channel_internal_api.c (original)
+++ trunk/main/channel_internal_api.c Wed Jun  5 09:47:30 2013
@@ -1409,22 +1409,9 @@
 int ast_endpoint_add_channel(struct ast_endpoint *endpoint,
 	struct ast_channel *chan)
 {
-	RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
-	RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
-
 	ast_assert(chan != NULL);
 	ast_assert(endpoint != NULL);
 
-	snapshot = ast_channel_snapshot_create(chan);
-	if (!snapshot) {
-		return -1;
-	}
-
-	msg = stasis_message_create(ast_channel_snapshot_type(), snapshot);
-	if (!msg) {
-		return -1;
-	}
-
 	chan->endpoint_forward =
 		stasis_forward_all(chan->topic, ast_endpoint_topic(endpoint));
 
@@ -1432,7 +1419,7 @@
 		return -1;
 	}
 
-	stasis_publish(ast_endpoint_topic(endpoint), msg);
+	ast_publish_channel_state(chan);
 
 	return 0;
 }