[sr-dev] git:master:5f5ac84b: Merge branch 'master' of https://github.com/kamailio/kamailio

[Olle E. Johansson]

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

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date: 2015-10-02T13:34:40+03:00

Merge branch 'master' of https://github.com/kamailio/kamailio

Sorry...

* 'master' of https://github.com/kamailio/kamailio:
  dialog: avoid useless re-entrant locking when linking the new dialog

---

Modified: modules/dialog/dlg_handlers.c

---

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

---

diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c
index 123330b..ef7a336 100644
--- a/modules/dialog/dlg_handlers.c
+++ b/modules/dialog/dlg_handlers.c
@@ -847,7 +847,7 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs)
 	dlg->vars = get_local_varlist_pointer(req, 1);
 
 	/* after dlg_search() slot was kept locked */
-	link_dlg(dlg, 0, 0);
+	link_dlg(dlg, 0, 1);
 	/* unlock after dlg_search() */
 	dlg_hash_release(&callid);