[sr-dev] git:master:b926e403: Merge pull request #1031 from kamailio/lazedo-patch-1

[GitHub]

Module: kamailio
Branch: master
Commit: b926e403f1709d0fc15f1dc8991f4369d57586ed
URL: https://github.com/kamailio/kamailio/commit/b926e403f1709d0fc15f1dc8991f4369d57586ed

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: GitHub <noreply at github.com>
Date: 2017-03-14T20:14:40+01:00

Merge pull request #1031 from kamailio/lazedo-patch-1

presence : fix fast_notify usage

---

Modified: src/modules/presence/subscribe.c

---

Diff:  https://github.com/kamailio/kamailio/commit/b926e403f1709d0fc15f1dc8991f4369d57586ed.diff
Patch: https://github.com/kamailio/kamailio/commit/b926e403f1709d0fc15f1dc8991f4369d57586ed.patch

---

diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c
index e8c9cea..8dab786 100644
--- a/src/modules/presence/subscribe.c
+++ b/src/modules/presence/subscribe.c
@@ -1114,7 +1114,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain)
 		goto error;
 	}
 
-	if (pres_notifier_processes > 0 && pa_dbf.start_transaction)
+	if (pres_notifier_processes > 0 && !send_fast_notify && pa_dbf.start_transaction)
 	{
 		if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0)
 		{
@@ -1241,7 +1241,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain)
 	LM_DBG("subscription status= %s - %s\n", get_status_str(subs.status),
 			(found==0)?"inserted":"found in watcher table");
 
-	if (pres_notifier_processes > 0)
+	if (pres_notifier_processes > 0 && !send_fast_notify)
 	{
 		if (update_subscription_notifier(msg, &subs, to_tag_gen,
 					&sent_reply) < 0)
@@ -1255,7 +1255,8 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain)
 		LM_ERR("in update_subscription\n");
 		goto error;
 	}
-	if (pres_notifier_processes > 0 && pa_dbf.end_transaction)
+
+	if (pres_notifier_processes > 0 && !send_fast_notify && pa_dbf.end_transaction)
 	{
 		if (pa_dbf.end_transaction(pa_db) < 0)
 		{