sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
302 discussions

git:master:62e822ce: core: use same condition for extra_params in create_via_hf()

by Daniel-Constantin Mierla

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 */

3 years

git:master:02c5f298: crypto: use same condition to free ttext.s on success or error

by Daniel-Constantin Mierla

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

3 years

git:master:7652f796: core: rvalue - link to free at end of rve_opt_01() instead on replace

by Daniel-Constantin Mierla

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

3 years

git:master:e770e0aa: core: rvalue - function to destroy content of rval without freeing it

by Daniel-Constantin Mierla

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;

3 years

git:master:4f7b5537: core: main - several optarg safety checks

by Daniel-Constantin Mierla

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

3 years

git:master:26ab0fcc: uac: do not free chunks already inserted as lumps

by Daniel-Constantin Mierla

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

3 years

git:master:2d7aee50: core/mem: removed tlsf_malloc_bits.h

by Daniel-Constantin Mierla

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

3 years

git:master:ddafeebf: core/mem: tlsf malloc - sync'ed with v3.1

by Daniel-Constantin Mierla

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…

3 years

[kamailio/kamailio] Add display name support to "pua_dialoginfo" (#2615)

by Jake Greene

### 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 display="Alice">sip:alice@example.com</identity> <target uri="sip:alice@phone11.example.com"/> </local> <remote> <identity display="Bob">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> <identity>sip:alice@example.com</identity> <target uri="sip:alice@phone11.example.com"/> </local> <remote> <identity>sip:bob@example.org</identity> <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

3 years

git:master:a749cc53: tm: init timeval structs

by Daniel-Constantin Mierla

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;

3 years

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021