[sr-dev] git:master:1b56c964: Merge pull request #1163 from snen/presence_subcribe_delete_error

[GitHub]

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

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: GitHub <noreply at github.com>
Date: 2017-06-23T19:12:38+02:00

Merge pull request #1163 from snen/presence_subcribe_delete_error

presence: subsription double delete fix

---

Modified: src/modules/presence/notify.c

---

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

---

diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c
index e5cd1cdf42..63307c7e2e 100644
--- a/src/modules/presence/notify.c
+++ b/src/modules/presence/notify.c
@@ -1847,7 +1847,7 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps)
 
         if(ps->code == 404
 	   || ps->code == 481
-	   || (ps->code == 408 && timeout_rm_subs)
+	   || (ps->code == 408 && timeout_rm_subs && subs->status != TERMINATED_STATUS)
 	   || pres_get_delete_sub()) {
 		delete_subs(&subs->pres_uri, &subs->event->name,
 				&subs->to_tag, &subs->from_tag, &subs->callid);