[sr-dev] git:4.4:4d49b33b: tsilo: coherent locking in ts_append

Module: kamailio Branch: 4.4 Commit: 4d49b33b6f2418329b4ede1e166239bb0d93af9e URL: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… Author: Federico Cabiddu &lt;federico.cabiddu(a)gmail.com&gt; Committer: Federico Cabiddu &lt;federico.cabiddu(a)gmail.com&gt; Date: 2017-07-24T15:19:32+02:00 tsilo: coherent locking in ts_append (cherry picked from commit 34265457e7c09b56dec295b753fd8250ef8b0c41) --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… Patch: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index b0c605a0ee..b5c51393e5 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -46,32 +46,31 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int res; int appended; - - lock_entry_by_ruri(ruri); - + if (use_domain) { t_uri = ruri; } else { if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); return -1; } t_uri = &p_uri.user; } + lock_entry_by_ruri(t_uri); + res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); + LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + unlock_entry_by_ruri(t_uri); return -1; } ptr = _r->transactions; while(ptr) { - LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); + LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) @@ -79,7 +78,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { ptr = ptr->next; } - unlock_entry_by_ruri(ruri); + unlock_entry_by_ruri(t_uri); return 1; }