sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:9136ce80: xhttp: proper check for return of add lump rpl
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 9136ce8017660e92f624de6f7b8a07e50620dfa1 URL: https://github.com/kamailio/kamailio/commit/9136ce8017660e92f624de6f7b8a07e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T13:51:36+02:00 xhttp: proper check for return of add lump rpl --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9136ce8017660e92f624de6f7b8a07e… Patch: https://github.com/kamailio/kamailio/commit/9136ce8017660e92f624de6f7b8a07e… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index d41fc47f70..8a542bfc8b 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -382,11 +382,12 @@ static int xhttp_handler(sip_msg_t* msg) } else { DBG("new fake msg created (%d bytes):\n<%.*s>\n", fake_msg_len, fake_msg_len, fake_msg); - if (xhttp_process_request(msg, fake_msg, fake_msg_len)<0) + if (xhttp_process_request(msg, fake_msg, fake_msg_len)<0) { ret=NONSIP_MSG_ERROR; - pkg_free(fake_msg); } - return ret; + pkg_free(fake_msg); + } + return ret; } else { LM_DBG("http msg unchanged (%d bytes):\n<%.*s>\n", msg->len, msg->len, msg->buf); @@ -432,7 +433,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, if(body!=NULL && body->len>0) { - if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) < 0) + if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) == 0) { LM_ERR("Error while adding reply lump\n"); return -1;

1 0

git:master:a2d010ce: xmlops: removed dead code return
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: a2d010cea219fa1cd84d0cf84825f3cc63536530 URL: https://github.com/kamailio/kamailio/commit/a2d010cea219fa1cd84d0cf84825f3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T13:51:19+02:00 xmlops: removed dead code return --- Modified: src/modules/xmlops/pv_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/a2d010cea219fa1cd84d0cf84825f3c… Patch: https://github.com/kamailio/kamailio/commit/a2d010cea219fa1cd84d0cf84825f3c… --- diff --git a/src/modules/xmlops/pv_xml.c b/src/modules/xmlops/pv_xml.c index f002a53d44..872fea0de3 100644 --- a/src/modules/xmlops/pv_xml.c +++ b/src/modules/xmlops/pv_xml.c @@ -331,7 +331,6 @@ int pv_get_xml(struct sip_msg *msg, pv_param_t *param, default: return pv_get_null(msg, param, res); } - return pv_get_null(msg, param, res); } int pv_set_xml(struct sip_msg* msg, pv_param_t *param,

1 0

git:master:08c404f2: xcap_server: proper test of retun code for add lump rpl
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 08c404f245e55b37f71d4326afd959ecf1ea831c URL: https://github.com/kamailio/kamailio/commit/08c404f245e55b37f71d4326afd959e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T13:50:07+02:00 xcap_server: proper test of retun code for add lump rpl --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/08c404f245e55b37f71d4326afd959e… Patch: https://github.com/kamailio/kamailio/commit/08c404f245e55b37f71d4326afd959e… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 86f7816dd7..15c5a91209 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -284,7 +284,7 @@ static int xcaps_send_reply(sip_msg_t *msg, int code, str *reason, } if(body && body->len>0) { - if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) < 0) + if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) == 0) { LM_ERR("Error while adding reply lump\n"); return -1;

1 0

git:master:e6c9474e: core: cfg ctx - removed unused variable
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: e6c9474e456fb0673c87f87a325d9dc40aa10d32 URL: https://github.com/kamailio/kamailio/commit/e6c9474e456fb0673c87f87a325d9dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T10:27:57+02:00 core: cfg ctx - removed unused variable --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/e6c9474e456fb0673c87f87a325d9dc… Patch: https://github.com/kamailio/kamailio/commit/e6c9474e456fb0673c87f87a325d9dc… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 6dc9a469c0..d251b11317 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -1373,8 +1373,7 @@ int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, cfg_mapping_t *var; void *p; static str s; /* we need the value even - after the function returns */ - cfg_group_inst_t *group_inst; + * after the function returns */ /* verify the context even if we do not need it now to make sure that a cfg driver has called the function

1 0

git:master:e7a89633: cfg_rpc: hanlde return code inside cfg.reset rpc command
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: e7a89633c809345aabdcf68f120f01e7d52d116d URL: https://github.com/kamailio/kamailio/commit/e7a89633c809345aabdcf68f120f01e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T10:11:07+02:00 cfg_rpc: hanlde return code inside cfg.reset rpc command --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e7a89633c809345aabdcf68f120f01e… Patch: https://github.com/kamailio/kamailio/commit/e7a89633c809345aabdcf68f120f01e… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index 18c16c8733..a9c42dc1e3 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -355,12 +355,12 @@ static void rpc_get(rpc_t* rpc, void* c) } } -static const char* rpc_reset_doc[2] = { +static const char* rpc_cfg_var_reset_doc[2] = { "Reset all the values of a configuration group and commit the change immediately", 0 }; -static void rpc_reset(rpc_t* rpc, void* c) +static void rpc_cfg_var_reset(rpc_t* rpc, void* c) { void *h; str gname, var; @@ -378,7 +378,7 @@ static void rpc_reset(rpc_t* rpc, void* c) if (get_group_id(&group, &group_id)) { rpc->fault(c, 400, "Wrong group syntax. Use either \"group\", or \"group[id]\""); - return; + return; } cfg_get_group_init(&h); @@ -402,10 +402,21 @@ static void rpc_reset(rpc_t* rpc, void* c) return; } - if (input_type == CFG_INPUT_INT) - cfg_set_now_int(ctx, &gname, group_id, &var, (int)(long)val); - else if (input_type == CFG_INPUT_STRING) - cfg_set_now_string(ctx, &gname, group_id, &var, val); + if (input_type == CFG_INPUT_INT) { + ret = cfg_set_now_int(ctx, &gname, group_id, &var, + (int)(long)val); + } else if (input_type == CFG_INPUT_STRING) { + ret = cfg_set_now_string(ctx, &gname, group_id, &var, val); + } else { + rpc->fault(c, 500, "Unsupported input type"); + return; + } + if(ret<0) { + rpc->fault(c, 500, "Reset failed"); + return; + } else if(ret==1) { + LM_WARN("unexpected situation - variable not found\n"); + } } } } @@ -601,7 +612,7 @@ static rpc_export_t rpc_calls[] = { {"cfg.commit", rpc_commit, rpc_commit_doc, 0}, {"cfg.rollback", rpc_rollback, rpc_rollback_doc, 0}, {"cfg.get", rpc_get, rpc_get_doc, 0}, - {"cfg.reset", rpc_reset, rpc_reset_doc, 0}, + {"cfg.reset", rpc_cfg_var_reset, rpc_cfg_var_reset_doc, 0}, {"cfg.help", rpc_help, rpc_help_doc, 0}, {"cfg.list", rpc_list, rpc_list_doc, 0}, {"cfg.diff", rpc_diff, rpc_diff_doc, 0},

1 0

git:master:1ed223dc: speeddial: simplified access to db_res and the free of it
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 1ed223dcccf4c2ea623db75fdda16adc924b916e URL: https://github.com/kamailio/kamailio/commit/1ed223dcccf4c2ea623db75fdda16ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:57:39+02:00 speeddial: simplified access to db_res and the free of it --- Modified: src/modules/speeddial/sdlookup.c --- Diff: https://github.com/kamailio/kamailio/commit/1ed223dcccf4c2ea623db75fdda16ad… Patch: https://github.com/kamailio/kamailio/commit/1ed223dcccf4c2ea623db75fdda16ad… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index c4f655efce..d9e52bf3cd 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -161,17 +161,17 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_funcs.use_table(db_handle, &table_s); if(db_funcs.query(db_handle, db_keys, NULL, db_vals, db_cols, - nr_keys /*no keys*/, 1 /*no cols*/, NULL, &db_res)!=0) + nr_keys /*no keys*/, 1 /*no cols*/, NULL, &db_res)!=0 || db_res==NULL) { LM_ERR("failed to query database\n"); goto err_server; } - if (RES_ROW_N(db_res)<=0 || RES_ROWS(db_res)[0].values[0].nul != 0) - { + if(RES_ROW_N(db_res) <= 0 || RES_ROWS(db_res)[0].values[0].nul != 0) { LM_DBG("no sip address found for R-URI\n"); - if (db_res!=NULL && db_funcs.free_result(db_handle, db_res) < 0) + if(db_funcs.free_result(db_handle, db_res) < 0) { LM_DBG("failed to free result of query\n"); + } return -1; } @@ -199,8 +199,7 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) break; default: LM_ERR("unknown type of DB new_uri column\n"); - if (db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0) - { + if (db_funcs.free_result(db_handle, db_res) < 0) { LM_DBG("failed to free result of query\n"); } goto err_server; @@ -217,8 +216,9 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) /** * Free the result because we don't need it anymore */ - if (db_res!=NULL && db_funcs.free_result(db_handle, db_res) < 0) + if (db_funcs.free_result(db_handle, db_res) < 0) { LM_DBG("failed to free result of query\n"); + } /* set the URI */ LM_DBG("URI of sd from R-URI [%s]\n", user_s.s);

1 0

git:master:8f460d16: sqlops: free allocated pv list in case of error inside fixup_sql_pvquery()
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 8f460d16e84b9bc0b01463113c6e7e79d297f64e URL: https://github.com/kamailio/kamailio/commit/8f460d16e84b9bc0b01463113c6e7e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:56:58+02:00 sqlops: free allocated pv list in case of error inside fixup_sql_pvquery() --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/8f460d16e84b9bc0b01463113c6e7e7… Patch: https://github.com/kamailio/kamailio/commit/8f460d16e84b9bc0b01463113c6e7e7… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index ce3f8730f7..502819e76a 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -391,6 +391,7 @@ static int fixup_sql_pvquery(void** param, int param_no) if (pvl->sname.setf == NULL) { LM_ERR("result variable [%d] is read-only\n", i); + free_pvname_list(res); return E_UNSPEC; } i++;

1 0

git:master:bd5873c4: dialplan: free allocated vars in case of errors
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: bd5873c4e33188238633a8f6c48a0c5c28041179 URL: https://github.com/kamailio/kamailio/commit/bd5873c4e33188238633a8f6c48a0c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:56:10+02:00 dialplan: free allocated vars in case of errors --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/bd5873c4e33188238633a8f6c48a0c5… Patch: https://github.com/kamailio/kamailio/commit/bd5873c4e33188238633a8f6c48a0c5… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index b319607e3d..e5710fd828 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -267,7 +267,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest, set_attr_pvar: - if(!attr_pvar) + if(attr_pvar==NULL || attrs==NULL) return 0; val.rs = *attrs; @@ -393,8 +393,10 @@ static int dp_trans_fixup(void ** param, int param_no){ }else{ lstr.s = p; lstr.len = strlen(p); dp_par->v.sp[0] = pv_cache_get(&lstr); - if (dp_par->v.sp[0]==NULL) + if (dp_par->v.sp[0]==NULL) { + pkg_free(dp_par); goto error; + } verify_par_type(param_no, dp_par->v.sp[0]); dp_par->type = DP_VAL_SPEC; @@ -410,14 +412,18 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = p; lstr.len = strlen(p); dp_par->v.sp[0] = pv_cache_get(&lstr); - if(dp_par->v.sp[0]==NULL) + if(dp_par->v.sp[0]==NULL) { + pkg_free(dp_par); goto error; + } if (s != 0) { lstr.s = s; lstr.len = strlen(s); dp_par->v.sp[1] = pv_cache_get(&lstr); - if (dp_par->v.sp[1]==NULL) + if (dp_par->v.sp[1]==NULL) { + pkg_free(dp_par); goto error; + } verify_par_type(param_no, dp_par->v.sp[1]); } diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 2c0d9b3b12..85741677df 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -234,7 +234,7 @@ dpl_dyn_pcre_p dpl_dynamic_pcre_list(sip_msg_t *msg, str *expr) l = pkg_malloc(sizeof(struct str_list)); if(l==NULL) { PKG_MEM_ERROR; - return NULL; + goto error; } memset(l, 0, sizeof(struct str_list)); if(dpl_get_avp_values(msg, elem, avp_elem, &l)<0) { @@ -342,8 +342,10 @@ struct subst_expr* repl_exp_parse(str subst) rw_no = 0; repl = p; - if((rw_no = parse_repl(rw, &p, end, &max_pmatch, WITHOUT_SEP))< 0) + if((rw_no = parse_repl(rw, &p, end, &max_pmatch, WITHOUT_SEP))< 0) { + LM_ERR("parse repl failed\n"); goto error; + } repl_end=p; @@ -378,7 +380,6 @@ struct subst_expr* repl_exp_parse(str subst) error: if(shms.s != NULL) shm_free(shms.s); - if (se) { repl_expr_free(se);} return NULL; }

1 0

git:master:f2796ceb: dialog: increase puid size for profile to ensure null termination
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: f2796ceb0a127c1a6580a9d9582ec9bc0fba6081 URL: https://github.com/kamailio/kamailio/commit/f2796ceb0a127c1a6580a9d9582ec9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:55:04+02:00 dialog: increase puid size for profile to ensure null termination --- Modified: src/modules/dialog/dlg_profile.c Modified: src/modules/dialog/dlg_profile.h Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/f2796ceb0a127c1a6580a9d9582ec9b… Patch: https://github.com/kamailio/kamailio/commit/f2796ceb0a127c1a6580a9d9582ec9b… --- diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c index 3576f68036..89d994616b 100644 --- a/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c @@ -667,7 +667,7 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi } if(puid && puid->s && puid->len>0) { if(puid->len<SRUID_SIZE) { - strcpy(linker->hash_linker.puid, puid->s); + memcpy(linker->hash_linker.puid, puid->s, puid->len); linker->hash_linker.puid_len = puid->len; } else { LM_ERR("puid size is too large\n"); @@ -677,7 +677,8 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi } else { sruid_next_safe(&_dlg_profile_sruid); if(_dlg_profile_sruid.uid.len<SRUID_SIZE) { - strcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s); + memcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s, + _dlg_profile_sruid.uid.len); linker->hash_linker.puid_len = _dlg_profile_sruid.uid.len; } else { LM_ERR("sruid size is too large\n"); diff --git a/src/modules/dialog/dlg_profile.h b/src/modules/dialog/dlg_profile.h index 3d6c94d6d4..5c09dd6083 100644 --- a/src/modules/dialog/dlg_profile.h +++ b/src/modules/dialog/dlg_profile.h @@ -54,7 +54,7 @@ typedef struct dlg_profile_hash { str value; /*!< hash value */ struct dlg_cell *dlg; /*!< dialog cell */ - char puid[SRUID_SIZE]; + char puid[SRUID_SIZE+2]; int puid_len; time_t expires; int flags; diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index a67b976137..d37bbbf514 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -406,7 +406,7 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) dlg_lreq_callee_headers.len); lhdrs.len += dlg_lreq_callee_headers.len; if(dlg_lreq_callee_headers.s[dlg_lreq_callee_headers.len-1]!='\n') { - strncpy(lhdrs.s+lhdrs.len, CRLF, CRLF_LEN); + memcpy(lhdrs.s+lhdrs.len, CRLF, CRLF_LEN); lhdrs.len += CRLF_LEN; } }

1 0

git:master:06e1ad19: debugger: fix orig offset computation inside w_dbg_sip_msg()
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 06e1ad190ea62efc09a158f9c86d447d078d805b URL: https://github.com/kamailio/kamailio/commit/06e1ad190ea62efc09a158f9c86d447… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:53:53+02:00 debugger: fix orig offset computation inside w_dbg_sip_msg() --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/06e1ad190ea62efc09a158f9c86d447… Patch: https://github.com/kamailio/kamailio/commit/06e1ad190ea62efc09a158f9c86d447… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 97dee43590..5c973c57b5 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -547,9 +547,11 @@ static int w_dbg_sip_msg(struct sip_msg* msg, char *level, char *facility) } /* skip original uri */ - if (msg->new_uri.s){ - orig_offs=msg->first_line.u.request.uri.s - msg->buf; - orig_offs=msg->first_line.u.request.uri.len; + if(msg->first_line.type == SIP_REQUEST) { + if(msg->new_uri.s) { + orig_offs = msg->first_line.u.request.uri.s - msg->buf; + orig_offs += msg->first_line.u.request.uri.len; + } } /* alloc private mem and copy lumps */

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017