- sr-dev - kamailio.org

git:master:50f92131: app_ruby: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 50f92131ac0a9f5dd1e19fb6e3636657ad996e37 URL: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_ruby: init timeval structures --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… Patch: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 41e6a3ec9e..116c4358ea 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -1421,7 +1421,7 @@ VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:e8583372: app_sqlang: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: e8583372cb1078a29bb6526c11f838e30811b94a URL: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:25+02:00 app_sqlang: init timeval structures --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… Patch: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 192e059e2e..7bff2a87d3 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1548,7 +1548,7 @@ int sr_kemi_sqlang_exec_func(HSQUIRRELVM J, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:e1369a4c: app_lua: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: e1369a4cf0c668a0ee40d3b84b9c6382c2168e49 URL: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_lua: init timeval structures --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… Patch: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 3fa131ca3a..f736bea98b 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -1605,7 +1605,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff; lua_Debug dinfo;

1 0

git:master:97991c9c: app_python: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 97991c9cf56ca034df914ae499053e597582ef80 URL: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_python: init timeval structures --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… Patch: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 43a47d28ad..586926428a 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -1783,7 +1783,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:cad5cc37: app_jsdt: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: cad5cc37c63477fbcf429af34e516b523c74132e URL: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_jsdt: init timeval structures --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… Patch: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ff4e629075..c41d1d2217 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1339,7 +1339,7 @@ int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb ={0}, tve = {0}; struct timezone tz; unsigned int tdiff; int sline = 0;

1 0

git:master:3bb1a30d: ctl: free send_buf in case of error
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 3bb1a30dda3b40ba2f188a4baab94ebda41f4a74 URL: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:08:56+02:00 ctl: free send_buf in case of error - disabled unused function --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… Patch: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 8c786a680a..5aed95c40f 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -223,7 +223,7 @@ static struct rpc_struct_l* grow_rpc_struct(struct rpc_struct_l *rs) #endif - +#if 0 /* appends buf to an already init. binrpc_pkt */ inline static int append_pkt_body(struct binrpc_pkt* p, unsigned char* buf, int len) @@ -247,7 +247,7 @@ inline static int append_pkt_body(struct binrpc_pkt* p, unsigned char* buf, error: return -1; /* buff. overflow */ } - +#endif inline static int append_iovec(struct iovec_array* a, unsigned char* buf, @@ -379,6 +379,9 @@ inline static int init_binrpc_ctx( struct binrpc_ctx* ctx, } /* we'll keep only the body */ err=binrpc_init_pkt(&ctx->out.pkt, send_buf, send_buf_len); + if(err!=0) { + ctl_free(send_buf); + } end: return err; }

1 0

git:master:62e822ce: core: use same condition for extra_params in create_via_hf()
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 62e822ce25e93a8183dd9e5e1fee517143849a6a URL: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T09:53:39+02:00 core: use same condition for extra_params in create_via_hf() --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… Patch: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index c3587d2e88..4622b264d5 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2992,12 +2992,14 @@ char* create_via_hf(unsigned int *len, /* params so far + ';rport' + '\0' */ via = (char*)pkg_malloc(extra_params.len+RPORT_LEN); if(via==0) { - PKG_MEM_ERROR; + PKG_MEM_ERROR; if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len!=0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } memcpy(via + extra_params.len, RPORT, RPORT_LEN-1); @@ -3018,8 +3020,10 @@ char* create_via_hf(unsigned int *len, if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len != 0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } memcpy(via + extra_params.len, sbuf, slen); @@ -3038,12 +3042,14 @@ char* create_via_hf(unsigned int *len, if(xparams.len>0) { via = (char*)pkg_malloc(extra_params.len+xparams.len+2); if(via==0) { - PKG_MEM_ERROR; + PKG_MEM_ERROR; if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len != 0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } /* add ';' between via parameters */

1 0

git:master:02c5f298: crypto: use same condition to free ttext.s on success or error
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 02c5f298d3355b7bb4c85bd290bc8265591f0ab8 URL: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T17:54:46+02:00 crypto: use same condition to free ttext.s on success or error --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… Patch: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 955bf264bf..2099b25148 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -284,16 +284,18 @@ static int ki_crypto_aes_encrypt_helper(sip_msg_t* msg, str *ins, str *keys, val.flags = PV_VAL_STR; dst->setf(msg, &dst->pvp, (int)EQ_T, &val); - free(etext.s); - if (! _crypto_key_derivation) + if (ttext.s != etext.s) { pkg_free(ttext.s); + } + free(etext.s); EVP_CIPHER_CTX_cleanup(en); EVP_CIPHER_CTX_free(en); return 1; error: - if (ttext.s != etext.s) + if (ttext.s != etext.s) { pkg_free(ttext.s); + } error1: free(etext.s); EVP_CIPHER_CTX_cleanup(en);

1 0

git:master:7652f796: core: rvalue - link to free at end of rve_opt_01() instead on replace
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 7652f79640b3e792baa77531e697fd74a1ab4584 URL: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T17:23:16+02:00 core: rvalue - link to free at end of rve_opt_01() instead on replace - debug mode messages print fields --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… Patch: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index f96f8ea536..902f3c2c66 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -3185,6 +3185,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) struct rvalue* rv; struct rval_expr* ct_rve; struct rval_expr* v_rve; + struct rval_expr* r_rve = NULL; int i; int ret; enum rval_expr_op op; @@ -3208,7 +3209,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) pos=(e)->fpos; \ *(e)=*(v); /* replace e with v (in-place) */ \ (e)->fpos=pos; \ - pkg_free((v)); /* rve_destroy(v_rve) would free everything*/ \ + r_rve = v; /* link to free it */ \ }else{\ /* unknown type or str => (int) $v */ \ (e)->op=RVE_##ctype##_OP; \ @@ -3564,9 +3565,11 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) } } if (rv) rval_destroy(rv); + if (r_rve) pkg_free(r_rve); /* rve_destroy(v_rve) would free everything*/ return ret; error: if (rv) rval_destroy(rv); + if (r_rve) pkg_free(r_rve); /* rve_destroy(v_rve) would free everything*/ return -1; }

1 0

git:master:4f7b5537: core: main - several optarg safety checks
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 4f7b5537688293d196669dd5a7d0124f7656cf2d URL: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T14:48:34+02:00 core: main - several optarg safety checks --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… Patch: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… --- diff --git a/src/main.c b/src/main.c index 6d363ba375..4dac30179c 100644 --- a/src/main.c +++ b/src/main.c @@ -2140,6 +2140,10 @@ int main(int argc, char** argv) /* ignore, they were parsed immediately after startup */ break; case 'f': + if (optarg == NULL) { + fprintf(stderr, "bad -f parameter\n"); + goto error; + } cfg_file=optarg; break; case 'c': @@ -2147,10 +2151,18 @@ int main(int argc, char** argv) log_stderr=1; /* force stderr logging */ break; case 'L': + if (optarg == NULL) { + fprintf(stderr, "bad -L parameter\n"); + goto error; + } mods_dir = optarg; mods_dir_cmd = 1; break; case 'm': + if (optarg == NULL) { + fprintf(stderr, "bad shared mem size\n"); + goto error; + } shm_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad shmem size number: -m %s\n", @@ -2188,6 +2200,10 @@ int main(int argc, char** argv) /* ignore it, was parsed immediately after startup */ break; case 'O': + if (optarg == NULL) { + fprintf(stderr, "bad -O parameter\n"); + goto error; + } scr_opt_lev=strtol(optarg, &tmp, 10); if (tmp &&(*tmp)){ fprintf(stderr, "bad optimization level: -O %s\n", @@ -2200,6 +2216,10 @@ int main(int argc, char** argv) user=optarg; break; case 'A': + if (optarg == NULL) { + fprintf(stderr, "bad -A parameter\n"); + goto error; + } p = strchr(optarg, '='); if(p) { tmp_len = p - optarg; @@ -2451,6 +2471,10 @@ int main(int argc, char** argv) takes priority over config */ break; case 'b': + if (optarg == NULL) { + fprintf(stderr, "bad -b parameter\n"); + goto error; + } maxbuffer=strtol(optarg, &tmp, 10); if (tmp &&(*tmp)){ fprintf(stderr, "bad max buffer size number: -b %s\n", @@ -2473,6 +2497,10 @@ int main(int argc, char** argv) #endif break; case 'l': + if (optarg == NULL) { + fprintf(stderr, "bad -l parameter\n"); + goto error; + } p = strrchr(optarg, '/'); if(p==NULL) { p = optarg; @@ -2522,6 +2550,10 @@ int main(int argc, char** argv) free_name_lst(n_lst); break; case 'n': + if (optarg == NULL) { + fprintf(stderr, "bad -n parameter\n"); + goto error; + } children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -n %s\n", @@ -2548,6 +2580,10 @@ int main(int argc, char** argv) "TCP support disabled\n", optarg); goto error; } + if (optarg == NULL) { + fprintf(stderr, "bad -N parameter\n"); + goto error; + } tcp_cfg_children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -N %s\n", @@ -2560,6 +2596,10 @@ int main(int argc, char** argv) break; case 'W': #ifdef USE_TCP + if (optarg == NULL) { + fprintf(stderr, "bad -W parameter\n"); + goto error; + } tcp_poll_method=get_poll_type(optarg); if (tcp_poll_method==POLL_NONE){ fprintf(stderr, "bad poll method name: -W %s\ntry " @@ -2577,6 +2617,10 @@ int main(int argc, char** argv) "SCTP support disabled\n", optarg); goto error; } + if (optarg == NULL) { + fprintf(stderr, "bad -Q parameter\n"); + goto error; + } sctp_children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -O %s\n",

1 0

git:master:e770e0aa: core: rvalue - function to destroy content of rval without freeing it
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: e770e0aa6889f001a3f7f2644202bf106f6559da URL: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T15:23:21+02:00 core: rvalue - function to destroy content of rval without freeing it - needed in case of rval reuse in rve_replace_with_val() --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… Patch: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 22393057fb..f96f8ea536 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -112,10 +112,7 @@ inline static void rval_force_clean(struct rvalue* rv) -/** frees a rval returned by rval_new(), rval_convert() or rval_expr_eval(). - * Note: it will be freed only when refcnt reaches 0 - */ -void rval_destroy(struct rvalue* rv) +static inline void rval_destroy_helper(struct rvalue* rv, int allocated) { if (rv && rv_unref(rv)){ rval_force_clean(rv); @@ -126,13 +123,38 @@ void rval_destroy(struct rvalue* rv) regfree(rv->v.re.regex); } if (rv->flags & RV_RV_ALLOCED_F){ - pkg_free(rv); + if(likely(allocated)) { + pkg_free(rv); + } else { + /* not expected to be allocated */ + abort(); /* abort, otherwise is lost - find bugs quicker */ + } } } } +/** frees a rval returned by rval_new(), rval_convert() or rval_expr_eval(). + * Note: it will be freed only when refcnt reaches 0 + */ +void rval_destroy(struct rvalue* rv) +{ + rval_destroy_helper(rv, 1); +} + + + +/** frees content of rval which is not allocated, otherwise aborts. + * Note: it will be freed only when refcnt reaches 0 + */ +void rval_destroy_content(struct rvalue* rv) +{ + rval_destroy_helper(rv, 0); +} + + + void rval_clean(struct rvalue* rv) { if (rv_unref(rv)) @@ -1523,7 +1545,7 @@ inline static int int_strop1(int* res, enum rval_expr_op op, str* s1) } - +#if 0 /** integer operation: ret= op v (returns a rvalue). * @return rvalue on success, 0 on error */ @@ -1619,7 +1641,7 @@ inline static struct rvalue* rval_intop2(struct run_act_ctx* h, rval_destroy(rv2); return 0; } - +#endif /* #if 0 */ /** string add operation: ret= l . r (returns a rvalue). @@ -3024,7 +3046,7 @@ static int rve_replace_with_val(struct rval_expr* rve, enum rval_type type, refcnt=rve->left.rval.refcnt; abort(); /* find bugs quicker -- andrei */ } - rval_destroy(&rve->left.rval); + rval_destroy_content(&rve->left.rval); } rval_init(&rve->left.rval, type, v, flags); rve->left.rval.refcnt=refcnt; @@ -3096,7 +3118,7 @@ static int fix_match_rve(struct rval_expr* rve) /* fixup the right side (RE) */ if (rve_is_constant(rve->right.rve)){ if ((rve_guess_type(rve->right.rve)!=RV_STR)){ - LM_ERR("fixup failure(%d,%d-%d,%d): left side of =~ is not string" + LM_ERR("fixup failure(%d,%d-%d,%d): right side of =~ is not string" " (%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col, rve->right.rve->fpos.s_line, @@ -3104,7 +3126,7 @@ static int fix_match_rve(struct rval_expr* rve) goto error; } if ((rv=rval_expr_eval(0, 0, rve->right.rve))==0){ - LM_ERR("fixup failure(%d,%d-%d,%d): bad RE expression\n", + LM_ERR("fixup failure(%d,%d-%d,%d): bad RE expression\n", rve->right.rve->fpos.s_line, rve->right.rve->fpos.s_col, rve->right.rve->fpos.e_line, rve->right.rve->fpos.e_col); goto error;

1 0

git:master:26ab0fcc: uac: do not free chunks already inserted as lumps
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 26ab0fcc97cbf0d6602454e60187a914f13424a2 URL: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T12:17:35+02:00 uac: do not free chunks already inserted as lumps - in case of errors happening later, the pointers are linked in sip_msg_t and will be freed there, otherwise will result in a double free --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… Patch: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 3a476a3d82..6e77eafe94 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -875,7 +875,7 @@ static void replace_callback(struct dlg_cell *dlg, int type, str old_uri; str* new_uri; str* new_display; - str buf; + str buf = STR_NULL; char *p; unsigned int uac_flag; int dlgvar_index = 0; @@ -968,11 +968,13 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free1; + pkg_free(buf.s); + return; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free1; + pkg_free(buf.s); + return; } } @@ -980,20 +982,22 @@ static void replace_callback(struct dlg_cell *dlg, int type, p = pkg_malloc( new_uri->len); if (!p) { PKG_MEM_ERROR; - goto free1; + return; } - memcpy( p, new_uri->s, new_uri->len); + memcpy(p, new_uri->s, new_uri->len); /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + l = del_lump(msg, old_uri.s-msg->buf, old_uri.len, 0); if (l==0) { LM_ERR("del lump failed\n"); - goto free2; + pkg_free(p); + return; } if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { LM_ERR("insert new lump failed\n"); - goto free2; + pkg_free(p); + return; } /* register tm callback to change replies, @@ -1007,12 +1011,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, msg->msg_flags |= uac_flag; return; - -free2: - pkg_free(p); - -free1: - pkg_free(buf.s); }

1 0

git:master:ddafeebf: core/mem: tlsf malloc - sync'ed with v3.1
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: ddafeebfaf1537c684eee22be228867563dd02ac URL: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T08:34:48+02:00 core/mem: tlsf malloc - sync'ed with v3.1 - tlsf malloc project: https://github.com/mattconte/tlsf - last commit when sync'ed: - https://github.com/mattconte/tlsf/commit/deff9ab509341f264addbd3c8ada533678… --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867… Patch: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867…

1 0

git:master:2d7aee50: core/mem: removed tlsf_malloc_bits.h
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 2d7aee506c617f2d258719562f8debf2b4ba087e URL: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T08:38:16+02:00 core/mem: removed tlsf_malloc_bits.h - no longer needed after sync with v3.1 --- Removed: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… Patch: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h deleted file mode 100644 index 29c783d4a4..0000000000 --- a/src/core/mem/tlsf_malloc_bits.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef INCLUDED_tlsfbits -#define INCLUDED_tlsfbits - -#if defined(__cplusplus) -#define tlsf_decl inline -#else -#define tlsf_decl static -#endif - -/* -** Architecture-specific bit manipulation routines. -** -** TLSF achieves O(1) cost for malloc and free operations by limiting -** the search for a free block to a free list of guaranteed size -** adequate to fulfill the request, combined with efficient free list -** queries using bitmasks and architecture-specific bit-manipulation -** routines. -** -** Most modern processors provide instructions to count leading zeroes -** in a word, find the lowest and highest set bit, etc. These -** specific implementations will be used when available, falling back -** to a reasonably efficient generic implementation. -** -** NOTE: TLSF spec relies on ffs/fls returning value 0..31. -** ffs/fls return 1-32 by default, returning 0 for error. -*/ - -/* -** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) -** architecture. There is no reliable portable method at compile-time. -*/ -#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ - || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) -#define TLSF_64BIT -#endif - -/* -** gcc 3.4 and above have builtin support, specialized for architecture. -** Some compilers masquerade as gcc; patchlevel test filters them out. -** -** Note: clang is compatible with GCC builtins and will also define those macros -*/ -#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ - && defined (__GNUC_PATCHLEVEL__) - -tlsf_decl int tlsf_ffs(unsigned int word) -{ - return __builtin_ffs(word) - 1; -} - -tlsf_decl int tlsf_fls(unsigned int word) -{ - const int bit = word ? 32 - __builtin_clz(word) : 0; - return bit - 1; -} - -#if defined (TLSF_64BIT) -tlsf_decl int tlsf_fls_sizet(size_t size) -{ - const int bit = size ? 64 - __builtin_clzl(size) : 0; - return bit - 1; -} -#endif -#else -/* Fall back to generic implementation. */ - -tlsf_decl int tlsf_fls_generic(unsigned int word) -{ - int bit = 32; - - if (!word) bit -= 1; - if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } - if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } - if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } - if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } - if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } - - return bit; -} - -/* Implement ffs in terms of fls. */ -tlsf_decl int tlsf_ffs(unsigned int word) -{ - return tlsf_fls_generic(word & (~word + 1)) - 1; -} - -tlsf_decl int tlsf_fls(unsigned int word) -{ - return tlsf_fls_generic(word) - 1; -} - -#if defined (TLSF_64BIT) -tlsf_decl int tlsf_fls_sizet(size_t size) -{ - int high = (int)(size >> 32); - int bits = 0; - if (high) - { - bits = 32 + tlsf_fls(high); - } - else - { - bits = tlsf_fls((int)size & 0xffffffff); - - } - return bits; -} -#endif /* defined (TLSF_64BIT) */ - -#endif /* GNUC */ - - -#if !defined (TLSF_64BIT) -#define tlsf_fls_sizet tlsf_fls -#endif - -#undef tlsf_decl - -#endif

1 0

[kamailio/kamailio] Add display name support to "pua_dialoginfo" (#2615)
by Jake Greene 05 Apr '21

05 Apr '21

### Description It doesn't look like the "pua_dialoginfo" module has support for the "display" attribute in the identity tag. This tag is used by some phones to update the phone display with caller/callee information for the respective key. I'm wondering how difficult it would be to add this feature. Thanks in advance for anyone who reads this! ### Expected behavior Kamailio includes display attribute in identity tags in generated publish messages. <pre> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="1" state="full"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" remote-tag="456887766" direction="initiator"> <state>early</state> <local> <identity <b><i>display="Alice"</i></b>>sip:alice@example.com</identity> <target uri="sip:alice@phone11.example.com"/> </local> <remote> <identity <b><i>display="Bob"</i></b>>sip:bob@example.org</identity> <target uri="sip:bobster@phone21.example.org"/> </remote> </dialog> </dialog-info> </pre> #### Actual observed behavior Kamailio generates a publish request for dialog events similar to the one below. The display attribute is not included in the "identity" tags. This means that when a notify message is sent to a watcher for this publish, the name is not rendered on the phone display. <pre> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="1" state="full"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" remote-tag="456887766" direction="initiator"> <state>early</state> <local> <b><identity>sip:alice@example.com</identity></b> <target uri="sip:alice@phone11.example.com"/> </local> <remote> <b><identity>sip:bob@example.org</identity></b> <target uri="sip:bobster@phone21.example.org"/> </remote> </dialog> </dialog-info> </pre> ### Possible Solutions I added a small modification to the module as a POC and it works as expected. With the following modification, the phone display is updated with the string in the “display” attribute. I added line 191-193 below, between lines 190 & 191 on the current master branch. The example below shows the “remote” tag, I also did the same thing for the local tag a few more lines down. <pre> 184 tag_node = xmlNewChild(remote_node, NULL, BAD_CAST "identity", 185 BAD_CAST buf) ; 186 if( tag_node ==NULL) 187 { 188 LM_ERR("while adding childn"); 189 goto error; 190 } 191 /* Testing - adding display attribute to the identity tag */ 192 xmlNewProp(tag_node, BAD_CAST "display", BAD_CAST "RemoteCallerName"); 193 /* */ 195 196 tag_node = xmlNewChild(remote_node, NULL, BAD_CAST "target", NULL); 197 if( tag_node ==NULL) </pre> Here is a link to the file in the module I’m referring to: https://github.com/kamailio/kamailio/blob/master/src/modules/pua_dialoginfo… I don’t really have any professional experience writing C code, and I was unable to identify a way to grab this string from the “From” header. Unfortunately, because I would have really loved to give this feature back to the community! ### Additional Information Thank you so much for this amazing software. I absolutely adore Kamailio! If someone is interested in this, please let me know if there is anything I can do to help. -- 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/2615

2 6

git:master:9c239dc3: core: checks for trying to define empty or null ids
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

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",

1 0

git:master:a749cc53: tm: init timeval structs
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: a749cc53ac4aa4825ba8d720825db856d897efb2 URL: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T18:06:01+02:00 tm: init timeval structs --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… Patch: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index c8dd0c91ce..a46921cbfd 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1005,8 +1005,8 @@ int run_failure_handlers(tm_cell_t *t, struct sip_msg *rpl, struct sip_msg *shmem_msg = t->uas.request; int on_failure; sr_kemi_eng_t *keng = NULL; - struct timeval tvb; - struct timeval tve; + struct timeval tvb = {0}; + struct timeval tve = {0}; unsigned long tvd = 0; unsigned int t_hash_index = 0; unsigned int t_label = 0;

1 0

git:master:ef31c82a: core: cfg.len - sanitizer safety check of target buffer
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

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;

1 0

git:master:c08620f6: imc: expect the second param only if first is set
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

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");

1 0

git:master:ca182183: core: fixed condition for 0 ID or NULL NAME AVP
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

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; }

1 0

git:master:36abe25e: crypto: fix use of uninitialized values introduced by b08fd55ddd598115a3b69afc630403a582d239f2
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

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) {

1 0

git:master:47b1b56e: dmq: fixes for changes in the 678f9c6ad8a8118741a921fcc01f9b23b5702c6e
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

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",

1 0

git:master:ba9f2b5a: core: init allocated memory in str_hash_alloc()
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

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;

1 0

git:master:1536f4bb: .gitignore: ignore files that can be generated by compiling tools
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

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

1 0

[kamailio/kamailio] not properly compassion (#2701)
by sergey-safarov 03 Apr '21

03 Apr '21

### 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

2 4

git:master:b7f753dd: core: parse uri - check for invalid port values
by Daniel-Constantin Mierla 03 Apr '21

03 Apr '21

Module: kamailio Branch: master Commit: b7f753ddc727e1d7ab42e7abe607059e03976f8d URL: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-03T07:55:11+02:00 core: parse uri - check for invalid port values --- Modified: src/core/config.h Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… Patch: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… --- diff --git a/src/core/config.h b/src/core/config.h index e54413b5bc..e012e98edf 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -96,6 +96,7 @@ #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1) +#define MAX_PORT_VAL 65535 #define MAX_PORT_LEN 7 /* ':' + max 5 letters + \0 */ #define CRLF "\r\n" diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 2c24054d2c..19f6f2e02a 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -143,6 +143,9 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) #define case_port( ch, var) \ case ch: \ (var)=(var)*10+ch-'0'; \ + if((var) > MAX_PORT_VAL) { \ + goto error_bad_port; \ + }\ break #define still_at_user \

1 0

git:master:1b47452c: pua_dialoginfo: skip requests that do not control call state
by Daniel-Constantin Mierla 03 Apr '21

03 Apr '21

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 {

1 0

[kamailio/kamailio] siptrace: duplicate_uri with multiple values (#2693)
by sergey-safarov 02 Apr '21

02 Apr '21

### Description As admin, I want check TLS encrypted call signaling on local Kamailio. To do this I can use [this instruction](https://voipembedded.wordpress.com/2021/03/22/troubleshooting-…. Here used `siptrace` module. But at the same time, I need to send the same call signaling to the company `Homer` server. So I need to send a copy of the call signaling in two directions. Could you add the ability to allow specify multiple values in `duplicate_uri` param like. ``` modparam("siptrace", "duplicate_uri", "<sip:127.0.0.1:9060>,<sip:homer.example.com:9060>") ``` -- 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/2693

3 7

git:master:9413fc63: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: 9413fc6399d7e9b791ed0cb53172ab5fd887f0f6 URL: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-02T10:16:13+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… Patch: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 656a9315f2..783b57ba57 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -46,8 +46,8 @@ Frederic Gaisnon 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 4. Functions @@ -75,11 +75,11 @@ Frederic Gaisnon 1.10. Set contact_host parameter 1.11. Set contact_mode parameter 1.12. Set cparam_name parameter - 1.13. Set xavu_filed_a_contact parameter + 1.13. Set xavu_cfg parameter 1.14. Set xavu_filed_a_contact parameter 1.15. Set xavu_filed_b_contact parameter - 1.16. Set rr_update parameter - 1.17. Set xavu_field_contact_host parameter + 1.16. Set xavu_field_contact_host parameter + 1.17. Set rr_update parameter 1.18. Set context parameter 1.19. tps_set_context usage 1.20. Usage of event_route[topos:msg-outgoing] @@ -114,8 +114,8 @@ Chapter 1. Admin Guide 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 4. Functions @@ -184,8 +184,8 @@ Chapter 1. Admin Guide 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 3.1. storage (str) @@ -385,7 +385,7 @@ modparam("topos", "cparam_name", "xyz") Default value is “NULL” (disabled). - Example 1.13. Set xavu_filed_a_contact parameter + Example 1.13. Set xavu_cfg parameter ... modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_filed_a_contact", "a_contact") @@ -426,19 +426,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") ... -3.16. rr_update (int) - - If set to 1, topos module will track and update record route changes on - re-invite. - - Default value is 0 (do not update record route changes within dialog). - - Example 1.16. Set rr_update parameter -... -modparam("topos", "rr_update", 1) -... - -3.17. xavu_field_contact_host (str) +3.16. xavu_field_contact_host (str) Control from where to take the host part of the Contact header added by topos. This parameter allows to take the value from an XAVU during @@ -450,7 +438,7 @@ modparam("topos", "rr_update", 1) Default value is empty, not set. - Example 1.17. Set xavu_field_contact_host parameter + Example 1.16. Set xavu_field_contact_host parameter ... modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_contact_host", "contact_host") @@ -458,6 +446,18 @@ modparam("topos", "xavu_contact_host", "contact_host") $xavu(_tps_=>contact_host) = "kamailio.org"; ... +3.17. rr_update (int) + + If set to 1, topos module will track and update record route changes on + re-invite. + + Default value is 0 (do not update record route changes within dialog). + + Example 1.17. Set rr_update parameter +... +modparam("topos", "rr_update", 1) +... + 3.18. context (str) Set the global context for topos instance.

1 0

git:master:a877e707: topos: docs - fixed title for xavu_cfg example [skip ci]
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: a877e707c7768307886c67a8c64a5c524eac06f4 URL: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T10:11:01+02:00 topos: docs - fixed title for xavu_cfg example [skip ci] - groupped xavu parameters --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… Patch: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index ba622f13a6..b13902929f 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -393,7 +393,7 @@ modparam("topos", "cparam_name", "xyz") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_a_contact</varname> parameter</title> + <title>Set <varname>xavu_cfg</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") @@ -449,26 +449,6 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "..."; -... -</programlisting> - </example> - </section> - <section id="topos.p.rr_update"> - <title><varname>rr_update</varname> (int)</title> - <para> - If set to 1, topos module will track and update record - route changes on re-invite. - </para> - <para> - <emphasis> - Default value is 0 (do not update record route changes within dialog). - </emphasis> - </para> - <example> - <title>Set <varname>rr_update</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("topos", "rr_update", 1) ... </programlisting> </example> @@ -500,6 +480,26 @@ modparam("topos", "xavu_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ... +</programlisting> + </example> + </section> + <section id="topos.p.rr_update"> + <title><varname>rr_update</varname> (int)</title> + <para> + If set to 1, topos module will track and update record + route changes on re-invite. + </para> + <para> + <emphasis> + Default value is 0 (do not update record route changes within dialog). + </emphasis> + </para> + <example> + <title>Set <varname>rr_update</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "rr_update", 1) +... </programlisting> </example> </section>

1 0

git:master:f95ede23: dmq: access val after being tested for null
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: f95ede239474f8c3b901f83e7eb34cbfa8f0e0fd URL: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T10:04:10+02:00 dmq: access val after being tested for null --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… Patch: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 7d343b193b..79cc8ccbc9 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -365,14 +365,14 @@ static void destroy(void) static int dmq_add_notification_address(modparam_t type, void * val) { str tmp_str; - tmp_str.s = ((str*) val)->s; - tmp_str.len = ((str*) val)->len; int total_list = 0; /* not used */ if(val==NULL) { LM_ERR("invalid notification address parameter value\n"); return -1; } + tmp_str.s = ((str*) val)->s; + tmp_str.len = ((str*) val)->len; if(parse_uri(tmp_str.s, tmp_str.len, &dmq_notification_uri) < 0) { LM_ERR("could not parse notification address\n"); return -1;

1 0

git:master:d4e31e6a: core: parse uri - cast to unsigned for left shifting
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: d4e31e6ae494836c49e50f463517a576b18c5611 URL: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T09:38:55+02:00 core: parse uri - cast to unsigned for left shifting --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… Patch: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index ec39ea7cf2..2c24054d2c 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -26,6 +26,8 @@ */ +#include <stdint.h> + #include "../globals.h" #include "parse_uri.h" #include <string.h> @@ -124,7 +126,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) char* pass; int found_user; int error_headers; - unsigned int scheme; + uint32_t scheme; uri_type backup_urit; uri_flags backup_urif; @@ -386,9 +388,10 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) port_no=0; state=URI_INIT; memset(uri, 0, sizeof(struct sip_uri)); /* zero it all, just to be sure*/ - /*look for sip:, sips: ,tel: or urn:*/ + /*look for sip:, sips:, tel: or urn:*/ if (len<5) goto error_too_short; - scheme=buf[0]+(buf[1]<<8)+(buf[2]<<16)+(buf[3]<<24); + scheme=((uint32_t)buf[0]) + (((uint32_t)buf[1])<<8) + + (((uint32_t)buf[2])<<16) + (((uint32_t)buf[3])<<24); scheme|=0x20202020; if (scheme==SIP_SCH){ uri->type=SIP_URI_T;

1 0

[CRON] Still Failing: dbank888/kamailio#130 (master - 491e19e)
by Travis CI 01 Apr '21

01 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #130 Status: Still Failing Duration: 6 mins and 17 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/765550934?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:f21ad75e: pkg/kamailio/deb: set version 5.5.0~pre0
by Victor Seva 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: f21ad75e1f86f353cc9cdf6d21c9ee2b74e9eb6c URL: https://github.com/kamailio/kamailio/commit/f21ad75e1f86f353cc9cdf6d21c9ee2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-01T19:07:42+02:00 pkg/kamailio/deb: set version 5.5.0~pre0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/f21ad75e1f86f353cc9cdf6d21c9ee2… Patch: https://github.com/kamailio/kamailio/commit/f21ad75e1f86f353cc9cdf6d21c9ee2…

1 0

git:master:a07de1e2: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: a07de1e2b892537c46879b4d744bff86af24e5e8 URL: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-01T17:01:14+02:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8… Patch: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8…

1 0

[kamailio/kamailio] acc_json: param to accept pre-encoded json values (#2699)
by Julien Chavanton 01 Apr '21

01 Apr '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Description New parameter to add json in an accounting/CDR field and prevent unwanted json escaping. Example: ``` modparam("acc_json", "acc_extra", "json_data=$avp(json_data);") modparam("acc_json", "acc_json_pre_encoded_prefix", "json_") ... $avp(json_data) = '{"b":2, "c":3}'; ... ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2699 -- Commit Summary -- * acc_json: param to accept pre-encoded json values -- File Changes -- M src/modules/acc_json/acc_json_mod.c (55) M src/modules/acc_json/doc/acc_json_admin.xml (43) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2699.patch https://github.com/kamailio/kamailio/pull/2699.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/2699

2 3

git:master:c45d65ba: acc_json: param to accept pre-encoded json values (#2699)
by GitHub 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: c45d65ba1413ff2ca617d5fa1cf6cb391ffb1734 URL: https://github.com/kamailio/kamailio/commit/c45d65ba1413ff2ca617d5fa1cf6cb3… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-04-01T07:50:40-07:00 acc_json: param to accept pre-encoded json values (#2699) --- Modified: src/modules/acc_json/acc_json_mod.c Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c45d65ba1413ff2ca617d5fa1cf6cb3… Patch: https://github.com/kamailio/kamailio/commit/c45d65ba1413ff2ca617d5fa1cf6cb3…

1 0

Re: [sr-dev] [kamailio/kamailio] pkg/kamailio/deb: add lwsc module (f892b9a)
by Richard Fuchs 01 Apr '21

01 Apr '21

@linuxmaniac for your consideration -- 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/commit/f892b9a351cab6f7556113b531dfe22…

1 0

[kamailio/kamailio] dispatcher algorithm 11, no more than 25 hosts in group for proper distribution (#2698)
by E1isIvan 01 Apr '21

01 Apr '21

### Description We tried to load share 50+ media servers using dispatching algorithm 11 and faced an unexpected behavior when most calls go to very first host in the group. ### Troubleshooting I tried to start Kamailio like this: sudo kamailio -f /etc/kamailio/kamailio.cfg -E -d 5 -u 995 but errors were the same when dispatcher group had more than 25 and less than 25 hosts It was tried different combinations of dispatcher list host group configuration: 100 sip:10.60.27.123:7000 10 rweight=50 100 sip:10.60.27.123:7000 10 weight=50;rweight=50 100 sip:10.60.27.123:7000 rweight=50,maxload=80 When making 100 calls the quarter of them go to the first host in the group. #### Reproduction modparam("dispatcher", "list_file", "/etc/kamailio/dispatcher.list") modparam("dispatcher", "flags", 2) modparam("dispatcher", "ds_ping_method", "OPTIONS") modparam("dispatcher", "ds_probing_threshold", 3) modparam("dispatcher", "ds_inactive_threshold", 10) modparam("dispatcher", "ds_probing_mode", 3) modparam("dispatcher", "ds_ping_interval", 10) modparam("dispatcher", "ds_ping_reply_codes", "501,403,404,400,200") modparam("dispatcher", "ds_ping_from",DS_PING_FROM_PARAM) modparam("dispatcher", "use_default", 0) if ( ds_is_from_list("101")) { sl_send_reply("100","My calls"); ds_select_dst("100", "11"); return; } Dispatcher group must have more than 25 hosts, if equal or less than 25 than it is Ok: 100 sip:10.60.27.123:7000 0 10 rweight=50 100 sip:10.60.27.123:7001 0 10 rweight=50 100 sip:10.60.27.123:7002 0 10 rweight=50 100 sip:10.60.27.123:7003 0 10 rweight=50 100 sip:10.60.27.123:7004 0 10 rweight=50 100 sip:10.60.27.123:7005 0 10 rweight=50 100 sip:10.60.27.123:7006 0 10 rweight=50 100 sip:10.60.27.123:7007 0 10 rweight=50 100 sip:10.60.27.123:7008 0 10 rweight=50 100 sip:10.60.27.123:7009 0 10 rweight=50 100 sip:10.60.27.123:7010 0 10 rweight=50 100 sip:10.60.27.123:7011 0 10 rweight=50 100 sip:10.60.27.123:7012 0 10 rweight=50 100 sip:10.60.27.123:7013 0 10 rweight=50 100 sip:10.60.27.123:7014 0 10 rweight=50 100 sip:10.60.27.123:7015 0 10 rweight=50 100 sip:10.60.27.123:7016 0 10 rweight=50 100 sip:10.60.27.123:7017 0 10 rweight=50 100 sip:10.60.27.123:7018 0 10 rweight=50 100 sip:10.60.27.123:7019 0 10 rweight=50 100 sip:10.60.27.123:7020 0 10 rweight=50 100 sip:10.60.27.123:7021 0 10 rweight=50 100 sip:10.60.27.123:7022 0 10 rweight=50 100 sip:10.60.27.123:7023 0 10 rweight=50 100 sip:10.60.27.123:7024 0 10 rweight=50 To emulate call load and multiple media servers, SIPp scenarios were used. #### Debugging Data #### Log Messages #### SIP Traffic No specific traffic, regular INVITE messages having international numbers. ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.4.4 (x86_64/linux) e16352 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e16352 compiled on 15:56:46 Feb 15 2021 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.7.1908 (Core) Linux test-carrier-1.prd.tc5.ams.nl.kwebbl.loc 3.10.0-1062.4.1.el7.x86_64 #1 SMP Fri Oct 18 17:15:30 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2698

5 13

[kamailio/kamailio] Adds initial fuzzer for integration with oss-fuzz. (#2660)
by DavidKorczynski 01 Apr '21

01 Apr '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hi Maintainers, I have worked a bit on setting fuzzing up for Kamailio by way of OSS-Fuzz. Essentially, OSS-Fuzz is a free service run by Google that performs continuous fuzzing of important open source projects, and it would be great to have Kamailio integrated. The only expectation of integrating into OSS-Fuzz is that bugs will be fixed. This is not a "hard" requirement in that no one enforces this and the main point is if bugs are not fixed then it is a waste of resources to run the fuzzers, which we would like to avoid. In this PR https://github.com/google/oss-fuzz/pull/5279 I have done exactly that, namely created the necessary logic from an OSS-Fuzz perspective to integrate Kamailio. If you would like to integrate, could you please provide a set of email(s) that will get access to the data produced by OSS-Fuzz, such as bug reports, coverage reports and more stats. The emails should be linked to a Google account in order to view the detailed reports and notice the emails affiliated with the project will be public in the OSS-Fuzz repo, as they will be part of a configuration file. At the moment I stored the fuzzers in the Google OSS-Fuzz repository, but we can move them up here to make maintenance easier. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2660 -- Commit Summary -- * Adds initial fuzzer for integration with oss-fuzz. -- File Changes -- A fuzz/fuzz_uri.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2660.patch https://github.com/kamailio/kamailio/pull/2660.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/2660

3 8

git:master:161c6723: Makefile.defs: version set to 5.5.0-dev6
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 161c67236bcd0f9844f02fe4f0b5ed302f431de9 URL: https://github.com/kamailio/kamailio/commit/161c67236bcd0f9844f02fe4f0b5ed3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T11:48:20+02:00 Makefile.defs: version set to 5.5.0-dev6 - development for 5.5 series is closed --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/161c67236bcd0f9844f02fe4f0b5ed3… Patch: https://github.com/kamailio/kamailio/commit/161c67236bcd0f9844f02fe4f0b5ed3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 4f5c61ad3f..46a7b10e21 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:2f1067f0: Makefile.defs: version set to 5.5.0-pre0
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 2f1067f010dd497c7a348c9f2233b318b9d7c663 URL: https://github.com/kamailio/kamailio/commit/2f1067f010dd497c7a348c9f2233b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T11:49:26+02:00 Makefile.defs: version set to 5.5.0-pre0 - starting of testing phase for 5.5 series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2f1067f010dd497c7a348c9f2233b31… Patch: https://github.com/kamailio/kamailio/commit/2f1067f010dd497c7a348c9f2233b31… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 46a7b10e21..1d8e131e12 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] Kamailio 5.0.4 extremely slow carrierroute preloading (#2653)
by NiteCrwlr 01 Apr '21

01 Apr '21

### Description Carrierroute module takes now 16 minutes to load about 50'000 entries from postgres-db. In version 5.0.3 it was 10 seconds from the same db. ### Troubleshooting #### Reproduction Install kamailio 5.0.3 and fill your carrierroute table with thousands of entries. See how fast its loaded. Then install 5.0.4 and see how long it takes now. You can observe the query "SELECT * FROM carrierroute WHERE carrier=1 and domain=1 and prob>0" multiple times in the postgres-db log. #### Debugging Data none. #### Log Messages not needed. #### SIP Traffic not needed. ### Possible Solutions Perhaps try to do the check "in-memory" instead generate a new sql-query. ### Additional Information This bug exists in Kamilio versions >=5.0.4 and is (potentially) introduced by: commit 9800aba65146b72623bb512049300d1beb8c8ec4 Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: Tue Sep 12 15:37:17 2017 +0200 carrierroute: warning for the same carrier/domain having routes with only 0 probability - While starting kamailio or reloading the routes, if the same carrier/domain pairs do not have any route with a probability other than 0 (zero) then an error log will be printed on the screen. Besides, the log "invalid dice_max value" in the cr_func.c has been made more clear. (cherry picked from commit 9741bee7af8136b35af8e6279e530aa0ad54f574) * **Operating System**: Ubuntu 20.04.2 LTS Linux 5.4.0-66-generic #74-Ubuntu SMP Wed Jan 27 22:54:38 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux -- 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/2653

8 21

git:master:52d89a4d: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 52d89a4d6a11f8d5d660fc871c9f5e79d5075e75 URL: https://github.com/kamailio/kamailio/commit/52d89a4d6a11f8d5d660fc871c9f5e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-01T09:16:14+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/52d89a4d6a11f8d5d660fc871c9f5e7… Patch: https://github.com/kamailio/kamailio/commit/52d89a4d6a11f8d5d660fc871c9f5e7…

1 0

git:master:e90bfa7c: topos: docs for inbound event routes and context
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: e90bfa7cc3b5e3cd23e4071d811277c5f94ddd6d URL: https://github.com/kamailio/kamailio/commit/e90bfa7cc3b5e3cd23e4071d811277c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T09:12:16+02:00 topos: docs for inbound event routes and context --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e90bfa7cc3b5e3cd23e4071d811277c… Patch: https://github.com/kamailio/kamailio/commit/e90bfa7cc3b5e3cd23e4071d811277c…

1 0

git:master:c030fc52: topos: use xavu instead of avp
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: c030fc5231d2a6534867e90b412c15e7a9db7a98 URL: https://github.com/kamailio/kamailio/commit/c030fc5231d2a6534867e90b412c15e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T08:40:25+02:00 topos: use xavu instead of avp - replaced params refering to avp with corresponding xavp alternatives --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/c030fc5231d2a6534867e90b412c15e… Patch: https://github.com/kamailio/kamailio/commit/c030fc5231d2a6534867e90b412c15e…

1 0

git:master:7a3ad547: topos: docs updated for xavu replacing avp parameters
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 7a3ad54711c855ab209ef23f08c34902f5dac9a8 URL: https://github.com/kamailio/kamailio/commit/7a3ad54711c855ab209ef23f08c3490… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T08:56:29+02:00 topos: docs updated for xavu replacing avp parameters --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7a3ad54711c855ab209ef23f08c3490… Patch: https://github.com/kamailio/kamailio/commit/7a3ad54711c855ab209ef23f08c3490…

1 0

git:master:2b48eadb: core: $xavu() helper functions to get child values
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 2b48eadb445706d24542d1132c608e5821e68a92 URL: https://github.com/kamailio/kamailio/commit/2b48eadb445706d24542d1132c608e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T07:56:30+02:00 core: $xavu() helper functions to get child values - like for xavp and xavi --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/2b48eadb445706d24542d1132c608e5… Patch: https://github.com/kamailio/kamailio/commit/2b48eadb445706d24542d1132c608e5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 26e89a8df3..b11b99929d 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1448,6 +1448,56 @@ sr_xavp_t *xavu_set_child_sval(str *rname, str *cname, str *sval) return xavu_set_child_xval(rname, cname, &xval); } +/** + * return child node of an xavp + * - $xavu(rname=>cname) + */ +sr_xavp_t* xavu_get_child(str *rname, str *cname) +{ + sr_xavp_t *ravp=NULL; + + ravp = xavu_get(rname, NULL); + if(ravp==NULL || ravp->val.type!=SR_XTYPE_XAVP) + return NULL; + + return xavu_get(cname, ravp->val.v.xavp); +} + + +/** + * return child node of an xavp if it has int value + * - $xavu(rname=>cname) + */ +sr_xavp_t* xavu_get_child_with_ival(str *rname, str *cname) +{ + sr_xavp_t *vavp=NULL; + + vavp = xavu_get_child(rname, cname); + + if(vavp==NULL || vavp->val.type!=SR_XTYPE_INT) + return NULL; + + return vavp; +} + + +/** + * return child node of an xavp if it has string value + * - $xavu(rname=>cname) + */ +sr_xavp_t* xavu_get_child_with_sval(str *rname, str *cname) +{ + sr_xavp_t *vavp=NULL; + + vavp = xavu_get_child(rname, cname); + + if(vavp==NULL || vavp->val.type!=SR_XTYPE_STR) + return NULL; + + return vavp; +} + + /** * serialize the values in subfields of an xavu in name=value; format * - rname - name of the root list xavu diff --git a/src/core/xavp.h b/src/core/xavp.h index 198f0c09c4..446b48eba3 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -131,6 +131,10 @@ sr_xavp_t *xavu_set_sval(str *rname, str *sval); sr_xavp_t *xavu_set_child_xval(str *rname, str *cname, sr_xval_t *xval); sr_xavp_t *xavu_set_child_ival(str *rname, str *cname, int ival); sr_xavp_t *xavu_set_child_sval(str *rname, str *cname, str *sval); +sr_xavp_t* xavu_get_child(str *rname, str *cname); +sr_xavp_t* xavu_get_child_with_ival(str *rname, str *cname); +sr_xavp_t* xavu_get_child_with_sval(str *rname, str *cname); + int xavu_serialize_fields(str *rname, char *obuf, int olen); /** xavi api */

1 0

git:master:5a96993e: topos: use context for sruid
by Daniel-Constantin Mierla 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: 5a96993efd6cff7677a5c49fee15c30715903ea0 URL: https://github.com/kamailio/kamailio/commit/5a96993efd6cff7677a5c49fee15c30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T00:01:22+02:00 topos: use context for sruid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5a96993efd6cff7677a5c49fee15c30… Patch: https://github.com/kamailio/kamailio/commit/5a96993efd6cff7677a5c49fee15c30… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 9ce19dd1a0..5efe57b0e4 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -64,6 +64,9 @@ extern pv_spec_t _tps_bcontact_spec; extern str _tps_contact_host_avp; extern pv_spec_t _tps_contact_host_avp_spec; +extern str _tps_context_param; +extern str _tps_context_value; + #define TPS_STORAGE_LOCK_SIZE 1<<9 static gen_lock_set_t *_tps_storage_lock_set = NULL; @@ -546,9 +549,16 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog, int dir) { int ret = -1; /* error if dialog == 0 */ str suid; + str *sx = NULL; + + if(_tps_context_value.len>0) { + sx = &_tps_context_value; + } else if(_tps_context_param.len>0) { + sx = &_tps_context_param; + } if(dialog==0) { - sruid_next(&_tps_sruid); + sruid_nextx(&_tps_sruid, sx); suid = _tps_sruid.uid; } else { if(td->a_uuid.len>0) {

1 0

git:master:5c2699c4: core: sruid - use specific prefix for global variables
by Daniel-Constantin Mierla 31 Mar '21

31 Mar '21

Module: kamailio Branch: master Commit: 5c2699c4f6a9e8a24057b754e6510433129f509d URL: https://github.com/kamailio/kamailio/commit/5c2699c4f6a9e8a24057b754e651043… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T23:55:51+02:00 core: sruid - use specific prefix for global variables - declare static functions used only local - functions to append a value to sruid --- Modified: src/core/utils/sruid.c Modified: src/core/utils/sruid.h --- Diff: https://github.com/kamailio/kamailio/commit/5c2699c4f6a9e8a24057b754e651043… Patch: https://github.com/kamailio/kamailio/commit/5c2699c4f6a9e8a24057b754e651043…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev