sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
302 discussions

git:master:9c239dc3: core: checks for trying to define empty or null ids

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c239dc385716255b977d8d879946e707e6f51c3 URL: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:50:31+02:00 core: checks for trying to define empty or null ids - use found pointer to compute the lenght of ID for -A parameter to save a strlen() --- Modified: src/core/cfg.lex Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… Patch: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index b8e4f9aa70..d36fc72b54 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1927,11 +1927,16 @@ ksr_ppdefine_t* pp_get_define(int idx) return &pp_defines[idx]; } -static int pp_lookup(int len, const char * text) +static int pp_lookup(int len, const char *text) { str var = {(char *)text, len}; int i; + if(len<=0 || text==NULL) { + LM_ERR("invalid parameters"); + return -1; + } + for (i=0; i<pp_num_defines; i++) if (STR_EQ(pp_defines[i].name, var)) return i; @@ -1945,10 +1950,15 @@ int pp_define_set_type(int type) return 0; } -int pp_define(int len, const char * text) +int pp_define(int len, const char *text) { int ppos; + if(len<=0 || text==NULL) { + LM_ERR("invalid parameters"); + return -1; + } + LM_DBG("defining id: %.*s\n", len, text); if (pp_num_defines == MAX_DEFINES) { @@ -2010,7 +2020,7 @@ int pp_define_set(int len, char *text) LM_BUG("BUG: the index in define table not set yet\n"); return -1; } - if(len<=0) { + if(len<=0 || text==NULL) { LM_DBG("no define value - ignoring\n"); return 0; } @@ -2046,7 +2056,7 @@ int pp_define_set(int len, char *text) return 0; } -int pp_define_env(const char * text, int len) +int pp_define_env(const char *text, int len) { char *r; str defname; @@ -2087,7 +2097,7 @@ int pp_define_env(const char * text, int len) return 0; } -str *pp_define_get(int len, const char * text) +str *pp_define_get(int len, const char *text) { str var = {(char *)text, len}; int i; @@ -2129,7 +2139,7 @@ static int pp_ifdef_type(int type) * ifndef defined -> 0 * ifndef undefined -> 1 */ -static void pp_ifdef_var(int len, const char * text) +static void pp_ifdef_var(int len, const char *text) { pp_ifdef_stack[pp_sptr] ^= (pp_lookup(len, text) < 0); } diff --git a/src/main.c b/src/main.c index ee558db13f..6d363ba375 100644 --- a/src/main.c +++ b/src/main.c @@ -2202,16 +2202,17 @@ int main(int argc, char** argv) case 'A': p = strchr(optarg, '='); if(p) { - *p = '\0'; + tmp_len = p - optarg; + } else { + tmp_len = strlen(optarg); } pp_define_set_type(0); - if(pp_define(strlen(optarg), optarg)<0) { + if(pp_define(tmp_len, optarg)<0) { fprintf(stderr, "error at define param: -A %s\n", optarg); goto error; } if(p) { - *p = '='; p++; if(pp_define_set(strlen(p), p)<0) { fprintf(stderr, "error at define value: -A %s\n",

3 years

git:master:c08620f6: imc: expect the second param only if first is set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c08620f6427d59749396fe2762e340328ce69c41 URL: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:35:12+02:00 imc: expect the second param only if first is set - bits of formatting for imc_handle_create() --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… Patch: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 9dbc403e3e..94ddc38884 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -349,8 +349,12 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, memset(&room, '\0', sizeof(room)); - if (cmd->param[0].s) params++; - if (cmd->param[1].s) params++; + if (cmd->param[0].s) { + params++; + if (cmd->param[1].s) { + params++; + } + } switch(params) { case 0: @@ -361,7 +365,9 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, /* With one parameter, if the value is "private", it indicates * a private room, otherwise it is the URI of the room and we * create a public room. */ - if (cmd->param[0].len == IMC_ROOM_PRIVATE_LEN && !strncasecmp(cmd->param[0].s, IMC_ROOM_PRIVATE, cmd->param[0].len)) { + if (cmd->param[0].len == IMC_ROOM_PRIVATE_LEN + && !strncasecmp(cmd->param[0].s, IMC_ROOM_PRIVATE, + cmd->param[0].len)) { ps = cmd->param[0]; } else { rs = cmd->param[0]; @@ -384,7 +390,8 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, goto error; if (ps.s) { - if (ps.len == IMC_ROOM_PRIVATE_LEN && !strncasecmp(ps.s, IMC_ROOM_PRIVATE, ps.len)) { + if (ps.len == IMC_ROOM_PRIVATE_LEN + && !strncasecmp(ps.s, IMC_ROOM_PRIVATE, ps.len)) { flag_room |= IMC_ROOM_PRIV; LM_DBG("Room with private flag on\n"); } else { @@ -443,10 +450,12 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, LM_ERR("Failed to add member [%.*s]\n", STR_FMT(&src->uri)); goto error; } - LM_DBG("Added [%.*s] as member to room [%.*s]\n", STR_FMT(&member->uri), STR_FMT(&rm->uri)); + LM_DBG("Added [%.*s] as member to room [%.*s]\n", STR_FMT(&member->uri), + STR_FMT(&rm->uri)); body.s = imc_body_buf; - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, STR_FMT(format_uri(member->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, + STR_FMT(format_uri(member->uri))); if (body.len < 0) { LM_ERR("Error while building response\n");

3 years

git:master:ef31c82a: core: cfg.len - sanitizer safety check of target buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ef31c82ac3bd7972c2d02c893f8041af4664b717 URL: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:31:48+02:00 core: cfg.len - sanitizer safety check of target buffer --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… Patch: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index afab5b68a5..b8e4f9aa70 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1593,7 +1593,7 @@ static char* addchar(struct str_buf* dst, char c) static char* addstr(struct str_buf* dst_b, char* src, int len) { - char *tmp; + char *tmp = NULL; unsigned size; unsigned used; @@ -1612,6 +1612,10 @@ static char* addstr(struct str_buf* dst_b, char* src, int len) dst_b->crt=dst_b->s+used; dst_b->left=size-used; } + if(dst_b->crt==NULL) { + LM_CRIT("unexpected null dst buffer\n"); + ksr_exit(-1); + } memcpy(dst_b->crt, src, len); dst_b->crt+=len; *(dst_b->crt)=0;

3 years

git:master:ca182183: core: fixed condition for 0 ID or NULL NAME AVP

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ca1821837dfe7dd6630f628d968ed4d1178c7040 URL: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:23:59+02:00 core: fixed condition for 0 ID or NULL NAME AVP - avoid null in memcpy for AVP_NAME_STR --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… Patch: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index 82183e3b28..e80e52d79d 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,7 +148,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == 0 && name.s.len == 0) { + if (name.s.s == NULL || name.s.len == 0) { LM_ERR("0 ID or NULL NAME AVP!"); goto error; }

3 years

git:master:36abe25e: crypto: fix use of uninitialized values introduced by b08fd55ddd598115a3b69afc630403a582d239f2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36abe25e35d1862468999bedcaf8bba29ec5f48a URL: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:10:24+02:00 crypto: fix use of uninitialized values introduced by b08fd55ddd598115a3b69afc630403a582d239f2 --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… Patch: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 5ec753d602..955bf264bf 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -192,7 +192,8 @@ static int ki_crypto_aes_encrypt_helper(sip_msg_t* msg, str *ins, str *keys, { pv_value_t val; EVP_CIPHER_CTX *en = NULL; - str etext, lkey, iv, ttext; + str etext, lkey, ttext; + str iv = STR_NULL; unsigned char decoded_key[64]; unsigned char decoded_iv[16], tmpiv[16]; @@ -476,7 +477,7 @@ static int ki_crypto_aes_decrypt_helper(sip_msg_t* msg, str *ins, str *keys, EVP_CIPHER_CTX *de=NULL; str etext, lkey; unsigned char decoded_key[64]; - char *iv; + char *iv = NULL; de = EVP_CIPHER_CTX_new(); if(de==NULL) {

3 years

git:master:1536f4bb: .gitignore: ignore files that can be generated by compiling tools

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1536f4bb3d4e654c8169afb6599c47c26df12ef6 URL: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T12:05:53+02:00 .gitignore: ignore files that can be generated by compiling tools --- Modified: .gitignore --- Diff: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… Patch: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… --- diff --git a/.gitignore b/.gitignore index e8eb381ff5..3ba24902bf 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ libiname.lst *.7 # vscode tmp files .vscode +# compiling tools files +.clangd +compile_commands.json

3 years

git:master:ba9f2b5a: core: init allocated memory in str_hash_alloc()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ba9f2b5af9cabd61f67ceedb8feab6bd7bc6526d URL: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T12:02:20+02:00 core: init allocated memory in str_hash_alloc() - removed unused pointer shifting in dset.c - small reworking of lval_assign() --- Modified: src/core/dset.c Modified: src/core/lvalue.c Modified: src/core/str_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… Patch: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… --- diff --git a/src/core/dset.c b/src/core/dset.c index adabe7bba0..b6999f32b5 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -860,7 +860,6 @@ int msg_get_src_addr(sip_msg_t *msg, str *uri, int mode) p += TRANSPORT_PARAM_LEN; memcpy(p, proto.s, proto.len); - p += proto.len; } uri->s = buf; diff --git a/src/core/lvalue.c b/src/core/lvalue.c index ab600c04bb..5d779cfbce 100644 --- a/src/core/lvalue.c +++ b/src/core/lvalue.c @@ -380,7 +380,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, struct rvalue* rv; int ret; - ret=0; + ret=-1; rv=rval_expr_eval(h, msg, rve); if (unlikely(rv==0)){ LM_ERR("rval expression evaluation failed (%d,%d-%d,%d)\n", @@ -404,9 +404,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, LM_ERR("assignment failed at pos: (%d,%d-%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col); - } - else - { + } else { if(unlikely(_log_assign_action!=NULL)) _log_assign_action(msg, lv); } @@ -414,5 +412,5 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, return ret; error: if (rv) rval_destroy(rv); - return -1; + return ret; } diff --git a/src/core/str_hash.h b/src/core/str_hash.h index 263bb3cd3d..63a041fd29 100644 --- a/src/core/str_hash.h +++ b/src/core/str_hash.h @@ -56,7 +56,7 @@ struct str_hash_table{ /* returns 0 on success, <0 on failure */ inline static int str_hash_alloc(struct str_hash_table* ht, int size) { - ht->table=(struct str_hash_head*)pkg_malloc(sizeof(struct str_hash_head)*size); + ht->table=(struct str_hash_head*)pkg_mallocxz(sizeof(struct str_hash_head)*size); if (ht->table==0) { PKG_MEM_ERROR; return -1;

3 years

git:master:47b1b56e: dmq: fixes for changes in the 678f9c6ad8a8118741a921fcc01f9b23b5702c6e

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47b1b56e6cf86b2b6d74fdf4f292e8f2bf87f9fd URL: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T11:37:06+02:00 dmq: fixes for changes in the 678f9c6ad8a8118741a921fcc01f9b23b5702c6e - init the next field to first notification address str_list_t item - init local variables to avoid compile warnings on using garbage value - while condition on server_list instead of address of its ->s field (which always not null) - do not iterate using global dmq_notification_address_list variable, it shifts it till becomes NULL --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… Patch: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 79cc8ccbc9..27e950e472 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -387,6 +387,7 @@ static int dmq_add_notification_address(modparam_t type, void * val) } dmq_tmp_list = dmq_notification_address_list; dmq_tmp_list->s = tmp_str; + dmq_tmp_list->next = NULL; } else { dmq_tmp_list = append_str_list(tmp_str.s, tmp_str.len, &dmq_tmp_list, &total_list); if (dmq_tmp_list == NULL) { diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index ff8886d0ab..d40fd2cac2 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -284,7 +284,7 @@ dmq_node_t *add_server_and_notify(str_list_t *server_list) { char puri_data[MAXDMQHOSTS * (MAXDMQURILEN + 1)]; char *puri_list[MAXDMQHOSTS]; - dmq_node_t *pfirst, *pnode; + dmq_node_t *pfirst = NULL, *pnode = NULL; int host_cnt, index; sip_uri_t puri[1]; str pstr[1]; @@ -296,7 +296,7 @@ dmq_node_t *add_server_and_notify(str_list_t *server_list) **********/ if(!dmq_multi_notify) { - while (&server_list->s != NULL) { + while (server_list != NULL) { LM_DBG("adding notification node %.*s\n", server_list->s.len, server_list->s.s); pfirst = add_dmq_node(dmq_node_list, &server_list->s); @@ -592,6 +592,7 @@ int notification_resp_callback_f( { int ret; int nodes_recv; + str_list_t *slp; LM_DBG("notification_callback_f triggered [%p %d %p]\n", msg, code, param); if(code == 200) { @@ -605,15 +606,16 @@ int notification_resp_callback_f( } } else if(code == 408) { /* TODO this probably do not work for dmq_multi_notify */ - while (&dmq_notification_address_list->s != NULL) { - if(STR_EQ(node->orig_uri, dmq_notification_address_list->s)) { + slp = dmq_notification_address_list; + while (slp != NULL) { + if(STR_EQ(node->orig_uri, slp->s)) { LM_ERR("not deleting notification peer [%.*s]\n", - STR_FMT(&dmq_notification_address_list->s)); + STR_FMT(&slp->s)); update_dmq_node_status(dmq_node_list, node, DMQ_NODE_PENDING); return 0; } - dmq_notification_address_list = dmq_notification_address_list->next; - } + slp = slp->next; + } if (node->status == DMQ_NODE_DISABLED) { /* deleting node - the server did not respond */ LM_ERR("deleting server node %.*s because of failed request\n",

3 years

[kamailio/kamailio] not properly compassion (#2701)

by sergey-safarov

### Description I think something wrong with integer comparison when tested this config file ``` listen=udp:[::1]:5060 listen=udp:127.0.0.1:5060 loadmodule "xlog.so" loadmodule "sdpops.so" request_route { if (sdp_get_address_family() ieq 6 ) { xlog("L_WARN", "sdp_get_address_family == 6\n"); } else if (sdp_get_address_family() ieq 4) { xlog("L_WARN", "sdp_get_address_family == 4\n"); } else if (sdp_get_address_family() ieq 1) { xlog("L_WARN", "cannot detect sdp family\n"); } } ``` The expected output of IP address type used in SDP. But really I always get "cannot detect sdp family" message. -- 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/issues/2701

3 years, 1 month

git:master:1b47452c: pua_dialoginfo: skip requests that do not control call state

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1b47452cebb1b7866cbbabd5068a9ff4a39c86d2 URL: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-03T07:56:40+02:00 pua_dialoginfo: skip requests that do not control call state - GH #2700 --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… Patch: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index cb5969a23e..a146b52d19 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -270,6 +270,11 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para type, dlg, dlginfo); return; } + + /* skip requests that do not control call state */ + if((request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { + return; + } if(include_req_uri) { uri = dlginfo->req_uri; } else {

3 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021