sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

by Olle E. Johansson

Hi! A while ago we discussed an event route when a client close a connection so we can remove registrations. Did that ever happen? /O

8 years, 7 months

git:4.3:385d9be8: dialog: don't update dlg vars in db if in deleted state

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 385d9be8ed45f378c52c7d4f1220f517f5605831 URL: https://github.com/kamailio/kamailio/commit/385d9be8ed45f378c52c7d4f1220f51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:53:09+02:00 dialog: don't update dlg vars in db if in deleted state - dlg record and vars are scheduled for deletion (cherry picked from commit 6620fe7b0963ffe0e2c0d4ab7a38e85d1dfd121d) --- Modified: modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/385d9be8ed45f378c52c7d4f1220f51… Patch: https://github.com/kamailio/kamailio/commit/385d9be8ed45f378c52c7d4f1220f51… --- diff --git a/modules/dialog/dlg_db_handler.c b/modules/dialog/dlg_db_handler.c index aaa8ff4..5dddd63 100644 --- a/modules/dialog/dlg_db_handler.c +++ b/modules/dialog/dlg_db_handler.c @@ -711,8 +711,8 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) &sflags_column, &toroute_name_column, &req_uri_column, &xdata_column, &iflags_column }; - if(cell->state<DLG_STATE_EARLY) { - LM_DBG("not storing dlg in db during initial state\n"); + if(cell->state<DLG_STATE_EARLY || cell->state==DLG_STATE_DELETED) { + LM_DBG("not storing dlg in db during initial or deleted states\n"); return 0; }

8 years, 7 months

git:4.3:714d3e32: dialog: updated old comment to reflect current behaviour

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 714d3e329e9c0352da814832e6f86cd0e5fdea39 URL: https://github.com/kamailio/kamailio/commit/714d3e329e9c0352da814832e6f86cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:36:16+02:00 dialog: updated old comment to reflect current behaviour (cherry picked from commit 098849c72a8b651a5757eac3eb3dee6772766d76) --- Modified: modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/714d3e329e9c0352da814832e6f86cd… Patch: https://github.com/kamailio/kamailio/commit/714d3e329e9c0352da814832e6f86cd… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 630b6eb..656833c 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -651,7 +651,7 @@ dlg_cell_t* dlg_get_by_iuid(dlg_iuid_t *diuid) * \param ftag from tag * \param ttag to tag * \param dir direction - * \param mode let hash table slot locked if dialog is not found + * \param mode let hash table slot locked or not * \return dialog structure on success, NULL on failure */ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry,

8 years, 7 months

git:4.3:9083ac32: dialog: release remote profile lock on remove operation

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 9083ac32755565a97421d2b6100bc477c19175f5 URL: https://github.com/kamailio/kamailio/commit/9083ac32755565a97421d2b6100bc47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:32:48+02:00 dialog: release remote profile lock on remove operation (cherry picked from commit 04bd28fffdfed05dda9a8fff41b220a3bb008a17) --- Modified: modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/9083ac32755565a97421d2b6100bc47… Patch: https://github.com/kamailio/kamailio/commit/9083ac32755565a97421d2b6100bc47… --- diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 39dc1df..9a47082 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -394,6 +394,7 @@ int remove_profile(dlg_profile_table_t *profile, str *value, str *puid) lh->next = lh->prev = NULL; if(lh->linker) shm_free(lh->linker); p_entry->content--; + lock_release(&profile->lock ); return 1; } lh = lh->next;

8 years, 7 months

git:4.3:1ec00b13: dialog: completed previous commit for spiral handling

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 1ec00b13bb7069a0a4dba44bac0eb95fd271f9f1 URL: https://github.com/kamailio/kamailio/commit/1ec00b13bb7069a0a4dba44bac0eb95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:32:40+02:00 dialog: completed previous commit for spiral handling (cherry picked from commit b198b390106924df2279d94f28305c25c86b435e) --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/1ec00b13bb7069a0a4dba44bac0eb95… Patch: https://github.com/kamailio/kamailio/commit/1ec00b13bb7069a0a4dba44bac0eb95… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 86f82a7..b93dfaa 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -796,8 +796,10 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) dlg = dlg_search(&callid, &ftag, &ttag, &dir); if(dlg) { if (detect_spirals) { - if (spiral_detected == 1) + if (spiral_detected == 1) { + dlg_hash_release(&callid); return 0; + } if ( dlg->state != DLG_STATE_DELETED ) { LM_DBG("Callid '%.*s' found, must be a spiraled request\n",

8 years, 7 months

git:4.3:39d1b8f8: dialog: keep slot locked when searching for duplicate dialog

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 39d1b8f8eeddef1d796855e8d7ef63569987fb65 URL: https://github.com/kamailio/kamailio/commit/39d1b8f8eeddef1d796855e8d7ef635… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:32:28+02:00 dialog: keep slot locked when searching for duplicate dialog - when attempting to create a new dialog, the function searching to see if it is already one with same attributes keeps the slot locked so is no race in between the return of function and building the new dlg structure - if the dlg is found, release the lock after figuring out it is a spiral or not (cherry picked from commit 9d807d1d8af24c0163d3bb2ae876a87a8b637494) --- Modified: modules/dialog/dlg_handlers.c Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/39d1b8f8eeddef1d796855e8d7ef635… Patch: https://github.com/kamailio/kamailio/commit/39d1b8f8eeddef1d796855e8d7ef635…

8 years, 7 months

git:4:385d9be8: dialog: don't update dlg vars in db if in deleted state

by Daniel-Constantin Mierla

Module: kamailio Branch: 4 Commit: 385d9be8ed45f378c52c7d4f1220f517f5605831 URL: https://github.com/kamailio/kamailio/commit/385d9be8ed45f378c52c7d4f1220f51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:53:09+02:00 dialog: don't update dlg vars in db if in deleted state - dlg record and vars are scheduled for deletion (cherry picked from commit 6620fe7b0963ffe0e2c0d4ab7a38e85d1dfd121d) --- Modified: modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/385d9be8ed45f378c52c7d4f1220f51… Patch: https://github.com/kamailio/kamailio/commit/385d9be8ed45f378c52c7d4f1220f51… --- diff --git a/modules/dialog/dlg_db_handler.c b/modules/dialog/dlg_db_handler.c index aaa8ff4..5dddd63 100644 --- a/modules/dialog/dlg_db_handler.c +++ b/modules/dialog/dlg_db_handler.c @@ -711,8 +711,8 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) &sflags_column, &toroute_name_column, &req_uri_column, &xdata_column, &iflags_column }; - if(cell->state<DLG_STATE_EARLY) { - LM_DBG("not storing dlg in db during initial state\n"); + if(cell->state<DLG_STATE_EARLY || cell->state==DLG_STATE_DELETED) { + LM_DBG("not storing dlg in db during initial or deleted states\n"); return 0; }

8 years, 7 months

git:4:714d3e32: dialog: updated old comment to reflect current behaviour

by Daniel-Constantin Mierla

Module: kamailio Branch: 4 Commit: 714d3e329e9c0352da814832e6f86cd0e5fdea39 URL: https://github.com/kamailio/kamailio/commit/714d3e329e9c0352da814832e6f86cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:36:16+02:00 dialog: updated old comment to reflect current behaviour (cherry picked from commit 098849c72a8b651a5757eac3eb3dee6772766d76) --- Modified: modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/714d3e329e9c0352da814832e6f86cd… Patch: https://github.com/kamailio/kamailio/commit/714d3e329e9c0352da814832e6f86cd… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 630b6eb..656833c 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -651,7 +651,7 @@ dlg_cell_t* dlg_get_by_iuid(dlg_iuid_t *diuid) * \param ftag from tag * \param ttag to tag * \param dir direction - * \param mode let hash table slot locked if dialog is not found + * \param mode let hash table slot locked or not * \return dialog structure on success, NULL on failure */ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry,

8 years, 7 months

git:4:9083ac32: dialog: release remote profile lock on remove operation

by Daniel-Constantin Mierla

Module: kamailio Branch: 4 Commit: 9083ac32755565a97421d2b6100bc477c19175f5 URL: https://github.com/kamailio/kamailio/commit/9083ac32755565a97421d2b6100bc47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:32:48+02:00 dialog: release remote profile lock on remove operation (cherry picked from commit 04bd28fffdfed05dda9a8fff41b220a3bb008a17) --- Modified: modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/9083ac32755565a97421d2b6100bc47… Patch: https://github.com/kamailio/kamailio/commit/9083ac32755565a97421d2b6100bc47… --- diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 39dc1df..9a47082 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -394,6 +394,7 @@ int remove_profile(dlg_profile_table_t *profile, str *value, str *puid) lh->next = lh->prev = NULL; if(lh->linker) shm_free(lh->linker); p_entry->content--; + lock_release(&profile->lock ); return 1; } lh = lh->next;

8 years, 7 months

git:4:1ec00b13: dialog: completed previous commit for spiral handling

by Daniel-Constantin Mierla

Module: kamailio Branch: 4 Commit: 1ec00b13bb7069a0a4dba44bac0eb95fd271f9f1 URL: https://github.com/kamailio/kamailio/commit/1ec00b13bb7069a0a4dba44bac0eb95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T16:32:40+02:00 dialog: completed previous commit for spiral handling (cherry picked from commit b198b390106924df2279d94f28305c25c86b435e) --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/1ec00b13bb7069a0a4dba44bac0eb95… Patch: https://github.com/kamailio/kamailio/commit/1ec00b13bb7069a0a4dba44bac0eb95… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 86f82a7..b93dfaa 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -796,8 +796,10 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) dlg = dlg_search(&callid, &ftag, &ttag, &dir); if(dlg) { if (detect_spirals) { - if (spiral_detected == 1) + if (spiral_detected == 1) { + dlg_hash_release(&callid); return 0; + } if ( dlg->state != DLG_STATE_DELETED ) { LM_DBG("Callid '%.*s' found, must be a spiraled request\n",

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015