sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
197 discussions

[kamailio/kamailio] core: added more flexible processing for nonsip_hook messages (#731)

by Alexandr Dubovikov

preparing for TCP, UDP hep processing over nonsip_hook. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/731 -- Commit Summary -- * core: added more flexible processing for nonsip_hook messages -- File Changes -- M parser/parse_fline.c (2) M receive.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/731.patch https://github.com/kamailio/kamailio/pull/731.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/731

7 years, 8 months

git:master:b7c588df: tm: store last received response code before running onreply_route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7c588dff06030a82f305b210573be5bbc961cec URL: https://github.com/kamailio/kamailio/commit/b7c588dff06030a82f305b210573be5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-07T15:56:45+02:00 tm: store last received response code before running onreply_route - otherwise an innapropriate cancel can happen if the current branch got before an 1xx response, and the script writer enforces another reply code with t_reply() - reported by Thomas Sevestre, GH#315 --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/b7c588dff06030a82f305b210573be5… Patch: https://github.com/kamailio/kamailio/commit/b7c588dff06030a82f305b210573be5… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index b2e6e53..8da3205 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2286,10 +2286,21 @@ int reply_received( struct sip_msg *p_msg ) backup_xavps = xavp_set_list(&t->xavps_list); #endif setbflagsval(0, uac->branch_flags); + if(msg_status>last_uac_status) { + /* current response (msg) status is higher that the last received + * on the same branch - set it temporarily so functions in onreply_route + * can access it (e.g., avoid sending CANCEL by forcing another t_relply() + * in onreply_route when a negative sip response was received) */ + uac->last_received = msg_status; + } + /* Pre- and post-script callbacks have already * been executed by the core. (Miklos) */ run_top_route(onreply_rt.rlist[onreply_route], p_msg, &ctx); + + /* restore brach last_received as before executing onreply_route */ + uac->last_received = last_uac_status; /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; getbflagsval(0, &uac->branch_flags);

7 years, 8 months

git:master:5ef8fa84: Merge pull request #730 from athonet-open/fix_DB_scscf

by GitHub

Module: kamailio Branch: master Commit: 5ef8fa840cb974014880b7c398f8eca6abdcf912 URL: https://github.com/kamailio/kamailio/commit/5ef8fa840cb974014880b7c398f8eca… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-02T14:45:07+02:00 Merge pull request #730 from athonet-open/fix_DB_scscf Improvements on DB handling on S-CSCF usrloc --- Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/usrloc.h Modified: modules/ims_usrloc_scscf/usrloc_db.c Modified: modules/ims_usrloc_scscf/usrloc_db.h --- Diff: https://github.com/kamailio/kamailio/commit/5ef8fa840cb974014880b7c398f8eca… Patch: https://github.com/kamailio/kamailio/commit/5ef8fa840cb974014880b7c398f8eca…

7 years, 8 months

git:master:a449ce80: ims_usrloc_scscf: Print contact state as string

by Federico Favaro

Module: kamailio Branch: master Commit: a449ce8016427f3944455a11e7b02f5ff784a62f URL: https://github.com/kamailio/kamailio/commit/a449ce8016427f3944455a11e7b02f5… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <federico(a)aereo.lan.athonet.com> Date: 2016-08-01T17:39:20+02:00 ims_usrloc_scscf: Print contact state as string Add helper function to print the state of the contact as string --- Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/usrloc.h Modified: modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/a449ce8016427f3944455a11e7b02f5… Patch: https://github.com/kamailio/kamailio/commit/a449ce8016427f3944455a11e7b02f5…

7 years, 8 months

git:master:3438dbe5: ims_usrloc_scscf: Double check contact refs on DB

by Federico Favaro

Module: kamailio Branch: master Commit: 3438dbe5e5149d23c40ba17e1c47f6b9708ac352 URL: https://github.com/kamailio/kamailio/commit/3438dbe5e5149d23c40ba17e1c47f6b… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <federico(a)aereo.lan.athonet.com> Date: 2016-08-01T14:50:39+02:00 ims_usrloc_scscf: Double check contact refs on DB If the contact is on state CONTACT_DELAYED_DELETE and still has refs > 0 in memory, it could be that it failed to acquire a lock to de-ref the contact. This brings to a leak on the contact DB because the contact will always have refs > 0 and no actual refs on DB. Now, as a fallback, we actually checks on DB the real number of refs of the contact. If this refs is 0, force the number of refs in the record to 0 and mark the contact for deletion. --- Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/usrloc_db.c Modified: modules/ims_usrloc_scscf/usrloc_db.h --- Diff: https://github.com/kamailio/kamailio/commit/3438dbe5e5149d23c40ba17e1c47f6b… Patch: https://github.com/kamailio/kamailio/commit/3438dbe5e5149d23c40ba17e1c47f6b…

7 years, 8 months

git:master:036a77d4: ims_usrloc_scscf: Remove all unlinked contacts

by Federico Favaro

Module: kamailio Branch: master Commit: 036a77d464820f5edd1412be2b0f089ef26fba04 URL: https://github.com/kamailio/kamailio/commit/036a77d464820f5edd1412be2b0f089… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <federico(a)aereo.lan.athonet.com> Date: 2016-08-01T14:29:18+02:00 ims_usrloc_scscf: Remove all unlinked contacts At startup, if IMPU table is empty, it means that all the contacts stored on contact table are "unlinked". Remove them as they are unuseful --- Modified: modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/036a77d464820f5edd1412be2b0f089… Patch: https://github.com/kamailio/kamailio/commit/036a77d464820f5edd1412be2b0f089… --- diff --git a/modules/ims_usrloc_scscf/usrloc_db.c b/modules/ims_usrloc_scscf/usrloc_db.c index 5f428c2..94e870c 100644 --- a/modules/ims_usrloc_scscf/usrloc_db.c +++ b/modules/ims_usrloc_scscf/usrloc_db.c @@ -75,6 +75,9 @@ int impu_subscriber_insert_query_len; char* impu_subscriber_delete_query = "DELETE impu_subscriber FROM impu_subscriber INNER JOIN impu on impu_subscriber.impu_id=impu.id INNER JOIN subscriber on impu_subscriber.subscriber_id=subscriber.id WHERE impu.impu='%.*s' AND subscriber.event='%.*s' and subscriber.watcher_contact='%.*s' and subscriber.presentity_uri='%.*s'"; int impu_subscriber_delete_query_len; +char* delete_unlinked_contact_query = "DELETE from contact"; +int delete_unlinked_contact_query_len; + extern db1_con_t* ul_dbh; @@ -651,6 +654,32 @@ static inline int dbrow2subscriber(db_val_t* val, subscriber_data_t* subscriber_ return 0; } +int delete_all_unlinked_contacts() { + int len; + db1_res_t* rs; + + len = strlen(delete_unlinked_contact_query) +1; + if (!query_buffer_len || query_buffer_len < len) { + if (query_buffer.s) { + pkg_free(query_buffer.s); + } + query_buffer.s = (char*) pkg_malloc(len); + if (!query_buffer.s) { + LM_ERR("no more pkg mem\n"); + return -1; + } + query_buffer_len = len; + } + snprintf(query_buffer.s,query_buffer_len,delete_unlinked_contact_query); + query_buffer.len = strlen(query_buffer.s); + + if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) { + return -1; + } + ul_dbf.free_result(ul_dbh,rs); + return 0; +} + int preload_udomain(db1_con_t* _c, udomain_t* _d) { db_key_t col[9]; db_row_t* row; @@ -717,9 +746,12 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) { } if (RES_ROW_N(rs) == 0) { - LM_DBG("table is empty\n"); - ul_dbf.free_result(_c, rs); - return 0; + LM_DBG("IMPU table is empty, removing all unlinked contacts \n"); + ul_dbf.free_result(_c, rs); + if (delete_all_unlinked_contacts() != 0) { + LM_ERR("Not able to delete unlinked contacts\n"); + } + return 0; } LM_DBG("preloading S-CSCF usrloc...\n");

7 years, 8 months

[kamailio/kamailio] Improvements on DB handling on S-CSCF usrloc (#730)

by Federico Favaro

Some improvements on the handling of contacts on S-CSCF database, namely * Clean the contact table at startup if impu_contact table is empty * if the contact is in state DELAYED_DELETE but still has ref_count > 0 in memory, it could mean that it has not been decremented before due to a failure to get a lock. This way we are leaking a contact on the DB and in memory. When the contact is expired and in DELAYED_DELETE, we do a query to check if it is really still referenced on impu_contact table. If not, we mark contact for deletion. * Add an helper function to print the actual state of a contact instead of the index of the enum You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/730 -- Commit Summary -- * ims_usrloc_scscf: Remove all unlinked contacts * ims_usrloc_scscf: Double check contact refs on DB * ims_usrloc_scscf: Print contact state as string -- File Changes -- M modules/ims_usrloc_scscf/udomain.c (26) M modules/ims_usrloc_scscf/usrloc.h (17) M modules/ims_usrloc_scscf/usrloc_db.c (72) M modules/ims_usrloc_scscf/usrloc_db.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/730.patch https://github.com/kamailio/kamailio/pull/730.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/730

7 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2016