sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

git:master:74c02fdb: snmpstats: safety checks on hdr variable
by Daniel-Constantin Mierla 05 Jan '18

05 Jan '18

Module: kamailio Branch: master Commit: 74c02fdb1cd04d674046c38bc2f5193f91da4edf URL: https://github.com/kamailio/kamailio/commit/74c02fdb1cd04d674046c38bc2f5193… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-05T09:08:56+01:00 snmpstats: safety checks on hdr variable --- Modified: src/modules/snmpstats/snmpSIPRegUserLookupTable.c Modified: src/modules/snmpstats/snmpSIPStatusCodesTable.c --- Diff: https://github.com/kamailio/kamailio/commit/74c02fdb1cd04d674046c38bc2f5193… Patch: https://github.com/kamailio/kamailio/commit/74c02fdb1cd04d674046c38bc2f5193…

1 0

git:master:5b00ef8b: snmpstats: check the return code when registering statistics
by Daniel-Constantin Mierla 05 Jan '18

05 Jan '18

Module: kamailio Branch: master Commit: 5b00ef8bb31fb029b2d4dedae40e2c7a54841fe6 URL: https://github.com/kamailio/kamailio/commit/5b00ef8bb31fb029b2d4dedae40e2c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-05T09:08:56+01:00 snmpstats: check the return code when registering statistics --- Modified: src/modules/snmpstats/snmpstats.c --- Diff: https://github.com/kamailio/kamailio/commit/5b00ef8bb31fb029b2d4dedae40e2c7… Patch: https://github.com/kamailio/kamailio/commit/5b00ef8bb31fb029b2d4dedae40e2c7… --- diff --git a/src/modules/snmpstats/snmpstats.c b/src/modules/snmpstats/snmpstats.c index 4bd11c98d2..9a8acea270 100644 --- a/src/modules/snmpstats/snmpstats.c +++ b/src/modules/snmpstats/snmpstats.c @@ -302,10 +302,14 @@ static int register_message_code_statistics(void) sizeof(stat_var *) * number_of_message_codes); for(i = 0; i < number_of_message_codes; i++) { - register_stat(SNMPSTATS_MODULE_NAME, in_message_code_names[i], - &in_message_code_stats[i], 0); - register_stat(SNMPSTATS_MODULE_NAME, out_message_code_names[i], - &out_message_code_stats[i], 0); + if(register_stat(SNMPSTATS_MODULE_NAME, in_message_code_names[i], + &in_message_code_stats[i], 0)!=0) { + LM_ERR("failed to register in_message_code_names[%d]\n", i); + } + if(register_stat(SNMPSTATS_MODULE_NAME, out_message_code_names[i], + &out_message_code_stats[i], 0)!=0) { + LM_ERR("failed to register out_message_code_names[%d]\n", i); + } } return 0;

1 0

git:master:bab289f3: http_client: cast parameter to curl function to avoid warnings
by Daniel-Constantin Mierla 05 Jan '18

05 Jan '18

Module: kamailio Branch: master Commit: bab289f36b189a2836ef51acc9e26aed422a7dad URL: https://github.com/kamailio/kamailio/commit/bab289f36b189a2836ef51acc9e26ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-05T09:08:56+01:00 http_client: cast parameter to curl function to avoid warnings --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/bab289f36b189a2836ef51acc9e26ae… Patch: https://github.com/kamailio/kamailio/commit/bab289f36b189a2836ef51acc9e26ae… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 68ed33b248..695324bf43 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -252,7 +252,7 @@ static int curL_query_url(struct sip_msg *_m, const char *_url, str *_dst, res |= curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); - res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream); + res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)(&stream)); if(params->useragent) res |= curl_easy_setopt(curl, CURLOPT_USERAGENT, params->useragent);

1 0

git:5.0:447d49f7: erlang: fix missing to free memory used for param specification
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: 447d49f75c69621473fccd0c0fe3b6c4d6679ffc URL: https://github.com/kamailio/kamailio/commit/447d49f75c69621473fccd0c0fe3b6c… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T23:00:32+01:00 erlang: fix missing to free memory used for param specification - ensure to destroy fixup param specification when send erlang message (cherry picked from commit 90ee13d21db9a57a9d4a855b857dd152f645500d) --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/447d49f75c69621473fccd0c0fe3b6c… Patch: https://github.com/kamailio/kamailio/commit/447d49f75c69621473fccd0c0fe3b6c… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 54d2fa1733..83d007aa68 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,6 +697,7 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -915,6 +916,7 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1109,6 +1111,7 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1354,6 +1357,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1363,6 +1367,7 @@ static int fixup_send(void** param, int param_no) else { if (erl_param->value.sp.type == PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1373,6 +1378,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1392,6 +1398,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1400,6 +1407,7 @@ static int fixup_send(void** param, int param_no) } else { if (erl_param->value.sp.type ==PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1415,7 +1423,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

git:5.1:860dc286: erlang: fix missing to free memory used for param specification
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: 860dc28675993bc22644d7d2547747714066c02b URL: https://github.com/kamailio/kamailio/commit/860dc28675993bc22644d7d25477477… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T22:59:25+01:00 erlang: fix missing to free memory used for param specification - ensure to destroy fixup param specification when send erlang message (cherry picked from commit 90ee13d21db9a57a9d4a855b857dd152f645500d) --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/860dc28675993bc22644d7d25477477… Patch: https://github.com/kamailio/kamailio/commit/860dc28675993bc22644d7d25477477… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 54d2fa1733..83d007aa68 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,6 +697,7 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -915,6 +916,7 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1109,6 +1111,7 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1354,6 +1357,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1363,6 +1367,7 @@ static int fixup_send(void** param, int param_no) else { if (erl_param->value.sp.type == PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1373,6 +1378,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1392,6 +1398,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1400,6 +1407,7 @@ static int fixup_send(void** param, int param_no) } else { if (erl_param->value.sp.type ==PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1415,7 +1423,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

git:master:90ee13d2: erlang: fix missing to free memory used for param specification
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: master Commit: 90ee13d21db9a57a9d4a855b857dd152f645500d URL: https://github.com/kamailio/kamailio/commit/90ee13d21db9a57a9d4a855b857dd15… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T22:56:15+01:00 erlang: fix missing to free memory used for param specification - ensure to destroy fixup param specification when send erlang message --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/90ee13d21db9a57a9d4a855b857dd15… Patch: https://github.com/kamailio/kamailio/commit/90ee13d21db9a57a9d4a855b857dd15… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 54d2fa1733..83d007aa68 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,6 +697,7 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -915,6 +916,7 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1109,6 +1111,7 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1354,6 +1357,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1363,6 +1367,7 @@ static int fixup_send(void** param, int param_no) else { if (erl_param->value.sp.type == PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1373,6 +1378,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1392,6 +1398,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1400,6 +1407,7 @@ static int fixup_send(void** param, int param_no) } else { if (erl_param->value.sp.type ==PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1415,7 +1423,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

[kamailio/kamailio] http_async_client: fix initialization of tls_client_* and tls_ca_path (#1386)
by Victor Seva 04 Jan '18

04 Jan '18

set_query_params() was checking if those variables had a value to copy them. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1386 -- Commit Summary -- * http_async_client: fix initialization of tls_client_* and tls_ca_path module parameters -- File Changes -- M src/modules/http_async_client/http_async_client_mod.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1386.patch https://github.com/kamailio/kamailio/pull/1386.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/1386

2 3

git:master:5097954c: rls: pass dbf structure by pointer instead of value to function param
by Daniel-Constantin Mierla 04 Jan '18

04 Jan '18

Module: kamailio Branch: master Commit: 5097954ce5dbbd1094a022f3ae014c77e389aecb URL: https://github.com/kamailio/kamailio/commit/5097954ce5dbbd1094a022f3ae014c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-04T09:40:54+01:00 rls: pass dbf structure by pointer instead of value to function param --- Modified: src/modules/rls/rls.c Modified: src/modules/rls/rls_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5097954ce5dbbd1094a022f3ae014c7… Patch: https://github.com/kamailio/kamailio/commit/5097954ce5dbbd1094a022f3ae014c7… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 83e86173d7..cda6085bac 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -119,7 +119,7 @@ extern subs_t* rls_search_shtable(shtable_t htable,str callid,str to_tag, extern int rls_delete_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs); extern int rls_update_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs, int type); -extern void rls_update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +extern void rls_update_db_subs_timer(db1_con_t *db,db_func_t *dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func); static int rls_rpc_init(void); @@ -837,7 +837,7 @@ void rlsubs_table_update(unsigned int ticks,void *param) LM_ERR("sql use table failed\n"); return; } - pres_update_db_subs_timer(rls_db, rls_dbf, rls_table, hash_size, + pres_update_db_subs_timer(rls_db, &rls_dbf, rls_table, hash_size, no_lock, handle_expired_record); } diff --git a/src/modules/rls/rls_db.c b/src/modules/rls/rls_db.c index 5e88dea6cb..fe10092b69 100644 --- a/src/modules/rls/rls_db.c +++ b/src/modules/rls/rls_db.c @@ -100,7 +100,7 @@ int rls_update_shtable(shtable_t htable,unsigned int hash_code, /******************************************************************************/ -void rls_update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +void rls_update_db_subs_timer(db1_con_t *db,db_func_t *dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func) { LM_ERR( "rls_update_db_subs_timer shouldn't be called in RLS_DB_ONLY mode\n" );

1 0

git:master:aad751ab: presence: pass dbf structure by pointer instead of value to function param
by Daniel-Constantin Mierla 04 Jan '18

04 Jan '18

Module: kamailio Branch: master Commit: aad751ab54f37f3482641488929133296974025e URL: https://github.com/kamailio/kamailio/commit/aad751ab54f37f34826414889291332… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-04T09:39:31+01:00 presence: pass dbf structure by pointer instead of value to function param - passing large values is not optimal --- Modified: src/modules/presence/subscribe.c Modified: src/modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/aad751ab54f37f34826414889291332… Patch: https://github.com/kamailio/kamailio/commit/aad751ab54f37f34826414889291332… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 36329ab198..3c6e4458d4 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -2222,7 +2222,7 @@ void update_db_subs_timer_dbnone(int no_lock) -void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +void update_db_subs_timer(db1_con_t *db,db_func_t *dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func) { db_key_t query_cols[25], update_cols[8]; @@ -2468,7 +2468,7 @@ void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, update_vals[u_contact_col].val.str_val = s->contact; update_vals[u_record_route_col].val.str_val = s->record_route; - if(dbf.update(db, query_cols, 0, query_vals, update_cols, + if(dbf->update(db, query_cols, 0, query_vals, update_cols, update_vals, n_query_update, n_update_cols)< 0) { LM_ERR("updating in database\n"); @@ -2507,7 +2507,7 @@ void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, query_vals[user_agent_col].val.str_val = s->user_agent; - if(dbf.insert(db,query_cols,query_vals,n_query_cols )<0) + if(dbf->insert(db,query_cols,query_vals,n_query_cols )<0) { LM_ERR("unsuccessful sql insert\n"); } else { @@ -2524,7 +2524,7 @@ void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, update_vals[0].val.int_val= (int)time(NULL) - expires_offset; update_ops[0]= OP_LT; - if(dbf.delete(db, update_cols, update_ops, update_vals, 1) < 0) + if(dbf->delete(db, update_cols, update_ops, update_vals, 1) < 0) { LM_ERR("deleting expired information from database\n"); } @@ -2561,7 +2561,7 @@ void timer_db_update(unsigned int ticks,void *param) LM_ERR("sql use table failed\n"); return; } - update_db_subs_timer(pa_db, pa_dbf, subs_htable, shtable_size, + update_db_subs_timer(pa_db, &pa_dbf, subs_htable, shtable_size, no_lock, handle_expired_subs); } } diff --git a/src/modules/presence/subscribe.h b/src/modules/presence/subscribe.h index e71b062367..6f3cd637d8 100644 --- a/src/modules/presence/subscribe.h +++ b/src/modules/presence/subscribe.h @@ -109,10 +109,10 @@ int restore_db_subs(void); typedef int (*handle_expired_func_t)(subs_t* ); -void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +void update_db_subs_timer(db1_con_t *db,db_func_t *dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func); -typedef void (*update_db_subs_t)(db1_con_t * ,db_func_t ,shtable_t ,int ,int , +typedef void (*update_db_subs_t)(db1_con_t* ,db_func_t* ,shtable_t ,int ,int , handle_expired_func_t); int extract_sdialog_info_ex(subs_t* subs,struct sip_msg* msg, uint32_t min_expire,

1 0

git:5.0:c973e3eb: erlang: fix restore index of parsed tuple
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: c973e3ebbc02f420d462165d979b3599640a2cb7 URL: https://github.com/kamailio/kamailio/commit/c973e3ebbc02f420d462165d979b359… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:27:52+01:00 erlang: fix restore index of parsed tuple Avoid to change origin index while parsing tuple. (cherry picked from commit 74778f3ac75432d475e9d54dc56f9c3b95c178a5) --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c973e3ebbc02f420d462165d979b359… Patch: https://github.com/kamailio/kamailio/commit/c973e3ebbc02f420d462165d979b359… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index b852892d9d..d45351bcc2 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -486,10 +486,10 @@ int erl_rpc_struct_scan(erl_rpc_ctx_t* ctx, char* fmt, ...) va_list ap; - /* save index */ + /* preserve index */ index = ctx->request_index; - if(ei_decode_tuple_header(ctx->request->buff,&ctx->request_index, &arity)) + if(ei_decode_tuple_header(ctx->request->buff,&index, &arity)) { erl_rpc_fault(ctx,400,"Bad tuple"); return -1; @@ -561,9 +561,6 @@ int erl_rpc_struct_scan(erl_rpc_ctx_t* ctx, char* fmt, ...) fmt++; } - /* restore index */ - ctx->request_index = index; - va_end(ap); return reads-modifiers;

1 0

← Newer
1
...
29
30
31
32
33
34
35
36
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018