[asterisk-commits] mmichelson: branch mmichelson/subscription_abstraction r416634 - /team/mmiche...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jun 18 12:43:34 2014
New Revision: 416634

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416634
Log:
Fix persistence logic on subscription acceptance.


Modified:
    team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c

Modified: team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c?view=diff&rev=416634&r1=416633&r2=416634
==============================================================================
--- team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c (original)
+++ team/mmichelson/subscription_abstraction/res/res_pjsip_pubsub.c Wed Jun 18 12:43:34 2014
@@ -989,7 +989,7 @@
 	return sub->resource;
 }
 
-int ast_sip_subscription_accept(struct ast_sip_subscription *sub, pjsip_rx_data *rdata, int response)
+int sip_subscription_accept(struct ast_sip_subscription *sub, pjsip_rx_data *rdata, int response)
 {
 	/* If this is a persistence recreation the subscription has already been accepted */
 	if (ast_sip_mod_data_get(rdata->endpt_info.mod_data, pubsub_module.id, MOD_DATA_PERSISTENCE)) {
@@ -1337,7 +1337,7 @@
 	} else {
 		sub->persistence = subscription_persistence_create(sub);
 		subscription_persistence_update(sub, rdata);
-		pjsip_evsub_accept(sip_subscription_get_evsub(sub), rdata, resp, NULL);
+		sip_subscription_accept(sub, rdata, resp);
 		handler->notifier->notify_required(sub, AST_SIP_SUBSCRIPTION_NOTIFY_REASON_STARTED);
 	}