- sr-dev - kamailio.org

onsend reply route issue with KEMI
by Salah Uddin Ahmed 14 Apr '21

14 Apr '21

Hello, We are using the Kamailio(5.4.1) with python3 KEMI interpreter. Here I noticed an issue on ksr_onsend_route with the reply messages. We did "onsend_route_reply=1" on the kamailio.cfg. But ksr_onsend_route is not triggered by any reply messages. Tried to dig some code and found, in t_reply.c before calling "run_onsend" it tested whether the onsend_rt list is empty or not by onsend_route_enabled(file: onsend.h) method. But presumably rt lists are always empty if we use a KEMI interpreter. We have tried the same version of Kamailio without KEMI, then onsend_route works fine. If onsend_rt is not being used in case of KEMI then can we replace this test with simply by testing only the onsend_route_reply flag? Please advise if we are missing something. Thank you, Rubel

3 3

git:master:0640645e: core: updated onsend_route_enabled() macro condtition
by Daniel-Constantin Mierla 14 Apr '21

14 Apr '21

Module: kamailio Branch: master Commit: 0640645efdbc1f7ce36750d5a784a4cfedc3f02f URL: https://github.com/kamailio/kamailio/commit/0640645efdbc1f7ce36750d5a784a4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-14T15:14:10+02:00 core: updated onsend_route_enabled() macro condtition - detect when the kemi callbacks need to be executed for tm replies --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/0640645efdbc1f7ce36750d5a784a4c… Patch: https://github.com/kamailio/kamailio/commit/0640645efdbc1f7ce36750d5a784a4c… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index 744becedce..a78927c190 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -57,7 +57,9 @@ extern onsend_info_t* p_onsend; * WARNING: buf must be 0 terminated (to allow regex matches on it) */ int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, char* buf, int len); -#define onsend_route_enabled(rtype) (onsend_rt.rlist[DEFAULT_RT]?((rtype==SIP_REPLY)?onsend_route_reply:1):0) +#define onsend_route_enabled(rtype) ((onsend_rt.rlist[DEFAULT_RT]? \ + ((rtype==SIP_REPLY)?onsend_route_reply:1):0) \ + || (kemi_onsend_route_callback.len>0 && sr_kemi_eng_get())) int run_onsend_evroute(onsend_info_t *sndinfo, int evrt, str *evcb, str *evname);

1 0

git:master:7231be07: seas: check when walking the list
by Daniel-Constantin Mierla 14 Apr '21

14 Apr '21

Module: kamailio Branch: master Commit: 7231be0785009cb17581822f0765985eb7bdb243 URL: https://github.com/kamailio/kamailio/commit/7231be0785009cb17581822f0765985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-14T12:52:58+02:00 seas: check when walking the list --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/7231be0785009cb17581822f0765985… Patch: https://github.com/kamailio/kamailio/commit/7231be0785009cb17581822f0765985… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index cd62848ab0..83be6307d0 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -1329,8 +1329,12 @@ int extract_allowed_headers(struct sip_msg *my_msg,int strip_top_vias,int allow_ }else{ assert(rtcnt>0); rb=hf->parsed; - while(--rtcnt) + while(rb && --rtcnt) rb=rb->next; + if(!rb) { + LM_ERR("no rr\n"); + goto error; + } k= (((rb->nameaddr.name.s) + rb->len)-hf->name.s) ; if(len+k+CRLF_LEN<headers_len){ memcpy(headers+len,hf->name.s,k);

1 0

git:master:c30cd3db: avp: check for null string
by Daniel-Constantin Mierla 14 Apr '21

14 Apr '21

Module: kamailio Branch: master Commit: c30cd3db7587a3c875770fbc558f4a5ad38b58bd URL: https://github.com/kamailio/kamailio/commit/c30cd3db7587a3c875770fbc558f4a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-14T12:50:36+02:00 avp: check for null string --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/c30cd3db7587a3c875770fbc558f4a5… Patch: https://github.com/kamailio/kamailio/commit/c30cd3db7587a3c875770fbc558f4a5… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f11d56baeb..63ce537d7a 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1359,7 +1359,7 @@ static int attr_hdr_body2attrs(struct sip_msg* m, char* header_, char* prefix_) } }; } - if (s.len && s.s[0] == header->field_delimiter) { + if (s.len && s.s && s.s[0] == header->field_delimiter) { s.s++; s.len--; }

1 0

git:master:6c8d6185: imc: safety checks for function parameters
by Daniel-Constantin Mierla 14 Apr '21

14 Apr '21

Module: kamailio Branch: master Commit: 6c8d61850aa662016d952f25dc510ed4d602e10c URL: https://github.com/kamailio/kamailio/commit/6c8d61850aa662016d952f25dc510ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-14T12:40:19+02:00 imc: safety checks for function parameters --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/6c8d61850aa662016d952f25dc510ed… Patch: https://github.com/kamailio/kamailio/commit/6c8d61850aa662016d952f25dc510ed… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 94ddc38884..8d9c6f3ea1 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -488,6 +488,10 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, str body; struct imc_uri room; + if(cmd==NULL || src==NULL || dst==NULL) { + return -1; + } + memset(&room, '\0', sizeof(room)); if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, &dst->parsed)) goto error; @@ -537,12 +541,14 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, goto error; } - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, STR_FMT(format_uri(src->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, + STR_FMT(format_uri(src->uri))); } else { LM_DBG("Attept to join private room [%.*s] by [%.*s]\n", STR_FMT(&rm->uri), STR_FMT(&src->uri)); - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_join_attempt_bcast.s, STR_FMT(format_uri(src->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_join_attempt_bcast.s, + STR_FMT(format_uri(src->uri))); imc_send_message(&rm->uri, &src->uri, build_headers(msg), &msg_join_attempt_ucast); } @@ -563,7 +569,7 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, rv = 0; error: - if (room.uri.s) pkg_free(room.uri.s); + if (room.uri.s != NULL) pkg_free(room.uri.s); if (rm != NULL) imc_release_room(rm); return rv; }

1 0

git:master:e84c1985: group: check if credentials are parsed
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

Module: kamailio Branch: master Commit: e84c1985f1c3ed7a791660702b398b9ac1eb1f4a URL: https://github.com/kamailio/kamailio/commit/e84c1985f1c3ed7a791660702b398b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T10:21:39+02:00 group: check if credentials are parsed --- Modified: src/modules/group/group.c --- Diff: https://github.com/kamailio/kamailio/commit/e84c1985f1c3ed7a791660702b398b9… Patch: https://github.com/kamailio/kamailio/commit/e84c1985f1c3ed7a791660702b398b9… --- diff --git a/src/modules/group/group.c b/src/modules/group/group.c index 329587a69c..af1c62c0f3 100644 --- a/src/modules/group/group.c +++ b/src/modules/group/group.c @@ -54,7 +54,7 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, { struct sip_uri puri; struct sip_uri *turi; - struct hdr_field* h; + struct hdr_field* h = 0; struct auth_body* c = 0; pv_value_t value; @@ -89,15 +89,20 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, get_authorized_cred( msg->proxy_auth, &h); if (!h) { LM_ERR("no authorized credentials found " - "(error in scripts)\n"); + "(error in script)\n"); return -1; } } + if(!h->parsed) { + LM_ERR("no parsed authorized credentials found " + "(error in script)\n"); + return -1; + } c = (auth_body_t*)(h->parsed); break; case 5: /* AVP spec */ - if(pv_get_spec_value( msg, &gcp->sp, &value)!=0 + if(pv_get_spec_value( msg, &gcp->sp, &value)!=0 || value.flags&PV_VAL_NULL || value.rs.len<=0) { LM_ERR("no AVP found (error in scripts)\n");

1 0

git:master:b123dec9: pike: safety check for ll variable
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

Module: kamailio Branch: master Commit: b123dec934769522407dad619bbb6c2074719884 URL: https://github.com/kamailio/kamailio/commit/b123dec934769522407dad619bbb6c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T09:50:07+02:00 pike: safety check for ll variable --- Modified: src/modules/pike/pike_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b123dec934769522407dad619bbb6c2… Patch: https://github.com/kamailio/kamailio/commit/b123dec934769522407dad619bbb6c2… --- diff --git a/src/modules/pike/pike_funcs.c b/src/modules/pike/pike_funcs.c index 42fc5172e4..3096928d5d 100644 --- a/src/modules/pike/pike_funcs.c +++ b/src/modules/pike/pike_funcs.c @@ -245,8 +245,10 @@ void clean_routine(unsigned int ticks , void *param) /* unlink the node -> the list will get shorter and it will be * faster for the next branches to process it */ - ll->prev->prev->next = ll; - ll->prev = ll->prev->prev; + if(ll) { + ll->prev->prev->next = ll; + ll->prev = ll->prev->prev; + } node->expires = 0; node->timer_ll.prev = node->timer_ll.next = 0; if ( node->flags&NODE_EXPIRED_FLAG )

1 0

git:master:005f4468: sca: return on rpc fault
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

Module: kamailio Branch: master Commit: 005f4468bc5873ea02b6c0d3d75baa49067e17c9 URL: https://github.com/kamailio/kamailio/commit/005f4468bc5873ea02b6c0d3d75baa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T09:50:46+02:00 sca: return on rpc fault --- Modified: src/modules/sca/sca_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/005f4468bc5873ea02b6c0d3d75baa4… Patch: https://github.com/kamailio/kamailio/commit/005f4468bc5873ea02b6c0d3d75baa4… --- diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index f1882fa879..c3b9b0f2ba 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -184,6 +184,7 @@ void sca_rpc_deactivate_all_subscriptions(rpc_t *rpc, void *ctx) if((ht = sca->subscriptions) == NULL) { rpc->fault(ctx, 500, "Empty subscription table!"); + return; } for(i = 0; i < ht->size; i++) {

1 0

git:5.4:e46c76a1: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 Apr '21

13 Apr '21

Module: kamailio Branch: 5.4 Commit: e46c76a135ae24794748de8bdf87ae46f4ad7199 URL: https://github.com/kamailio/kamailio/commit/e46c76a135ae24794748de8bdf87ae4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-13T09:16:23+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/e46c76a135ae24794748de8bdf87ae4… Patch: https://github.com/kamailio/kamailio/commit/e46c76a135ae24794748de8bdf87ae4… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 8b87eb20d3..43270eec79 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -223,7 +223,7 @@ if(fnmatch("$rU", "123*")) Meaning of the parameters is as follows: * hf - Header field to be appended. Format: HFNAME [ [IDX] ]. If index is not specified new header is inserted at the end of - message. + message. The index 1 correxponds to the first header. * hvalue - Value to be added, config var formatting supported. Example 1.6. append_hf_value usage @@ -244,7 +244,7 @@ ot exists add new header Meaning of the parameters is as follows: * hf - Header field to be appended. Format: HFNAME [ [IDX] ]. If index is not specified new header is inserted at the top of - message. + message. The index 1 correxponds to the first header. * hvalue - Value to be added, config var formatting supported. Example 1.7. insert_hf_value usage @@ -262,7 +262,7 @@ insert_hf_value("foo[1]", "gogo") # try add to the first header Meaning of the parameters is as follows: * hf_par - Header field/param to be removed. Format: HFNAME [ [IDX] ] [. PARAM ] If asterisk is specified as index then all values are - affected. + affected. The index 1 correxponds to the first header. Example 1.8. remove_hf_value usage ... @@ -282,7 +282,7 @@ remove_hf_value("foo[*].bar") # for each foo delete bar parameters Meaning of the parameters is as follows: * hf_par - Header/param to be removed. Format: HFNAME [ [IDX] ] [. PARAM ] If asterisk is specified as index then all values are - affected. + affected. The index 1 correxponds to the first header. Example 1.9. remove_hf_value2 usage ... @@ -301,7 +301,7 @@ remove_hf_value2("foo[*].bar") # for each foo delete bar parameters Meaning of the parameters is as follows: * hf_para - Header field value / param to be appended. Format: HFNAME [ [IDX] ] [. PARAM] If asterisk is specified as index then all - values are affected. + values are affected. The index 1 correxponds to the first header. * hvalue - Value to be assigned, config var formatting supported. If value is empty then no equal sign appears in param. @@ -325,7 +325,7 @@ assign_hf_value("foo[*].bar", "") # set empty value (ex. lr) Meaning of the parameters is as follows: * hf_para - Header field value / param to be appended. Format: HFNAME [ [IDX] ] [. PARAM] If asterisk is specified as index then all - values are affected. + values are affected. The index 1 correxponds to the first header. * hvalue - Value to be assigned, config var formatting supported. If value is empty then no equal sign appears in param.

1 0

git:master:8a5b764e: db_text: safety check for lres
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

Module: kamailio Branch: master Commit: 8a5b764e77d009eb6f236e74d3462bfce0d57f07 URL: https://github.com/kamailio/kamailio/commit/8a5b764e77d009eb6f236e74d3462bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T09:15:10+02:00 db_text: safety check for lres --- Modified: src/modules/db_text/dbt_base.c Modified: src/modules/db_text/dbt_res.c --- Diff: https://github.com/kamailio/kamailio/commit/8a5b764e77d009eb6f236e74d3462bf… Patch: https://github.com/kamailio/kamailio/commit/8a5b764e77d009eb6f236e74d3462bf… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 1e5dd01514..0b4437bced 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -258,7 +258,7 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, dbt_column_p pPrevCol = NULL; _tbc_temp->colv = (dbt_column_p*) shm_malloc(_nc*sizeof(dbt_column_p)); - for(i=0; i < _nc; i++) { + for(i=0; lres && i < _nc; i++) { dbt_column_p pCol = dbt_column_new(_tbc->colv[ lres[i] ]->name.s, _tbc->colv[ lres[i] ]->name.len); pCol->type = _tbc->colv[ lres[i] ]->type; pCol->flag = _tbc->colv[ lres[i] ]->flag; diff --git a/src/modules/db_text/dbt_res.c b/src/modules/db_text/dbt_res.c index 16a11f2695..87adc0b6bc 100644 --- a/src/modules/db_text/dbt_res.c +++ b/src/modules/db_text/dbt_res.c @@ -915,7 +915,7 @@ dbt_row_p dbt_result_extract_results(dbt_table_p _dtp, dbt_row_p* pRows, int _nr dbt_row_p pPrvRow=NULL; int i, n, r; - if(!_dtp || !pRows || _ncols<=0) + if(!_dtp || !pRows || _ncols<=0 || !_lres) return NULL; for(r=0; r < _nrows; r++) {

1 0

git: new commits in branch 5.4
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

- URL: https://github.com/kamailio/kamailio/commit/7c9ea2bf08ae3c481548b27fd4a793a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:19:07+02:00 path: removed svn id header (cherry picked from commit 0f0a56ad5c97a611fab64fc9b9eba304643dcec8) - URL: https://github.com/kamailio/kamailio/commit/f5334a57ae5159f1a37b3f25b9db220… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:21:12+02:00 textopsx: docs - notes about 1-based indexing for hf value functions - GH #2387 (cherry picked from commit 6379f1280ba41e87ddb34fa1705ffe4231dcac9c) - URL: https://github.com/kamailio/kamailio/commit/8622811124f641b6a4b09a802758a35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:22:10+02:00 core: parse uri - cast to unsigned for left shifting (cherry picked from commit d4e31e6ae494836c49e50f463517a576b18c5611) - URL: https://github.com/kamailio/kamailio/commit/3dca9d6bff8e08677a02e3bb0f47b4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:22:35+02:00 core: parse uri - check for invalid port values (cherry picked from commit b7f753ddc727e1d7ab42e7abe607059e03976f8d) - URL: https://github.com/kamailio/kamailio/commit/8b112fbb5e362931b5c684fd4a6c3fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:22:51+02:00 pua_dialoginfo: skip requests that do not control call state - GH #2700 (cherry picked from commit 1b47452cebb1b7866cbbabd5068a9ff4a39c86d2) - URL: https://github.com/kamailio/kamailio/commit/8cd3b40aa7e618226b0137f5e758bc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:23:09+02:00 core: init allocated memory in str_hash_alloc() - removed unused pointer shifting in dset.c - small reworking of lval_assign() (cherry picked from commit ba9f2b5af9cabd61f67ceedb8feab6bd7bc6526d) - URL: https://github.com/kamailio/kamailio/commit/2d091fa67133e49d23e81007820900c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:23:19+02:00 .gitignore: ignore files that can be generated by compiling tools (cherry picked from commit 1536f4bb3d4e654c8169afb6599c47c26df12ef6) - URL: https://github.com/kamailio/kamailio/commit/aa285587c015e03a105442b1964ac0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:23:33+02:00 core: fixed condition for 0 ID or NULL NAME AVP - avoid null in memcpy for AVP_NAME_STR (cherry picked from commit ca1821837dfe7dd6630f628d968ed4d1178c7040) - URL: https://github.com/kamailio/kamailio/commit/6bf9ce52bd4a10e77343d06cd82e4a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:23:57+02:00 core: cfg.len - sanitizer safety check of target buffer (cherry picked from commit ef31c82ac3bd7972c2d02c893f8041af4664b717) - URL: https://github.com/kamailio/kamailio/commit/bdd0da206d115e93383899463ad5f72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:24:10+02:00 imc: expect the second param only if first is set - bits of formatting for imc_handle_create() (cherry picked from commit c08620f6427d59749396fe2762e340328ce69c41) - URL: https://github.com/kamailio/kamailio/commit/78fcd0ff356a4f2388c389490a67004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:24:48+02:00 tm: init timeval structs (cherry picked from commit a749cc53ac4aa4825ba8d720825db856d897efb2) - URL: https://github.com/kamailio/kamailio/commit/aa7f0d76add3794719fe6006724559b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:25:14+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 (cherry picked from commit 26ab0fcc97cbf0d6602454e60187a914f13424a2) - URL: https://github.com/kamailio/kamailio/commit/6e38b6e81e8cdb656b28e221a59aaf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:25:32+02:00 core: main - several optarg safety checks (cherry picked from commit 4f7b5537688293d196669dd5a7d0124f7656cf2d) - URL: https://github.com/kamailio/kamailio/commit/b1b91fe1969f65a94516baddc94738f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:01+02:00 core: rvalue - function to destroy content of rval without freeing it - needed in case of rval reuse in rve_replace_with_val() (cherry picked from commit e770e0aa6889f001a3f7f2644202bf106f6559da) - URL: https://github.com/kamailio/kamailio/commit/05f60d4d4a20d127a23bf6e42853060… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:21+02:00 core: rvalue - link to free at end of rve_opt_01() instead on replace - debug mode messages print fields (cherry picked from commit 7652f79640b3e792baa77531e697fd74a1ab4584) - URL: https://github.com/kamailio/kamailio/commit/9d8b937f832334be2660f95c9886ae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:38+02:00 core: use same condition for extra_params in create_via_hf() (cherry picked from commit 62e822ce25e93a8183dd9e5e1fee517143849a6a) - URL: https://github.com/kamailio/kamailio/commit/bb1102a9366992b885100960000c9e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:47+02:00 ctl: free send_buf in case of error - disabled unused function (cherry picked from commit 3bb1a30dda3b40ba2f188a4baab94ebda41f4a74) - URL: https://github.com/kamailio/kamailio/commit/3aa2bfd98e6b647eda8f8a27f2da3f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:58+02:00 app_jsdt: init timeval structures (cherry picked from commit cad5cc37c63477fbcf429af34e516b523c74132e) - URL: https://github.com/kamailio/kamailio/commit/c13836bd9feeb27878810cd469d839d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:06+02:00 app_lua: init timeval structures (cherry picked from commit e1369a4cf0c668a0ee40d3b84b9c6382c2168e49) - URL: https://github.com/kamailio/kamailio/commit/fa571b6f79f9a2a9c06ccb3494ed2ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:14+02:00 app_python: init timeval structures (cherry picked from commit 97991c9cf56ca034df914ae499053e597582ef80) - URL: https://github.com/kamailio/kamailio/commit/8341025d73c0911683f8bb461d5b5b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:23+02:00 app_python3: init timeval structures (cherry picked from commit 7457b3cefd08595c054291398de0f9a4e62691b7) - URL: https://github.com/kamailio/kamailio/commit/50e3e3761804dd71a615f95eeb67c2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:31+02:00 app_ruby: init timeval structures (cherry picked from commit 50f92131ac0a9f5dd1e19fb6e3636657ad996e37) - URL: https://github.com/kamailio/kamailio/commit/7d5ab8071aef32d2c59f6acc7e93923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:42+02:00 app_sqlang: init timeval structures (cherry picked from commit e8583372cb1078a29bb6526c11f838e30811b94a) - URL: https://github.com/kamailio/kamailio/commit/53601d9e432b6b1c9351dd7a801dd75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:56+02:00 core: check for non empty receive address and port in msg translator (cherry picked from commit 7ef0a272dc9c81afa05ef8b1591e9f05c2810e9a) - URL: https://github.com/kamailio/kamailio/commit/d9eb361ebc07a84f5a36fdad4c0a576… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:29:08+02:00 core: cfg.lex - free after log message (cherry picked from commit 563c6f69aef22a90fc7870398fcfbd4242e33779) - URL: https://github.com/kamailio/kamailio/commit/04c07ced4cc6000a7ffcbfea79485ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:29:21+02:00 dlgs: safety check for accessing next field (cherry picked from commit 7dd643a88fd7944ee86b795298c76e6d5fd58b8f) - URL: https://github.com/kamailio/kamailio/commit/7ec5c6ec53f333b7a65a02d46ee8a37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:29:32+02:00 core: main - coherent behaviour for fix_cfg_file() - duplicate to build the output always, safer not to try to change the static string defined via macro at runtime (cherry picked from commit 74fa6c5570d6394af8c5352bd37e21e970f1575c) - URL: https://github.com/kamailio/kamailio/commit/fc9c1dc1e2dd2567bdd8fa6d75f412a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:05+02:00 tm: t_fifo.c - free app in case of error (cherry picked from commit 9c7a509f7189de8ce600a97b7c1c5f9e4f5afdb1) - URL: https://github.com/kamailio/kamailio/commit/e2d4ab36df274e92e9e04fc8b1973a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:15+02:00 core: dns cache - safety checks for rdata field (cherry picked from commit 7ea3b97c8acf8b623563b7a9fbf4ba23ea3e9170) - URL: https://github.com/kamailio/kamailio/commit/5e431ebf2d2986be962373dc9adba90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:27+02:00 rtpengine: reworked condition around locking for easier pairing - inside rtpengine_hash_table_insert() (cherry picked from commit c200d2e9109a5581491bebd91c30162716b0f4fa) - URL: https://github.com/kamailio/kamailio/commit/e0948071566a8d978dc2c57a21a7448… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:40+02:00 nat_traversal: check parameter for send_keepalive() (cherry picked from commit f33abd5e2d5978ba9e6e8a48066b0daff70c0b3b) - URL: https://github.com/kamailio/kamailio/commit/c905cab9d461b24d779a7404aaf1316… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:54+02:00 rr: conditions adjustmets for append from tag in record route preset (cherry picked from commit 42d90d3665256c3d38945193b0a14ad199221bc6) - URL: https://github.com/kamailio/kamailio/commit/335b40a417ff457f290ab6e963344ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:31:25+02:00 core: cfg ctx - checks for valid variable offset (cherry picked from commit 303be6a94be40dbe7c26c96e768627e8e9d0f860) - URL: https://github.com/kamailio/kamailio/commit/3a515d6e2ba184de05b96dfad3bdf9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:31:41+02:00 siptrace: fallback to udp if send sock is not set (cherry picked from commit a5f8810223021939b12eb0d04fc625f8d36980f7) - URL: https://github.com/kamailio/kamailio/commit/f5e8a6042f141fd32f611c5ddc8232d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:31:53+02:00 dialog: safety check for prev field (cherry picked from commit 80beb29ac0204697a8964231b441ac37866a4a1c) - URL: https://github.com/kamailio/kamailio/commit/2e16763a9c261cec47bd429a1dc0bee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:32:13+02:00 pua_dialoginfo: check request to cover cases of callbacks without it - updates the previous commit (cherry picked from commit 912e2ef41533e961bc55ca80619305af8e474469) - URL: https://github.com/kamailio/kamailio/commit/36667b400c77b50b4809fafd92b8d93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:32:28+02:00 pike: safety check for null node (cherry picked from commit c9dc0336a33a0ecfe776975be7fbfab8f3c91b48) - URL: https://github.com/kamailio/kamailio/commit/a197fecdf3f3da6e24a5792b9eb9572… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:32:40+02:00 core: dns - safety checks for port and proto (cherry picked from commit 6d46ec71f941b9db9c06c6c2edac14fc9f3d1074)

1 0

git:master:91ec4259: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 91ec4259465fdaab41749b8fed0f96636a0619e5 URL: https://github.com/kamailio/kamailio/commit/91ec4259465fdaab41749b8fed0f966… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-12T18:46:13+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/91ec4259465fdaab41749b8fed0f966… Patch: https://github.com/kamailio/kamailio/commit/91ec4259465fdaab41749b8fed0f966… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index ec12000f65..c96b7830c6 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -55,7 +55,7 @@ Daniel-Constantin Mierla 1.8. secsipid_check_identity_pubkey usage 1.9. secsipid_get_url usage 1.10. secsipid_add_identity usage - 1.11. Libsecsipid usage + 1.11. Libsecsipid Usage Chapter 1. Admin Guide @@ -299,25 +299,32 @@ request_route { 5. Installation - The module depends on "libsecsipid", which is a component of - "sipsecidx" project from https://github.com/asipto/secsipidx/. The - library is implemented in Go language, with generated C API and - library. Until the libsecsipid is going to be packaged in OS - distributions, the secsipid module can be compiled by copying - secsipid.h libsecsipid.h and libsecsipid.a files in the folder of the - module. + The module needs "secsipdi_proc.so" module thatdepends on + "libsecsipid", which is a component of "sipsecidx" project from + https://github.com/asipto/secsipidx/. The library is implemented in Go + language, with generated C API and library. Until the libsecsipid is + going to be packaged in OS distributions, the secsipid_proc module can + be compiled by copying secsipid.h libsecsipid.h and libsecsipid.a files + in the folder of the module. To generate the libsecsipid.a file, it requires to have Go language installed and its environment configured, then run the following commands: - Example 1.11. Libsecsipid usage + Example 1.11. Libsecsipid Usage ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba cp secsipid.h libsecsipid.h libsecsipid.a \ - /path/to/kamailio/src/modules/secsipid/ + /path/to/kamailio/src/modules/secsipid_proc/ + cd /path/to/kamailio/ -make modules modules=src/modules/secsipid/ +make include_modules="secsipid secsipid_proc ..." cfg +make all +make install + +## or compiling individual modules for use inside source tree +# make modules modules=src/modules/secsipid_proc +# make modules modules=src/modules/secsipid ...

1 0

git:master:7018672d: secsipid: docs - updates to installation section with secsipid_proc
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 7018672d9881ab97848b4e1131d73412b0db221d URL: https://github.com/kamailio/kamailio/commit/7018672d9881ab97848b4e1131d7341… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-12T18:39:25+02:00 secsipid: docs - updates to installation section with secsipid_proc --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7018672d9881ab97848b4e1131d7341… Patch: https://github.com/kamailio/kamailio/commit/7018672d9881ab97848b4e1131d7341… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 9360d788a4..d9d622af17 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -318,10 +318,11 @@ request_route { <section id="secsipid.s.installation"> <title>Installation</title> <para> - The module depends on "libsecsipid", which is a component of "sipsecidx" - project from https://github.com/asipto/secsipidx/. The library is + The module needs "secsipdi_proc.so" module thatdepends on "libsecsipid", + which is a component of "sipsecidx" project from + https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the - libsecsipid is going to be packaged in OS distributions, the secsipid + libsecsipid is going to be packaged in OS distributions, the secsipid_proc module can be compiled by copying secsipid.h libsecsipid.h and libsecsipid.a files in the folder of the module. </para> @@ -330,16 +331,23 @@ request_route { installed and its environment configured, then run the following commands: </para> <example> - <title>Libsecsipid usage</title> + <title>Libsecsipid Usage</title> <programlisting format="linespecific"> ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba cp secsipid.h libsecsipid.h libsecsipid.a \ - /path/to/kamailio/src/modules/secsipid/ + /path/to/kamailio/src/modules/secsipid_proc/ + cd /path/to/kamailio/ -make modules modules=src/modules/secsipid/ +make include_modules="secsipid secsipid_proc ..." cfg +make all +make install + +## or compiling individual modules for use inside source tree +# make modules modules=src/modules/secsipid_proc +# make modules modules=src/modules/secsipid ... </programlisting> </example>

1 0

git:master:84988f9d: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 84988f9d592a80c8c5b642a96b037ab0cd85cbb4 URL: https://github.com/kamailio/kamailio/commit/84988f9d592a80c8c5b642a96b037ab… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-12T08:01:22+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/84988f9d592a80c8c5b642a96b037ab… Patch: https://github.com/kamailio/kamailio/commit/84988f9d592a80c8c5b642a96b037ab… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 87ed1f9287..ec12000f65 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -31,6 +31,7 @@ Daniel-Constantin Mierla 3.3. cache_dir (str) 3.4. cache_expire (int) 3.5. modproc (str) + 3.6. libopt (str) 4. Functions @@ -49,11 +50,12 @@ Daniel-Constantin Mierla 1.3. Set cache_dir parameter 1.4. Set cache_expire parameter 1.5. Set modproc parameter - 1.6. secsipid_check_identity usage - 1.7. secsipid_check_identity_pubkey usage - 1.8. secsipid_get_url usage - 1.9. secsipid_add_identity usage - 1.10. Libsecsipid usage + 1.6. Set libopt parameter + 1.7. secsipid_check_identity usage + 1.8. secsipid_check_identity_pubkey usage + 1.9. secsipid_get_url usage + 1.10. secsipid_add_identity usage + 1.11. Libsecsipid usage Chapter 1. Admin Guide @@ -72,6 +74,7 @@ Chapter 1. Admin Guide 3.3. cache_dir (str) 3.4. cache_expire (int) 3.5. modproc (str) + 3.6. libopt (str) 4. Functions @@ -121,6 +124,7 @@ Chapter 1. Admin Guide 3.3. cache_dir (str) 3.4. cache_expire (int) 3.5. modproc (str) + 3.6. libopt (str) 3.1. expire (int) @@ -181,6 +185,18 @@ modparam("secsipid", "cache_expire", 7200) modparam("secsipid", "modproc", "secsipid_proc2.so") ... +3.6. libopt (str) + + Set a libsecsipid option. The value has to be name=value. The parameter + can be set many times. + + Default value is "" (not set). + + Example 1.6. Set libopt parameter +... +modparam("secsipid", "libopt", "CacheExpires=0") +... + 4. Functions 4.1. secsipid_check_identity(keyPath) @@ -202,7 +218,7 @@ modparam("secsipid", "modproc", "secsipid_proc2.so") This function can be used from ANY_ROUTE. - Example 1.6. secsipid_check_identity usage + Example 1.7. secsipid_check_identity usage ... request_route { ... @@ -226,7 +242,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.7. secsipid_check_identity_pubkey usage + Example 1.8. secsipid_check_identity_pubkey usage ... request_route { ... @@ -247,7 +263,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.8. secsipid_get_url usage + Example 1.9. secsipid_get_url usage ... request_route { ... @@ -271,7 +287,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.9. secsipid_add_identity usage + Example 1.10. secsipid_add_identity usage ... request_route { ... @@ -295,7 +311,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.10. Libsecsipid usage + Example 1.11. Libsecsipid usage ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/

1 0

git:master:3d7b1b12: secsipid: docs for libopt
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 3d7b1b12947b37faaacb12286f8ff763635185b9 URL: https://github.com/kamailio/kamailio/commit/3d7b1b12947b37faaacb12286f8ff76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-12T07:56:54+02:00 secsipid: docs for libopt --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d7b1b12947b37faaacb12286f8ff76… Patch: https://github.com/kamailio/kamailio/commit/3d7b1b12947b37faaacb12286f8ff76… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index d4489ebf73..9360d788a4 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -162,6 +162,27 @@ modparam("secsipid", "modproc", "secsipid_proc2.so") </programlisting> </example> </section> + <section id="secsipid.p.libopt"> + <title><varname>libopt</varname> (str)</title> + <para> + Set a libsecsipid option. The value has to be name=value. The + parameter can be set many times. + </para> + <para> + <emphasis> + Default value is "" (not set). + </emphasis> + </para> + <example> + <title>Set <varname>libopt</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("secsipid", "libopt", "CacheExpires=0") +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:ea628d35: secsipid_proc: synced with the upstream library api
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: ea628d35917036a252a3a0094a250b5df3cfe037 URL: https://github.com/kamailio/kamailio/commit/ea628d35917036a252a3a0094a250b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-12T07:51:41+02:00 secsipid_proc: synced with the upstream library api --- Modified: src/modules/secsipid_proc/libsecsipid.h Modified: src/modules/secsipid_proc/secsipid_proc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ea628d35917036a252a3a0094a250b5… Patch: https://github.com/kamailio/kamailio/commit/ea628d35917036a252a3a0094a250b5… --- diff --git a/src/modules/secsipid_proc/libsecsipid.h b/src/modules/secsipid_proc/libsecsipid.h index f0b8d51ebc..b95393ed39 100644 --- a/src/modules/secsipid_proc/libsecsipid.h +++ b/src/modules/secsipid_proc/libsecsipid.h @@ -92,6 +92,19 @@ extern int SecSIPIDSignJSONHP(char* headerJSON, char* payloadJSON, char* prvkeyP // * return: the length of `*outPtr` extern int SecSIPIDGetIdentity(char* origTN, char* destTN, char* attestVal, char* origID, char* x5uVal, char* prvkeyPath, char** outPtr); +// SecSIPIDGetIdentityPrvKey -- +// Generate the Identity header content using the input attributes +// * origTN - calling number +// * destTN - called number +// * attestVal - attestation level +// * origID - unique ID for tracking purposes, if empty string a UUID is generated +// * x5uVal - location of public certificate +// * prvkeyData - content of private key to be used to generate the signature +// * outPtr - to be set to the pointer containing the output (it is a +// 0-terminated string); the `*outPtr` must be freed after use +// * return: the length of `*outPtr` +extern int SecSIPIDGetIdentityPrvKey(char* origTN, char* destTN, char* attestVal, char* origID, char* x5uVal, char* prvkeyData, char** outPtr); + // SecSIPIDCheck -- // check the Identity header value // * identityVal - identity header value @@ -143,6 +156,26 @@ extern int SecSIPIDSetFileCacheOptions(char* dirPath, int expireVal); // * return: 0 - on success; -1 - on failure extern int SecSIPIDGetURLContent(char* urlVal, int timeoutVal, char** outPtr, int* outLen); +// SecSIPIDOptSetS -- +// set a string option for the library +// * optName - name of the option +// * optVal - value of the option +// * return: 0 if option was set, -1 otherwise +extern int SecSIPIDOptSetS(char* optName, char* optVal); + +// SecSIPIDOptSetN -- +// set a number (integer) option for the library +// * optName - name of the option +// * optVal - value of the option +// * 0 if option was set, -1 otherwise +extern int SecSIPIDOptSetN(char* optName, int optVal); + +// SecSIPIDOptSetV -- +// set an option for the library +// * optNameVal - string with name=value of the option +// * 0 if option was set, -1 otherwise +extern int SecSIPIDOptSetV(char* optNameVal); + #ifdef __cplusplus } #endif diff --git a/src/modules/secsipid_proc/secsipid_proc_mod.c b/src/modules/secsipid_proc/secsipid_proc_mod.c index 9356101d3a..1054582b17 100644 --- a/src/modules/secsipid_proc/secsipid_proc_mod.c +++ b/src/modules/secsipid_proc/secsipid_proc_mod.c @@ -44,6 +44,9 @@ int secsipid_proc_bind(secsipid_papi_t *papi) papi->SecSIPIDCheckFullPubKey = SecSIPIDCheckFullPubKey; papi->SecSIPIDSetFileCacheOptions = SecSIPIDSetFileCacheOptions; papi->SecSIPIDGetURLContent = SecSIPIDGetURLContent; + papi->SecSIPIDOptSetS = SecSIPIDOptSetS; + papi->SecSIPIDOptSetN = SecSIPIDOptSetN; + papi->SecSIPIDOptSetV = SecSIPIDOptSetV; return 0; }

1 0

git:master:5eacca80: secsipid: make it possible to verify certificate
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 5eacca80c4435a8cd55943493b52ea0e155ca524 URL: https://github.com/kamailio/kamailio/commit/5eacca80c4435a8cd55943493b52ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-12T07:54:24+02:00 secsipid: make it possible to verify certificate - follow the specs relate to verification - allow to set the level of certification via upstream library options --- Modified: src/modules/secsipid/secsipid_mod.c Modified: src/modules/secsipid/secsipid_papi.h --- Diff: https://github.com/kamailio/kamailio/commit/5eacca80c4435a8cd55943493b52ea0… Patch: https://github.com/kamailio/kamailio/commit/5eacca80c4435a8cd55943493b52ea0…

1 0

git:master:6d46ec71: core: dns - safety checks for port and proto
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 6d46ec71f941b9db9c06c6c2edac14fc9f3d1074 URL: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-11T09:09:24+02:00 core: dns - safety checks for port and proto --- Modified: src/core/dns_cache.c Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… Patch: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 7dbde8f378..58247265eb 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3011,25 +3011,30 @@ inline static int dns_srv_resolve_ip(struct dns_srv_handle* h, { int ret; str host; + unsigned short vport; host.len=0; host.s=0; + if(port) vport =*port; + else vport = 0; + do{ if (h->a==0){ #ifdef DNS_SRV_LB if ((ret=dns_srv_resolve_nxt(&h->srv, (flags & DNS_SRV_RR_LB)?&h->srv_tried_rrs:0, &h->srv_no, - name, &host, port))<0) + name, &host, &vport))<0) goto error; #else if ((ret=dns_srv_resolve_nxt(&h->srv, &h->srv_no, - name, &host, port))<0) + name, &host, &vport))<0) goto error; #endif - h->port=*port; /* store new port */ + h->port=vport; /* store new port */ + if(port) *port=vport; }else{ - *port=h->port; /* return the stored port */ + if(port) *port=h->port; /* return the stored port */ } if ((ret=dns_ip_resolve(&h->a, &h->ip_no, &host, ip, flags))<0){ /* couldn't find any good ip for this record, try the next one */ @@ -3257,6 +3262,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, char n_proto, origproto; str srv_name; int ret; + int res; int try_lookup_naptr = 0; ret=-E_DNS_NO_NAPTR; @@ -3302,7 +3308,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, if (!try_lookup_naptr) { if(proto) *proto=origproto; - int res = dns_srv_sip_resolve(h, name, ip, port, proto, flags); + res = dns_srv_sip_resolve(h, name, ip, port, proto, flags); if (res) { mark_skip_current_naptr(e->rr_lst, h->srv); if (have_more_active_naptr(e->rr_lst)) { @@ -3324,8 +3330,8 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, LM_DBG("(%.*s, %d, %d), srv0, ret=%d\n", name->len, name->s, h->srv_no, h->ip_no, ret); dns_hash_put(e); - *proto=n_proto; - h->proto=*proto; + if(proto) *proto=n_proto; + h->proto=n_proto; return ret; } } @@ -4130,7 +4136,9 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, new_rr->rdata = (void*)((char*)new_rr+rr_size); new_rr->expire = now + S_TO_TICKS(ttl); /* link the rr to the previous one */ - last_rr->next = new_rr; + if(last_rr) { + last_rr->next = new_rr; + } /* fix the total_size and expires values */ new->total_size=rounded_size+rr_size+rdata_size; @@ -4396,7 +4404,7 @@ int dns_cache_add_record(unsigned short type, if (*rr_iter != new_rr->next) { /* unlink rr from the list */ - *rr_p = (*rr_p)->next; + *rr_p = (*rr_p)?(*rr_p)->next:NULL; /* link it before *rr_iter */ new_rr->next = *rr_iter; *rr_iter = new_rr; diff --git a/src/core/resolve.c b/src/core/resolve.c index 928f6af3c5..deb20a740c 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1261,7 +1261,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, if (is_srv){ /* skip directly to srv resolving */ srv_proto=(proto)?*proto:0; - *port=(srv_proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; + if(port) *port=(srv_proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; if (zt){ srv_target=name->s; /* name.s must be 0 terminated in this case */

1 0

git:master:c9dc0336: pike: safety check for null node
by Daniel-Constantin Mierla 10 Apr '21

10 Apr '21

Module: kamailio Branch: master Commit: c9dc0336a33a0ecfe776975be7fbfab8f3c91b48 URL: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-10T11:21:09+02:00 pike: safety check for null node --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… Patch: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index e8b93b84f2..c0324c0476 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -285,7 +285,7 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, int byte_pos; kid = pike_root->entries[ ip[0] ].node; - node = 0; + node = NULL; byte_pos = 0; LM_DBG("search on branch %d (top=%p)\n", ip[0],kid); @@ -301,6 +301,10 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, } } + if(node==NULL) { + return NULL; + } + LM_DBG("only first %d were matched!\n",byte_pos); *flag = 0; *father = 0;

1 0

git:master:912e2ef4: pua_dialoginfo: check request to cover cases of callbacks without it
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 912e2ef41533e961bc55ca80619305af8e474469 URL: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T18:51:42+02:00 pua_dialoginfo: check request to cover cases of callbacks without it - updates the previous commit --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… Patch: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index a146b52d19..7e7afe2eae 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -272,7 +272,7 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para } /* skip requests that do not control call state */ - if((request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { + if(request && (request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { return; } if(include_req_uri) {

1 0

git:master:80beb29a: dialog: safety check for prev field
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 80beb29ac0204697a8964231b441ac37866a4a1c URL: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T17:18:54+02:00 dialog: safety check for prev field --- Modified: src/modules/dialog/dlg_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… Patch: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… --- diff --git a/src/modules/dialog/dlg_timer.c b/src/modules/dialog/dlg_timer.c index 0ac13df25c..6b84a4d68c 100644 --- a/src/modules/dialog/dlg_timer.c +++ b/src/modules/dialog/dlg_timer.c @@ -222,7 +222,7 @@ static inline struct dlg_tl* get_expired_dlgs(unsigned int time) lock_get( d_timer->lock); if (d_timer->first.next==&(d_timer->first) - || d_timer->first.next->timeout > time ) { + || d_timer->first.next->timeout > time ) { lock_release( d_timer->lock); return 0; } @@ -247,7 +247,9 @@ static inline struct dlg_tl* get_expired_dlgs(unsigned int time) ret = 0; } else { ret = d_timer->first.next; - tl->prev->next = 0; + if(tl->prev) { + tl->prev->next = 0; + } d_timer->first.next = tl; tl->prev = &d_timer->first; }

1 0

[kamailio/kamailio] pua_dialoginfo publishing confirmed for an early call (#2700)
by Nathan 09 Apr '21

09 Apr '21

### Description When updating from Kamailio 5.2.2 to 5.4.4, we're encountering an issue: the pua_dialoginfo module publishes a `confirmed` state for the dialog, even though it's still ringing. It turns out this commit introduces the problem since 5.3.0: 4efe19f So since 5.3.0, the dialog module (i think correctly?) sends out state updates for PRACK dialog updates as `DLGCB_REQ_WITHIN` events. But the `pua_dialoginfo` module seems to see that as a signal to mark the dialog confirmed (see [here](https://github.com/kamailio/kamailio/blob/master/src/modules/pua_dial…). One easy fix would be to simply remove `DLGCB__REQ_WITHIN` from the case list in pua_dialoginfo? OpenSER [seems to](https://github.com/OpenSIPS/opensips/blob/master/modules/pua_dialoginfo… ditch the `DLGCB_REQ_WITHIN` messages altogether, for specific messages... ### Troubleshooting #### Reproduction - Use the pua_dialoginfo module - Make sure your device uses PRACK - See that the dialog is confirmed even before you pick up; watch for log lines: `__dialog_sendpublish(): dialog confirmed` #### Debugging Data N/A #### Log Messages With 5.4.4: ``` 2021-04-02T16:49:44.453339+02:00 debug proxy[17964]: DEBUG: pua_dialoginfo [pua_dialoginfo.c:295]: __dialog_sendpublish(): dialog confirmed, from=sip:220@188.166.42.37 ``` #### SIP Traffic Just a regular invite with prack. ### Possible Solutions See above. ### Additional Information Reproduced with Kamailio 5.4.4, but probably all versions from 5.3.0 are affected. -- 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/2700

2 3

git:master:a5f88102: siptrace: fallback to udp if send sock is not set
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: a5f8810223021939b12eb0d04fc625f8d36980f7 URL: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T16:37:30+02:00 siptrace: fallback to udp if send sock is not set --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… Patch: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 31cabefe3b..4648340d73 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2211,6 +2211,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) dest_info_t new_dst; siptrace_data_t sto; sip_msg_t tmsg; + int proto; if(evp->data == 0) return -1; @@ -2238,6 +2239,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) LM_WARN("no sending socket found\n"); strcpy(sto.fromip_buff, SIPTRACE_ANYADDR); sto.fromip.len = SIPTRACE_ANYADDR_LEN; + proto = PROTO_UDP; } else { if(new_dst.send_sock->sock_str.len>=SIPTRACE_ADDR_MAX-1) { LM_ERR("socket string is too large: %d\n", @@ -2247,11 +2249,12 @@ int siptrace_net_data_sent(sr_event_param_t *evp) strncpy(sto.fromip_buff, new_dst.send_sock->sock_str.s, new_dst.send_sock->sock_str.len); sto.fromip.len = new_dst.send_sock->sock_str.len; + proto = new_dst.send_sock->proto; } sto.fromip.s = sto.fromip_buff; sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(new_dst.send_sock->proto), + siptrace_proto_name(proto), suip2a(&new_dst.to, sizeof(new_dst.to)), (int)su_getport(&new_dst.to)); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) {

1 0

git:master:303be6a9: core: cfg ctx - checks for valid variable offset
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 303be6a94be40dbe7c26c96e768627e8e9d0f860 URL: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T16:24:01+02:00 core: cfg ctx - checks for valid variable offset --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… Patch: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 733e0b4619..a1e761f3a2 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -284,7 +284,11 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, meta->array = array; clone_done = 1; } - memcpy(ginst->vars + var->offset, new_val, cfg_var_size(var)); + if(ginst->vars + var->offset) { + memcpy(ginst->vars + var->offset, new_val, cfg_var_size(var)); + } else { + LM_ERR("invalid variable offset\n"); + } } } return 0; @@ -1122,6 +1126,10 @@ int cfg_commit(cfg_ctx_t *ctx) } p = group_inst->vars + changed->var->offset; } + if(p==NULL) { + LM_ERR("failed to resolve valid variable offset\n"); + goto error; + } if (((changed->group_id_set && !changed->del_value && CFG_VAR_TEST_AND_SET(group_inst, changed->var))

1 0

git:master:bb917a29: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 09 Apr '21

09 Apr '21

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

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev