sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

[tracker] Task opened: Crash in websocket module
by sip-router 05 Mar '14

05 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Vitaliy Aleksandrov (Vitaliy) Attached to Project - sip-router Summary - Crash in websocket module Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - 4.1 Due in Version - Undecided Due Date - Undecided Details - Latest kamailio 4.1 has a problem very similar to the one described in the FS#364. In very rare situation kamailio tries to make double free for wsc structure. core: <code> #0 0x00007f18704da425 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f18704ddb8b in abort () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x0000000000557c02 in qm_free (qm=0x7f185e6ae000, p=0x7f185f04d700, file=0x7f1868a6a637 "websocket: ws_conn.c", func=0x7f1868a6aed9 "_wsconn_rm", line=140) at mem/q_malloc.c:470 #3 0x00007f1868a5b139 in _wsconn_rm (wsc=0x7f185f04d700) at ws_conn.c:140 #4 0x00007f1868a5c0e1 in wsconn_rm (wsc=0x7f185f04d700, run_event_route=WSCONN_EVENTROUTE_YES) at ws_conn.c:310 #5 0x00007f1868a5f264 in encode_and_send_ws_frame (frame=0x7ffffdf56160, conn_close=CONN_CLOSE_DONT) at ws_frame.c:303 #6 0x00007f1868a63336 in ws_frame_transmit (data=0x7ffffdf56230) at ws_frame.c:709 #7 0x000000000045933c in sr_event_exec (type=11, data=0x7ffffdf56230) at events.c:260 </code> logs: <code> kamailio[21357]: INFO: <script>: [HTTP] WebSocket connection closed [X.X.X.X:63514]. [X.X.X.X] => [0] kamailio[21360]: ERROR: websocket [ws_frame.c:294]: encode_and_send_ws_frame(): tcp_send_fail on wsc: 0x7f185f04d700 kamailio[21360]: ERROR: websocket [ws_frame.c:296]: encode_and_send_ws_frame(): sending WebSocket frame kamailio[21360]: INFO: <script>: [HTTP] WebSocket connection closed [X.X.X.X:63514]. [X.X.X.X] => [-1] kamailio[21360]: : <core> [mem/q_malloc.c:468]: qm_free(): BUG: qm_free: freeing already freed pointer (0x7f185f04d700), called from websocket: ws_conn.c: _wsconn_rm(140), first free websocket: ws_conn.c: _wsconn_rm(140) - aborting </code> As shown above event_route was called twice and a counter for the connection got "-1". This is a very rare situation and it only happens in the next scenario: 0. User A (connected via websocket) established a conversation with user B (tcp/tls). TCP worker process 1 handles websocket connection to the A and tcp process 2 handles connection to the B. 1. User A sends BYE to B. Kamailio forwards BYE to B. 2.1. User A closes websocket connection before receiving 200 OK to the BYE request. 2.2. User B replies with 200 OK to the BYE. 3. Kamailio calls ws_frame_transmit() for "200 OK" and ws_frame_received() for "WS CLOSE" in different TCP workers. They both take wsc pointer by calling wscconn_get() and at the end to processes tries to call ws_conn_rm() for the same WSC connection which leads to double shm_free(). At now i'm trying to add reference counts to wsc in the same way they work in tcp_connection structure. Maybe somebody has a better idea how to fix this ? More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=406 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:4.1: modules/kex: ask pkg.stats to return array value
by Juha Heinanen 05 Mar '14

05 Mar '14

Module: sip-router Branch: 4.1 Commit: 46912a606e345fbf76bb9794e0ef9c3851015c2a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46912a6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Mar 5 07:03:54 2014 +0200 modules/kex: ask pkg.stats to return array value (cherry picked from commit 920f02bde0f7b6e3484850f4677c603b9c8740c8) --- modules/kex/pkg_stats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/kex/pkg_stats.c b/modules/kex/pkg_stats.c index ce98e6f..244e150 100644 --- a/modules/kex/pkg_stats.c +++ b/modules/kex/pkg_stats.c @@ -258,7 +258,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) * */ rpc_export_t kex_pkg_rpc[] = { - {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, 0}, + {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, RET_ARRAY}, {0, 0, 0, 0} };

1 0

git:master: modules/kex: ask pkg.stats to return array value
by Juha Heinanen 05 Mar '14

05 Mar '14

Module: sip-router Branch: master Commit: 920f02bde0f7b6e3484850f4677c603b9c8740c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=920f02b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Mar 5 07:03:54 2014 +0200 modules/kex: ask pkg.stats to return array value --- modules/kex/pkg_stats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/kex/pkg_stats.c b/modules/kex/pkg_stats.c index ce98e6f..244e150 100644 --- a/modules/kex/pkg_stats.c +++ b/modules/kex/pkg_stats.c @@ -258,7 +258,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) * */ rpc_export_t kex_pkg_rpc[] = { - {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, 0}, + {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, RET_ARRAY}, {0, 0, 0, 0} };

1 0

git:master: registrar: allow randomization of expire value coming from UA
by Daniel-Constantin Mierla 04 Mar '14

04 Mar '14

Module: sip-router Branch: master Commit: 806e967e2e39e0140b992719e10693b9c768d758 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=806e967… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 21 21:07:43 2014 +0100 registrar: allow randomization of expire value coming from UA - new parameter expire_range - requested in FS#249 --- modules/registrar/config.c | 3 +++ modules/registrar/config.h | 2 ++ modules/registrar/reg_mod.c | 7 +++++++ modules/registrar/sip_msg.c | 7 ++++++- 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/modules/registrar/config.c b/modules/registrar/config.c index f183511..c52b9a4 100644 --- a/modules/registrar/config.c +++ b/modules/registrar/config.c @@ -34,6 +34,7 @@ struct cfg_group_registrar default_registrar_cfg = { STR_NULL, /* realm_pref */ 3600, /* default_expires */ 0, /* default_expires_range */ + 0, /* expires_range */ 60, /* min_expires */ 0, /* max_expires */ 0, /* max_contacts */ @@ -52,6 +53,8 @@ cfg_def_t registrar_cfg_def[] = { "Contains number of second to expire if no expire hf or contact expire present" }, {"default_expires_range", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 100, 0, default_expires_range_update, "Percent from default_expires that will be used in generating the range for the expire interval"}, + {"expires_range", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 100, 0, expires_range_update, + "Percent from incoming expires that will be used in generating the range for the expire interval"}, {"min_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0, 0, "The minimum expires value of a Contact. Value 0 disables the checking. "}, {"max_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0, max_expires_stats_update, diff --git a/modules/registrar/config.h b/modules/registrar/config.h index 496a14b..022b14d 100644 --- a/modules/registrar/config.h +++ b/modules/registrar/config.h @@ -30,6 +30,7 @@ struct cfg_group_registrar { str realm_pref; unsigned int default_expires; unsigned int default_expires_range; + unsigned int expires_range; unsigned int min_expires; unsigned int max_expires; unsigned int max_contacts; @@ -45,6 +46,7 @@ extern cfg_def_t registrar_cfg_def[]; extern void default_expires_stats_update(str*, str*); extern void default_expires_range_update(str*, str*); +extern void expires_range_update(str*, str*); extern void max_expires_stats_update(str*, str*); #endif diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index 4539f67..0b32ce4 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -153,6 +153,7 @@ stat_var *max_expires_stat; stat_var *max_contacts_stat; stat_var *default_expire_stat; stat_var *default_expire_range_stat; +stat_var *expire_range_stat; /** SL API structure */ sl_api_t slb; @@ -210,6 +211,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"default_expires", INT_PARAM, &default_registrar_cfg.default_expires }, {"default_expires_range", INT_PARAM, &default_registrar_cfg.default_expires_range }, + {"expires_range", INT_PARAM, &default_registrar_cfg.expires_range }, {"default_q", INT_PARAM, &default_registrar_cfg.default_q }, {"append_branches", INT_PARAM, &default_registrar_cfg.append_branches }, {"case_sensitive", INT_PARAM, &default_registrar_cfg.case_sensitive }, @@ -244,6 +246,7 @@ stat_export_t mod_stats[] = { {"max_contacts", STAT_NO_RESET, &max_contacts_stat }, {"default_expire", STAT_NO_RESET, &default_expire_stat }, {"default_expires_range", STAT_NO_RESET, &default_expire_range_stat }, + {"expires_range", STAT_NO_RESET, &expire_range_stat }, {"accepted_regs", 0, &accepted_registrations }, {"rejected_regs", 0, &rejected_registrations }, {0, 0, 0} @@ -709,3 +712,7 @@ void max_expires_stats_update(str* gname, str* name){ void default_expires_range_update(str* gname, str* name){ update_stat(default_expire_range_stat, cfg_get(registrar, registrar_cfg, default_expires_range)); } + +void expires_range_update(str* gname, str* name){ + update_stat(expire_range_stat, cfg_get(registrar, registrar_cfg, expires_range)); +} diff --git a/modules/registrar/sip_msg.c b/modules/registrar/sip_msg.c index a02b050..7ce9c59 100644 --- a/modules/registrar/sip_msg.c +++ b/modules/registrar/sip_msg.c @@ -67,11 +67,16 @@ static inline int get_expire_val(void) static inline int get_expires_hf(struct sip_msg* _m) { exp_body_t* p; + int range; if (_m->expires) { p = (exp_body_t*)_m->expires->parsed; if (p->valid) { if (p->val != 0) { - return p->val + act_time; + range = cfg_get(registrar, registrar_cfg, default_expires_range); + if(likely(range==0)) + return p->val + act_time; + return p->val + act_time - (float)range/100 * p->val + + ((float)(rand()%100)/100) * ((float)range/100 * p->val); } else return 0; } else { return act_time + get_expire_val();

3 4

git:3.3: sqlops: reset the result container before new query is executed
by Daniel-Constantin Mierla 04 Mar '14

04 Mar '14

Module: sip-router Branch: 3.3 Commit: c1a4dda1b7a364a4ef0060f85b3d192993373d2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1a4dda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 4 17:43:21 2014 +0100 sqlops: reset the result container before new query is executed - it was lost in commit 9b62514b4a90e169c9126b7bda6d87cc4c213ad2 - reported by Jonas Böttner (cherry picked from commit 864127e6e02144c40c138d6921862b1512d01c66) (cherry picked from commit 954fe136964296836113f5187f9cde91b197a567) --- modules_k/sqlops/sql_api.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index c4c05dc..84af170 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -250,6 +250,8 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) int i, j; str sv; + if(res) sql_reset_result(res); + if(query==NULL) { LM_ERR("bad parameters\n"); @@ -274,7 +276,6 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) return 3; } - sql_reset_result(res); res->ncols = RES_COL_N(db_res); res->nrows = RES_ROW_N(db_res); LM_DBG("rows [%d] cols [%d]\n", res->nrows, res->ncols);

1 0

git:4.0: sqlops: reset the result container before new query is executed
by Daniel-Constantin Mierla 04 Mar '14

04 Mar '14

Module: sip-router Branch: 4.0 Commit: 314fe0a20f47c81cd2bd54c4d0c63817752c7e44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=314fe0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 4 17:31:57 2014 +0100 sqlops: reset the result container before new query is executed - it was lost in commit 9b62514b4a90e169c9126b7bda6d87cc4c213ad2 - reported by Jonas Böttner (cherry picked from commit 864127e6e02144c40c138d6921862b1512d01c66) (cherry picked from commit 954fe136964296836113f5187f9cde91b197a567) --- modules/sqlops/sql_api.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index bfd4e96..2518db1 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -252,6 +252,8 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) int i, j; str sv; + if(res) sql_reset_result(res); + if(query==NULL) { LM_ERR("bad parameters\n"); @@ -276,7 +278,6 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) return 3; } - sql_reset_result(res); res->ncols = RES_COL_N(db_res); res->nrows = RES_ROW_N(db_res); LM_DBG("rows [%d] cols [%d]\n", res->nrows, res->ncols);

1 0

git:4.1: sqlops: reset the result container before new query is executed
by Daniel-Constantin Mierla 04 Mar '14

04 Mar '14

Module: sip-router Branch: 4.1 Commit: 954fe136964296836113f5187f9cde91b197a567 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=954fe13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 4 17:31:57 2014 +0100 sqlops: reset the result container before new query is executed - it was lost in commit 9b62514b4a90e169c9126b7bda6d87cc4c213ad2 - reported by Jonas Böttner (cherry picked from commit 864127e6e02144c40c138d6921862b1512d01c66) --- modules/sqlops/sql_api.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index bfd4e96..2518db1 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -252,6 +252,8 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) int i, j; str sv; + if(res) sql_reset_result(res); + if(query==NULL) { LM_ERR("bad parameters\n"); @@ -276,7 +278,6 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) return 3; } - sql_reset_result(res); res->ncols = RES_COL_N(db_res); res->nrows = RES_ROW_N(db_res); LM_DBG("rows [%d] cols [%d]\n", res->nrows, res->ncols);

1 0

git:master: sqlops: reset the result container before new query is executed
by Daniel-Constantin Mierla 04 Mar '14

04 Mar '14

Module: sip-router Branch: master Commit: 864127e6e02144c40c138d6921862b1512d01c66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=864127e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 4 17:31:57 2014 +0100 sqlops: reset the result container before new query is executed - it was lost in commit 9b62514b4a90e169c9126b7bda6d87cc4c213ad2 - reported by Jonas Böttner --- modules/sqlops/sql_api.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index bfd4e96..2518db1 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -252,6 +252,8 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) int i, j; str sv; + if(res) sql_reset_result(res); + if(query==NULL) { LM_ERR("bad parameters\n"); @@ -276,7 +278,6 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) return 3; } - sql_reset_result(res); res->ncols = RES_COL_N(db_res); res->nrows = RES_ROW_N(db_res); LM_DBG("rows [%d] cols [%d]\n", res->nrows, res->ncols);

1 0

[tracker] Task closed: Crash in asynchronous processing
by sip-router 04 Mar '14

04 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#400 - Crash in asynchronous processing User who did this - Carsten Bock (carstenbock) Reason for closing: Fixed Additional comments about closing: Tested: OK. Thanks! More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=400 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: ims_registrar_pcscf: Make sure, the contact stays NULL if the ip, port or reg_state is incorrect.
by Carsten Bock 04 Mar '14

04 Mar '14

Module: sip-router Branch: master Commit: 01cd0a309ea85eaf6509e5266a825f6ffb834964 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01cd0a3… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue Mar 4 15:51:04 2014 +0100 ims_registrar_pcscf: Make sure, the contact stays NULL if the ip,port or reg_state is incorrect. --- modules/ims_registrar_pcscf/service_routes.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 452548a..6360aab 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -142,6 +142,8 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d) { break; c = NULL; } + } else { + c = NULL; } } }

1 0

← Newer
1
...
22
23
24
25
26
27
28
29
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2014