[asterisk-commits] kmoore: trunk r411671 - in /trunk: ./ res/res_pjsip_pubsub.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Apr  3 07:06:37 2014
New Revision: 411671

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=411671
Log:
res_pjsip_pubsub: Add test event for state change

This adds a test event when subscription state changes so that
integration tests may trigger new actions at the appropriate times.

Review: https://reviewboard.asterisk.org/r/3383/
........

Merged revisions 411670 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_pubsub.c

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

Modified: trunk/res/res_pjsip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_pubsub.c?view=diff&rev=411671&r1=411670&r2=411671
==============================================================================
--- trunk/res/res_pjsip_pubsub.c (original)
+++ trunk/res/res_pjsip_pubsub.c Thu Apr  3 07:06:37 2014
@@ -42,6 +42,7 @@
 #include "asterisk/res_pjsip.h"
 #include "asterisk/callerid.h"
 #include "asterisk/manager.h"
+#include "asterisk/test.h"
 #include "res_pjsip/include/res_pjsip_private.h"
 
 /*** DOCUMENTATION
@@ -464,8 +465,18 @@
 
 int ast_sip_subscription_send_request(struct ast_sip_subscription *sub, pjsip_tx_data *tdata)
 {
-	return pjsip_evsub_send_request(ast_sip_subscription_get_evsub(sub),
+	struct ast_sip_endpoint *endpoint = ast_sip_subscription_get_endpoint(sub);
+	int res = pjsip_evsub_send_request(ast_sip_subscription_get_evsub(sub),
 			tdata) == PJ_SUCCESS ? 0 : -1;
+	
+	ast_test_suite_event_notify("SUBSCRIPTION_STATE_SET",
+		"StateText: %s\r\n"
+		"Endpoint: %s\r\n",
+		pjsip_evsub_get_state_name(ast_sip_subscription_get_evsub(sub)),
+		ast_sorcery_object_get_id(endpoint));
+	
+	ao2_cleanup(endpoint);
+	return res;
 }
 
 static void subscription_datastore_destroy(void *obj)