- sr-dev - kamailio.org

git:master:7ef0a272: core: check for non empty receive address and port in msg translator
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 7ef0a272dc9c81afa05ef8b1591e9f05c2810e9a URL: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T11:33:24+02:00 core: check for non empty receive address and port in msg translator --- Modified: src/core/msg_translator.c Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… Patch: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4622b264d5..a2f6505e83 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -597,7 +597,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, #define SUBST_LUMP_LEN(subst_l) \ switch((subst_l)->u.subst){ \ case SUBST_RCV_IP: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ new_len+=recv_address_str->len; \ if (msg->rcv.bind_address->address.af!=AF_INET) \ new_len+=2; \ @@ -607,7 +607,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, }; \ break; \ case SUBST_RCV_PORT: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_port_str)){ \ new_len+=recv_port_str->len; \ }else{ \ /* FIXME */ \ @@ -646,14 +646,14 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, break; \ case SUBST_RCV_ALL: \ case SUBST_RCV_ALL_EX: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ new_len+=recv_address_str->len; \ if ((msg->rcv.bind_address->address.af==AF_INET6)\ && (recv_address_str->s[0]!='[')\ && (memchr(recv_address_str->s, ':',\ recv_address_str->len)!=NULL))\ new_len+=2; \ - if (recv_port_no!=SIP_PORT){ \ + if (recv_port_no!=SIP_PORT && STR_WITHVAL(recv_port_str)){ \ /* add :port_no */ \ new_len+=1+recv_port_str->len; \ }\ @@ -990,7 +990,7 @@ void process_lumps( struct sip_msg* msg, #define SUBST_LUMP(subst_l) \ switch((subst_l)->u.subst){ \ case SUBST_RCV_IP: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ if (msg->rcv.bind_address->address.af!=AF_INET){\ new_buf[offset]='['; offset++; \ }\ @@ -1006,7 +1006,7 @@ void process_lumps( struct sip_msg* msg, }; \ break; \ case SUBST_RCV_PORT: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_port_str)){ \ memcpy(new_buf+offset, recv_port_str->s, \ recv_port_str->len); \ offset+=recv_port_str->len; \ @@ -1017,7 +1017,7 @@ void process_lumps( struct sip_msg* msg, break; \ case SUBST_RCV_ALL: \ case SUBST_RCV_ALL_EX: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ /* address */ \ if ((msg->rcv.bind_address->address.af==AF_INET6)\ && (recv_address_str->s[0]!='[')\ @@ -1035,7 +1035,7 @@ void process_lumps( struct sip_msg* msg, new_buf[offset]=']'; offset++; \ }\ /* :port */ \ - if (recv_port_no!=SIP_PORT){ \ + if (recv_port_no!=SIP_PORT && STR_WITHVAL(recv_port_str)){ \ new_buf[offset]=':'; offset++; \ memcpy(new_buf+offset, \ recv_port_str->s, \ diff --git a/src/core/str.h b/src/core/str.h index 58d7d627f6..d7977652d9 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -142,6 +142,11 @@ typedef struct _str str; } \ } while(0) +/** + * str with value: not null and not emptu + */ +#define STR_WITHVAL(_sp) ((_sp) && ((_sp)->s) && ((_sp)->len)) + /** @} */ /** Appends a sufffix

1 0

[kamailio/kamailio] volte：401 Unauthorized (#2703)
by King-Osmond 07 Apr '21

07 Apr '21

Hello! I have a problem about volte. > 4(4467) INFO: rr [rr_mod.c:515]: pv_get_route_uri_f(): No route header present. > 4(4467) NOTICE: <script>: PCSCF REGISTER: > Destination URI: <null> > Request URI: sip:ims.mnc007.mcc460.3gppnetwork.org > 4(4467) INFO: rr [rr_mod.c:515]: pv_get_route_uri_f(): No route header present. > 4(4467) NOTICE: <script>: Source IP and Port: (10.45.0.6:5060) > Route-URI: > 4(4467) NOTICE: <script>: Received IP and Port: (192.168.107.6:5060) > 4(4467) NOTICE: <script>: Contact header: <sip:460070000000001@10.45.0.6:5060>;+sip.instance="<urn:gsma:imei:86772304-493882-0>";+g.3gpp.accesstype="cellular2";audio;video;+g.3gpp.smsip;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel" > 4(4467) INFO: ims_registrar_pcscf [sec_agree.c:296]: cscf_get_security_verify(): No sec ![1617780139(1)](https://user-images.githubusercontent.com/65008453/113834050-f41b2e80-97bc-11eb-8ebb-c669f2fee210.png) ![1617780742(1)](https://user-images.githubusercontent.com/65008453/113834075-fa110f80-97bc-11eb-951c-9a75283ff69a.png) urity-verify parameters found ![1617781355(1)](https://user-images.githubusercontent.com/65008453/113834098-04330e00-97bd-11eb-8dd3-3ff310df2e7c.png) [open5gs.tar.gz](https://github.com/kamailio/kamailio/files/6270079/open5gs.… Can you help me see where the problem is？ Thanks! Tips：About SQN, the SQN is the same at the beginning of the test (Open5GS, FOHSS), but when it is found that the sip registration fails, the SQN is inconsistent. If this situation is normal? If it is not normal, how to solve it? open5gs：v2.2.3 kamailio：5.3 -- 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/2703

2 2

git:master:7457b3ce: app_python3: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 7457b3cefd08595c054291398de0f9a4e62691b7 URL: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… 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_python3: init timeval structures --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… Patch: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 7af949de6e..f3463a781f 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1791,7 +1791,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: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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev