sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

Fix for tsilo at shutdown
by Daniel-Constantin Mierla 01 Mar '16

01 Mar '16

Hi Federico, I did a fix for tsilo to avoid a dead lock at shutdown: - https://github.com/kamailio/kamailio/commit/81ec422227299b4cbd7aecbb58b862f… Practically, when restarting kamailio it ended up in a deadlock as shown by the next backtrace. The annoying result was that restarts takes long, as there is a 10sec timeout for the cleanup, which was always happening in this case. Can you check and see if the commit looks good and doesn't introduce other issues that you could eventually spot easier? Cheers, Daniel (gdb) bt #0 lock_entry (entry=0x1) at ts_hash.c:156 #1 0x00007f1ec20d78c2 in ts_onreply (t=0x1, type=1109756376, param=0x0) at ts_handlers.c:87 #2 0x00007f1eca5f03e7 in run_trans_callbacks_internal (cb_lst=<optimized out>, type=131072, trans=0x7f1e427a2c80, params=params@entry=0x7ffe21bdbf20) at t_hooks.c:268 #3 0x00007f1eca5f069e in run_trans_callbacks (type=<optimized out>, trans=<optimized out>, req=<optimized out>, rpl=<optimized out>, code=<optimized out>) at t_hooks.c:295 #4 0x00007f1eca574f82 in free_cell_helper (dead_cell=0x7f1e427a2c80, fname=0x7f1e4172d0a8 "", fline=1) at h_table.c:136 #5 0x00007f1eca577754 in free_hash_table () at h_table.c:440 #6 0x00007f1eca5e6e01 in tm_shutdown () at t_funcs.c:90 #7 0x0000000000509222 in destroy_modules () at sr_module.c:805 #8 0x00000000004ff5e9 in cleanup (show_status=1) at main.c:513 #9 0x0000000000500578 in shutdown_children (show_status=1, sig=<optimized out>) at main.c:655 #10 0x0000000000500dea in handle_sigs () at main.c:685 #11 0x0000000000506b1e in main_loop () at main.c:1705 #12 0x000000000041cb9d in main (argc=0, argv=0x20) at main.c:2553 -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, March 7-9, 2016 - http://www.asipto.com

1 0

git: new commits in branch 4.3
by Daniel-Constantin Mierla 01 Mar '16

01 Mar '16

- URL: https://github.com/kamailio/kamailio/commit/e669e05e9558a6d0dcc8dc1c36246b6… Author: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Date: 2016-03-01T12:53:05+01:00 modules/dialog: Add RR parameter on sequential requests (cherry picked from commit de4ad807334c2b74cafec733a0029e3e2ef4996c) - URL: https://github.com/kamailio/kamailio/commit/d4647dfdf6c8be1ff675bfd8583af56… Author: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Date: 2016-03-01T12:53:33+01:00 modules/uac: Add RR parameter on sequential requests when using uac_replace_from/to (cherry picked from commit f6a5a28532ff410d03d10e86d43d38a785d0fab2) - URL: https://github.com/kamailio/kamailio/commit/ac2a7c71696f6da1f99149120bdb97f… Author: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Date: 2016-03-01T12:53:48+01:00 modules/dialog: Error in last commit. goto invalid destination (cherry picked from commit 18644f93e100a2e4ec545ad5e42aa84d90283f75) - URL: https://github.com/kamailio/kamailio/commit/8e27522f4f984301a0807384509f163… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T12:54:16+01:00 uac: increase the buffer for within dialog rr param - following the previous commit (cherry picked from commit 2702629194351069827564243e1cff7e4b0513d9) - URL: https://github.com/kamailio/kamailio/commit/ecd373613672f339ef7179a33f069d1… Author: Andrey Utkin <andrey.od.utkin(a)gmail.com> Date: 2016-03-01T12:58:01+01:00 modules/websocket: ensure linkage to libcrypto Fixes linkage for Ubuntu Wily (15.10). The issue manifests itself as "undefined symbol: SHA1" error at module loading. (cherry picked from commit 432c1e3b0f7ff6a9fa11e6d8ed8b897dc3f9246f) - URL: https://github.com/kamailio/kamailio/commit/e9012b5d3d0bbc79d9070b815992398… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T12:59:08+01:00 websocket: fixed Makefile after previous commit - whitespace required after ifneq (cherry picked from commit e0f7a0c678b37c44312369dd90ffdc531782bb99) - URL: https://github.com/kamailio/kamailio/commit/df1f50903cd3ec4b048294801aca1e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T12:59:48+01:00 dispatcher: set sock_avp parameter in example (cherry picked from commit 2809c1eee5d74840ad1974eab09950f2aba3ad31) - URL: https://github.com/kamailio/kamailio/commit/1e2befef453b392f6099efaa47f3abf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:00:28+01:00 dmq_usrloc: lock before adding contact - reported by GH #440 (cherry picked from commit 5937b04a98204fc70ce6db2eab08c038a3497c2a) - URL: https://github.com/kamailio/kamailio/commit/a7852fc1eadd92583bba65aeaa08632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:00:56+01:00 matrix: added section ids for params and functions in docs (cherry picked from commit a72e8451aef9391229000cb4e13020f0ff722d92) - URL: https://github.com/kamailio/kamailio/commit/605af142aa89ddf39c5bef47aacd7dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:01:13+01:00 matrix: updates for application name (cherry picked from commit b51f7822b3e48a18611bed1aaaac5674757f8e33) - URL: https://github.com/kamailio/kamailio/commit/6e470dad71312155d1c9e5143813dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:06:18+01:00 tls: more details about tls.cfg reload (cherry picked from commit 59ce55977e91c399b86177060421d32dbbd7be06) - URL: https://github.com/kamailio/kamailio/commit/4988ab12516157966c1f5b20e294b8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:07:56+01:00 tsilo: remove inline from free_ts_transaction() definition - the prototype is without, resulting in compile warning (cherry picked from commit 311ac224b589328047fdddf7e4eb4165af501707) - URL: https://github.com/kamailio/kamailio/commit/0b6bf40689fd066eab4c29da4b92aad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:09:55+01:00 core: docbook - defined kamcmd entity (cherry picked from commit d5e57d353b2c962902d786ef081ccf06d6a9854e) - URL: https://github.com/kamailio/kamailio/commit/2492b7f88671506ececb2329e5cbe90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:12:58+01:00 core: Makefile.defs - renamed var CPU to CPUTYPE - some operating systems (e.g., suse), sets the CPU in the environment to the cpu architecture, while the makefile uses it for cpu type provided to -mtune parameter of gcc (cherry picked from commit fe37c011810d563f8a7e7d1e6856d7199dd1f5d2) - URL: https://github.com/kamailio/kamailio/commit/7dc2abd7c93623b300d8d776891532f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:15:55+01:00 tls: debug messages for mutex ops with lock function (cherry picked from commit dcfd5012c0fe10c2697ceeaf5b09d24e1ae8719e) - URL: https://github.com/kamailio/kamailio/commit/d137e228044536a52e377e7af8a6c51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T13:16:10+01:00 registrar: send 400 if the reg-id value is invalid - reported by GH #497 (cherry picked from commit f39d144e385f1fbf8759ba03e28e69aeb56d6e6a) - URL: https://github.com/kamailio/kamailio/commit/b72f8e045f5cb27ebc94f0e238dd908… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-03-01T13:17:50+01:00 modules/sdpops: reimplement sdp_remove_line_by_prefix() to fix shortcomings - single line match was not removed - multiline match with non-related lines between was not removed (cherry picked from commit 5db4cec2c9e8ab62c711738eae181afa69c1724d) - URL: https://github.com/kamailio/kamailio/commit/ac9b57a38bf957d5d507f1205de6268… Author: Maksym Sobolyev <sobomax(a)sippysoft.com> Date: 2016-03-01T13:18:06+01:00 Fix IPv6 handling with the default setup. With the current code, it's possible for it to pit IPv6 address, but set adress family to the IP4. (cherry picked from commit 6af319ea9307feb840c9f318954c49c3eac8bbe1)

1 0

git:master:380ef86b: core: coherent indentation and spacing
by Daniel-Constantin Mierla 01 Mar '16

01 Mar '16

Module: kamailio Branch: master Commit: 380ef86b5aea7cca5c2460cb2b248c7722a125a6 URL: https://github.com/kamailio/kamailio/commit/380ef86b5aea7cca5c2460cb2b248c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T11:45:05+01:00 core: coherent indentation and spacing --- Modified: sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/380ef86b5aea7cca5c2460cb2b248c7… Patch: https://github.com/kamailio/kamailio/commit/380ef86b5aea7cca5c2460cb2b248c7…

1 0

git:master:81ec4222: tsilo: don't execute tm callback for TMCB_DESTROY if server shutdowns
by Daniel-Constantin Mierla 01 Mar '16

01 Mar '16

Module: kamailio Branch: master Commit: 81ec422227299b4cbd7aecbb58b862fc67208b30 URL: https://github.com/kamailio/kamailio/commit/81ec422227299b4cbd7aecbb58b862f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T11:38:11+01:00 tsilo: don't execute tm callback for TMCB_DESTROY if server shutdowns - tsilo mod_destroy will clean up, otherwise may end up in deadlock at shutdown, when a slot lock is already aquired and the callback will try to aquire again --- Modified: modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/81ec422227299b4cbd7aecbb58b862f… Patch: https://github.com/kamailio/kamailio/commit/81ec422227299b4cbd7aecbb58b862f… --- diff --git a/modules/tsilo/ts_handlers.c b/modules/tsilo/ts_handlers.c index 392c71a..ad0b0cb 100644 --- a/modules/tsilo/ts_handlers.c +++ b/modules/tsilo/ts_handlers.c @@ -21,6 +21,8 @@ #include <string.h> +#include "../../sr_module.h" + #include "ts_hash.h" #include "ts_handlers.h" @@ -63,6 +65,7 @@ void ts_onreply(struct cell* t, int type, struct tmcb_params *param) ts_transaction_t *cb_ptr, *ptr; if(t_table==0) return; + if((type & (TMCB_DESTROY)) && destroy_modules_phase()) return; cb_ptr = (ts_transaction_t*)(*param->param); if (cb_ptr == NULL) {

1 0

git:master:87027c65: core: option to check if server is in destroy modules phase
by Daniel-Constantin Mierla 01 Mar '16

01 Mar '16

Module: kamailio Branch: master Commit: 87027c654d9381f79c305b18f33919b8c9a86b89 URL: https://github.com/kamailio/kamailio/commit/87027c654d9381f79c305b18f33919b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-01T11:38:10+01:00 core: option to check if server is in destroy modules phase --- Modified: sr_module.c Modified: sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/87027c654d9381f79c305b18f33919b… Patch: https://github.com/kamailio/kamailio/commit/87027c654d9381f79c305b18f33919b… --- diff --git a/sr_module.c b/sr_module.c index 6ddbd00..24a3ea3 100644 --- a/sr_module.c +++ b/sr_module.c @@ -109,6 +109,17 @@ unsigned int set_modinit_delay(unsigned int v) return r; } +/* keep state if server is in destroy modules phase */ +static int _sr_destroy_modules_phase = 0; + +/** + * return destroy modules phase state + */ +int destroy_modules_phase(void) +{ + return _sr_destroy_modules_phase; +} + /** * if bit 1 set, SIP worker processes handle RPC commands as well * if bit 2 set, RPC worker processes handle SIP commands as well @@ -791,6 +802,7 @@ void destroy_modules() { struct sr_module* t, *foo; + _sr_destroy_modules_phase = 1; /* call first destroy function from each module */ t=modules; while(t) { diff --git a/sr_module.h b/sr_module.h index b20cd63..6eb42fb 100644 --- a/sr_module.h +++ b/sr_module.h @@ -654,5 +654,6 @@ int is_sip_worker(int rank); int is_rpc_worker(int rank); unsigned int set_modinit_delay(unsigned int v); +int destroy_modules_phase(void); #endif /* sr_module_h */

1 0

RFC: Kamailio 5.0
by Daniel-Constantin Mierla 01 Mar '16

01 Mar '16

Hello, at Fosdem and other events this year, while meeting many of Kamailio devs, the topic of what's next for Kamailio came into discussions, with suggestions that after 4.4 it may be time for some major leap to 5.0. I created a page where I collected the main ideas put on table so far - rather unpolished draft, but eventually a good starting point: * https://www.kamailio.org/wiki/devel/kamailio-5.0-design Everyone is invited to add suggestions to the wiki page and/or discuss here on mailing lists, what should be there in 5.0, what is good (to keep) or bad (to remove) with current version, what is missing and it is "must have", ... Not to have a single long tread, for each new idea, start a new email thread with subject prefixed by Kamailio 5.0. I think this impacts users, not only devs, and their contribution is useful as well, so it should be fine to discuss the ideas/concepts on sr-users. When it gets to real implementation discussions, then it can be on sr-dev. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, March 7-9, 2016 - http://www.asipto.com

1 0

git:master:39274869: modules/ims_usrloc_scscf: new mod param contact_delete_delay
by Richard Good 01 Mar '16

01 Mar '16

Module: kamailio Branch: master Commit: 392748691a7ca1ce11b48c8da4b52e26d34761ee URL: https://github.com/kamailio/kamailio/commit/392748691a7ca1ce11b48c8da4b52e2… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-03-01T10:17:40+02:00 modules/ims_usrloc_scscf: new mod param contact_delete_delay contact_delete_delay: length of time to delay before deleting contact in state delay delete --- Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/ul_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/392748691a7ca1ce11b48c8da4b52e2… Patch: https://github.com/kamailio/kamailio/commit/392748691a7ca1ce11b48c8da4b52e2… --- diff --git a/modules/ims_usrloc_scscf/udomain.c b/modules/ims_usrloc_scscf/udomain.c index 94d71da..5ef9ecc 100644 --- a/modules/ims_usrloc_scscf/udomain.c +++ b/modules/ims_usrloc_scscf/udomain.c @@ -77,6 +77,8 @@ struct contact_list* contact_list; struct ims_subscription_list* ims_subscription_list; extern int subs_hash_size; +extern int contact_delete_delay; + /*! * \brief Create a new domain structure * \param _n is pointer to str representing name of the domain, the string is @@ -830,6 +832,7 @@ void unref_contact_unsafe(ucontact_t* c) { LM_WARN("reference dropped below zero... this should not happen\n"); } c->state = CONTACT_DELAYED_DELETE; + c->expires = time(NULL) + contact_delete_delay; // delete_scontact(c); } } diff --git a/modules/ims_usrloc_scscf/ul_mod.c b/modules/ims_usrloc_scscf/ul_mod.c index 6d86f9c..35cc307 100644 --- a/modules/ims_usrloc_scscf/ul_mod.c +++ b/modules/ims_usrloc_scscf/ul_mod.c @@ -119,6 +119,8 @@ struct dlg_binds dlgb; int sub_dialog_hash_size = 9; shtable_t sub_dialog_table; +int contact_delete_delay = 30; //If contact is put into delay delete state this is how long we delay before deleting + new_shtable_t pres_new_shtable; insert_shtable_t pres_insert_shtable; search_shtable_t pres_search_shtable; @@ -149,6 +151,7 @@ static param_export_t params[] = { {"subs_hash_size", INT_PARAM, &subs_hash_size }, {"contacts_hash_size", INT_PARAM, &contacts_hash_size }, {"nat_bflag", INT_PARAM, &nat_bflag }, + {"contact_delete_delay", INT_PARAM, &contact_delete_delay }, {"usrloc_debug_file", PARAM_STR, &usrloc_debug_file}, {"enable_debug_file", INT_PARAM, &usrloc_debug}, {"user_data_dtd", PARAM_STRING, &scscf_user_data_dtd},

1 0

git:master:56ab4065: modules/ims_qos: modified log line to be ERROR
by Richard Good 01 Mar '16

01 Mar '16

Module: kamailio Branch: master Commit: 56ab4065e6d2bcd9016d698548a6725a591eb736 URL: https://github.com/kamailio/kamailio/commit/56ab4065e6d2bcd9016d698548a6725… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-03-01T10:17:17+02:00 modules/ims_qos: modified log line to be ERROR --- Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56ab4065e6d2bcd9016d698548a6725… Patch: https://github.com/kamailio/kamailio/commit/56ab4065e6d2bcd9016d698548a6725… --- diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index c330afe..e1b39f4 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -763,7 +763,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int LM_DBG("originating direction\n"); uri = cscf_get_asserted_identity(t->uas.request, 1); if (uri.len == 0) { - LM_DBG("No P-Asserted-Identity hdr found in request. Using From hdr in req"); + LM_ERR("No P-Asserted-Identity hdr found in request. Using From hdr in req - we shouldn't have to do this"); if (!cscf_get_from_uri(t->uas.request, &uri)) { LM_ERR("Error assigning P-Asserted-Identity using From hdr in req"); @@ -787,7 +787,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int //getting called asserted identity uri = cscf_get_public_identity_from_called_party_id(t->uas.request, &h); if (uri.len == 0) { - LM_DBG("No P-Called-Party hdr found in response. Using req URI from dlg"); + LM_ERR("No P-Called-Party hdr found in response. Using req URI from dlg - we shouldn't have to do this"); //get dialog and get the req URI from there dlg = dlgb.get_dlg(msg); if (!dlg) {

1 0

git:master:8f1831a0: modules/ims_charging: added additional log line
by Richard Good 01 Mar '16

01 Mar '16

Module: kamailio Branch: master Commit: 8f1831a0245c301a9d0e3c6cee64fd3f6f38162e URL: https://github.com/kamailio/kamailio/commit/8f1831a0245c301a9d0e3c6cee64fd3… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-03-01T10:16:57+02:00 modules/ims_charging: added additional log line --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/8f1831a0245c301a9d0e3c6cee64fd3… Patch: https://github.com/kamailio/kamailio/commit/8f1831a0245c301a9d0e3c6cee64fd3… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index bbb8c07..ff9e7e2 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -1300,6 +1300,8 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, create_cca_result_code(0); goto error0; } + + LM_DBG("Ro result code is [%d]\n", (int)ro_cca_data->resultcode); create_cca_result_code((int)ro_cca_data->resultcode); if (ro_cca_data->resultcode != 2001) { if (ro_cca_data->resultcode != 4012)

1 0

git:master:b4e3c04b: Merge branch 'master' of https://github.com/kamailio/kamailio
by Juha Heinanen 01 Mar '16

01 Mar '16

Module: kamailio Branch: master Commit: b4e3c04b601bef6841eb4616a17109296cd8aba1 URL: https://github.com/kamailio/kamailio/commit/b4e3c04b601bef6841eb4616a171092… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2016-03-01T09:50:18+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio --- Added: test/unit/60-message-sdp0.sip Added: test/unit/60-message-sdp1.sip Added: test/unit/60-message-sdp2.sip Added: test/unit/60-message-sdp3.sip Added: test/unit/60-message-sdp4.sip Added: test/unit/60-message-sdp5.sip Added: test/unit/60-message-sdp6.sip Added: test/unit/60-message-sdp7.sip Added: test/unit/60.cfg Added: test/unit/60.sh Added: test/unit/include/require.sh Modified: futexlock.h Modified: modules/rtpproxy/rtpproxy.c Modified: modules/sdpops/sdpops_mod.c Modified: modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/b4e3c04b601bef6841eb4616a171092… Patch: https://github.com/kamailio/kamailio/commit/b4e3c04b601bef6841eb4616a171092…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016