- sr-dev - kamailio.org

git:master:764d5be0: core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 764d5be0c44036bb4b86f841588fb0df3b4bb834 URL: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T11:22:20+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… Patch: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 94f972eae9..fb786ba635 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -509,7 +509,7 @@ void qm_free(void* qmp, void* p) #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f, file, line); - if (f->u.is_free){ + if (unlikely(f->u.is_free)){ if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { LM_CRIT("BUG: freeing already freed pointer (%p)," " called from %s: %s(%d), first free %s: %s(%ld) - aborting\n", @@ -524,12 +524,13 @@ void qm_free(void* qmp, void* p) } MDBG("freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line); -#endif +#else if (unlikely(f->u.is_free)){ LM_INFO("freeing a free fragment (%p/%p) - ignore\n", f, p); return; } +#endif size=f->size; qm->used-=size;

2 2

git:master:e279f2f4: topos: explicitely set the db match operator and value type for uuid
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: e279f2f464ab05e1a2821d6e2d9e673fe145fbf2 URL: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T14:58:39+02:00 topos: explicitely set the db match operator and value type for uuid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… Patch: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 2d611402c8..6e88b35af3 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1148,20 +1148,32 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if(md->a_uuid.len>0) { if(md->a_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); nr_keys++; } else if(md->a_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); nr_keys++; } } else if(md->b_uuid.len>0) { if(md->b_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); nr_keys++; } else if(md->b_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); nr_keys++; }

1 0

git:master:fb5ab201: topos: increase the number of db keys for query when using uuid for branch
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: fb5ab20123a07afdfaf96197db25d76f8dda0683 URL: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T14:51:55+02:00 topos: increase the number of db keys for query when using uuid for branch - debug message to print a/b uuid --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… Patch: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 852a19aaa2..854d2cdbc6 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -826,6 +826,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) } lkey = msg->callid->body; + LM_DBG("callid [%.*s] - a_uuid [%.*s] - b_uuid [%.*s]\n", lkey.len, lkey.s, + mtsd.a_uuid.len, ((mtsd.a_uuid.len>0)?mtsd.a_uuid.s:""), + mtsd.b_uuid.len, ((mtsd.b_uuid.len>0)?mtsd.b_uuid.s:"")); tps_storage_lock_get(&lkey); diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index caff16c5ee..2d611402c8 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1149,17 +1149,21 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if(md->a_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + nr_keys++; } else if(md->a_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + nr_keys++; } } else if(md->b_uuid.len>0) { if(md->b_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + nr_keys++; } else if(md->b_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + nr_keys++; } } }

1 0

git:master:1d6736d1: topos: restore checks on uri and sip_params for tps_dlg_message_update()
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 1d6736d16ab3a83b77d6c7be3f9689c7fbfccf28 URL: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:49:42+02:00 topos: restore checks on uri and sip_params for tps_dlg_message_update() - use define for expected min len safety checks --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… Patch: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index cbf8b3c9f3..852a19aaa2 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -309,17 +309,18 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) str tuuid = STR_NULL; int ret; +#define TPS_TUUID_MIN_LEN 10 + if(parse_sip_msg_uri(msg)<0) { LM_ERR("failed to parse r-uri\n"); return -1; } - if(msg->parsed_uri.sip_params.len<10) { - LM_DBG("not an expected %s format\n", (ctmode==0)?"user":"param"); - return 1; - } - if (ctmode == 1 || ctmode == 2) { + if(msg->parsed_uri.sip_params.len<TPS_TUUID_MIN_LEN) { + LM_DBG("not an expected param format\n"); + return 1; + } /* find the r-uri parameter */ ret = tps_get_param_value(&msg->parsed_uri.params, &_tps_cparam_name, &tuuid); @@ -332,6 +333,10 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return 1; } } else { + if(msg->parsed_uri.user.len<TPS_TUUID_MIN_LEN) { + LM_DBG("not an expected user format\n"); + return 1; + } tuuid = msg->parsed_uri.user; }

1 0

git:master:317ddc9e: topos: check if event field exists for NOTIFY
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 317ddc9efa2f11f0fe3787e9ab462550724954ed URL: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:43:21+02:00 topos: check if event field exists for NOTIFY --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… Patch: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 21cb59c517..caff16c5ee 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1110,7 +1110,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if((get_cseq(msg)->method_id == METHOD_SUBSCRIBE) || ((get_cseq(msg)->method_id == METHOD_NOTIFY) - && (msg->event->len > 0))) { + && (msg->event && msg->event->len > 0))) { bInviteDlg = 0; }

1 0

git:master:94e89887: topos: load associated early dialog transaction using also uuid
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 94e8988769662a5ae68e30847eef133d50ec5431 URL: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:02:11+02:00 topos: load associated early dialog transaction using also uuid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… Patch: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 25275ab272..21cb59c517 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1144,6 +1144,24 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = bInviteDlg ? sinv : ssub; nr_keys++; + + if(md->a_uuid.len>0) { + if(md->a_uuid.s[0]=='a') { + db_keys[nr_keys]=&tt_col_a_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + } else if(md->a_uuid.s[0]=='b') { + db_keys[nr_keys]=&tt_col_b_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + } + } else if(md->b_uuid.len>0) { + if(md->b_uuid.s[0]=='a') { + db_keys[nr_keys]=&tt_col_a_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + } else if(md->b_uuid.s[0]=='b') { + db_keys[nr_keys]=&tt_col_b_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + } + } } if(msg->first_line.type==SIP_REQUEST && md->x_context.len>0) {

1 0

git:master:7e5c4c30: topos: simplified tps_dlg_message_update()
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 7e5c4c30d2f0bbed2b566d46e5141b6abba315e7 URL: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T12:48:37+02:00 topos: simplified tps_dlg_message_update() --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… Patch: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index bf5815fa76..cbf8b3c9f3 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -306,7 +306,7 @@ int tps_dlg_detect_direction(sip_msg_t *msg, tps_data_t *ptsd, */ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) { - str tmp; + str tuuid = STR_NULL; int ret; if(parse_sip_msg_uri(msg)<0) { @@ -314,14 +314,15 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return -1; } + if(msg->parsed_uri.sip_params.len<10) { + LM_DBG("not an expected %s format\n", (ctmode==0)?"user":"param"); + return 1; + } + if (ctmode == 1 || ctmode == 2) { - if(msg->parsed_uri.sip_params.len<10) { - LM_DBG("not an expected param format\n"); - return 1; - } - // find parameter, there might be others + /* find the r-uri parameter */ ret = tps_get_param_value(&msg->parsed_uri.params, - &_tps_cparam_name, &tmp); + &_tps_cparam_name, &tuuid); if (ret < 0) { LM_ERR("failed to parse param\n"); return -1; @@ -330,31 +331,20 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) LM_DBG("prefix para not found\n"); return 1; } - if(memcmp(tmp.s, "atpsh-", 6)==0) { - ptsd->a_uuid = tmp; - return 0; - } - if(memcmp(tmp.s, "btpsh-", 6)==0) { - ptsd->a_uuid = tmp; - ptsd->b_uuid = tmp; - return 0; - } - } else { - if(msg->parsed_uri.user.len<10) { - LM_DBG("not an expected user format\n"); - return 1; - } - if(memcmp(msg->parsed_uri.user.s, "atpsh-", 6)==0) { - ptsd->a_uuid = msg->parsed_uri.user; - return 0; - } - if(memcmp(msg->parsed_uri.user.s, "btpsh-", 6)==0) { - ptsd->a_uuid = msg->parsed_uri.user; - ptsd->b_uuid = msg->parsed_uri.user; - return 0; - } + tuuid = msg->parsed_uri.user; + } + + if(memcmp(tuuid.s, "atpsh-", 6)==0) { + ptsd->a_uuid = tuuid; + return 0; + } + if(memcmp(tuuid.s, "btpsh-", 6)==0) { + ptsd->a_uuid = tuuid; + ptsd->b_uuid = tuuid; + return 0; } + LM_DBG("not an expected prefix\n"); return 1; @@ -840,7 +830,6 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(((get_cseq(msg)->method_id) & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - memset(&stsd, 0, sizeof(tps_data_t)); if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { @@ -850,6 +839,8 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_link_msg(msg, &mtsd, direction) < 0) { goto error; } + mtsd.direction = direction; + memset(&stsd, 0, sizeof(tps_data_t)); if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { goto error; } @@ -859,9 +850,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error; } + mtsd.direction = direction; } - mtsd.direction = direction; tps_storage_lock_release(&lkey);

1 0

git:master:975a61c8: topos: safety handling of onsend data
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 975a61c89b2440fba737758cce3ab08000811b02 URL: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T10:14:58+02:00 topos: safety handling of onsend data --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… Patch: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 24cb77c208..ba58920a6c 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -602,12 +602,15 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, struct run_act_ctx ctx; int rtb; sr_kemi_eng_t *keng = NULL; - struct onsend_info onsnd_info = {0}; + onsend_info_t onsnd_info = {0}; + onsend_info_t *p_onsend_bak; if(!(_tps_eventrt_mode & evtype)) { return 0; } + p_onsend_bak = p_onsend; + if(evidx<0) { if(_tps_eventrt_callback.s!=NULL || _tps_eventrt_callback.len>0) { keng = sr_kemi_eng_get(); @@ -627,8 +630,10 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, evidx); fmsg = faked_msg_next(); - onsnd_info.to = &evp->dst->to; - onsnd_info.send_sock = evp->dst->send_sock; + if(evp->dst) { + onsnd_info.to = &evp->dst->to; + onsnd_info.send_sock = evp->dst->send_sock; + } if(msg!=NULL) { onsnd_info.buf = msg->buf; onsnd_info.len = msg->len; @@ -650,7 +655,7 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, evname)<0) { LM_ERR("error running event route kemi callback\n"); - p_onsend=NULL; + p_onsend=p_onsend_bak; return -1; } } @@ -658,12 +663,12 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, set_route_type(rtb); if(ctx.run_flags&DROP_R_F) { LM_DBG("exit due to 'drop' in event route\n"); - p_onsend=NULL; + p_onsend=p_onsend_bak; return 1; } done: - p_onsend=NULL; + p_onsend=p_onsend_bak; return 0; }

1 0

git:master:72cc3d46: topos: uniform processing for requests during early dialog
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 72cc3d46c39791d50927508114bdd1faa4a83f4c URL: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T10:14:58+02:00 topos: uniform processing for requests during early dialog - requests that are handled during 1xx state, like PRACK, UPDATE, BYE --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… Patch: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 2389026d14..bf5815fa76 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -834,35 +834,31 @@ int tps_request_received(sip_msg_t *msg, int dialog) tps_storage_lock_get(&lkey); - if((get_cseq(msg)->method_id)&(METHOD_PRACK)) { - if(tps_storage_link_msg(msg, &mtsd, TPS_DIR_DOWNSTREAM)<0) { + if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { + goto error; + } + if(((get_cseq(msg)->method_id) & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) + && stsd.b_contact.len <= 0) { + /* no B-side contact, look for INVITE transaction record */ + memset(&stsd, 0, sizeof(tps_data_t)); + if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { + goto error; + } + } + if(tps_storage_link_msg(msg, &mtsd, direction) < 0) { goto error; } - if(tps_storage_load_branch(msg, &mtsd, &stsd, 1)<0) { + if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { goto error; } use_branch = 1; } else { - if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error; } - if(((get_cseq(msg)->method_id) & (METHOD_BYE)) - && stsd.b_contact.len <= 0) { - /* BYE but not B-side contact, look for INVITE transaction record */ - memset(&stsd, 0, sizeof(tps_data_t)); - if(tps_storage_link_msg(msg, &mtsd, TPS_DIR_DOWNSTREAM) < 0) { - goto error; - } - if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { - goto error; - } - use_branch = 1; - } else { - /* detect direction - via from-tag */ - if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { - goto error; - } - } } mtsd.direction = direction;

1 0

git:master:32800023: lost: Coverity Scan fixes
by Wolfgang Kampichler 25 Apr '21

25 Apr '21

Module: kamailio Branch: master Commit: 328000233928fa08095889fdca7d66acba5e5825 URL: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-25T22:44:01+02:00 lost: Coverity Scan fixes --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a… Patch: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a…

1 0

git:master:5d661eaa: topos: use context to load stored branch attributes only for requests
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: 5d661eaa92461f3b43c433ec32653c4f89bb818e URL: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-23T12:36:20+02:00 topos: use context to load stored branch attributes only for requests --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… Patch: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 408d84d8cc..25275ab272 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1146,7 +1146,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, nr_keys++; } - if(md->x_context.len>0) { + if(msg->first_line.type==SIP_REQUEST && md->x_context.len>0) { db_keys[nr_keys]=&tt_col_x_context; db_ops[nr_keys]=OP_EQ; db_vals[nr_keys].type = DB1_STR;

1 0

git:master:fb777b0e: topos: reset context on msg received callback
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: fb777b0e9bf2f87ea8cb1b0134fbfcc625121ad4 URL: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-23T12:36:20+02:00 topos: reset context on msg received callback --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… Patch: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 4975af9493..24cb77c208 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -432,6 +432,8 @@ int tps_msg_received(sr_event_param_t *evp) int dialog; int ret; + ki_tps_set_context(NULL, NULL); + obuf = (str*)evp->data; if(tps_execute_event_route(NULL, evp, TPS_EVENTRT_INCOMING,

1 0

git:master:55095abd: pkg/kamailio/deb: version set 5.6.0~dev0
by Victor Seva 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: 55095abdb65ddf1d332d294c1acefc61935f240e URL: https://github.com/kamailio/kamailio/commit/55095abdb65ddf1d332d294c1acefc6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-23T11:28:44+02:00 pkg/kamailio/deb: version set 5.6.0~dev0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/55095abdb65ddf1d332d294c1acefc6… Patch: https://github.com/kamailio/kamailio/commit/55095abdb65ddf1d332d294c1acefc6…

1 0

Branch 5.5 has been created
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Hello, the branch 5.5 has been created, to be used for releasing v5.5.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.5 cd kamailio-5.5 git checkout -b 5.5 origin/5.5 Pushing commits in this branch: git push origin 5.5:5.5 Note that 5.5 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.5 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 5.5 will be out, respectively Kamailio v5.5.0. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

[CRON] Failed: dbank888/kamailio#133 (master - 491e19e)
by Travis CI 22 Apr '21

22 Apr '21

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

1 0

Development is open for future release of v5.6.x series
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Hello, the branch 5.5 was created, therefore the master branch is open for adding new features, to be part of future release series v5.6.x (or whatever version is decided for next series). Any bug fix committed to master that applies to 5.5.x or older stable branches should be backported as usual with "git cherry-pick -x ..." to appropriate branches like 5.5 or 5.4. Expect that v5.5.0 will be released in a few weeks from now. Based on the workflow used during the past years, the next future release v5.6.0 should be out after another 6-10 months of development, plus 1-2 months of testing, so sometime by end of 2021 or in the first part of 2022. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.5:677bf448: Makefile.defs: version set to 5.5.0-rc0
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: 5.5 Commit: 677bf4480a14ea1c93eb92000cad19299d2d098e URL: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:54:33+02:00 Makefile.defs: version set to 5.5.0-rc0 - branch 5.5 was created to host 5.5.x series - vesion type set to release candidate mode --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… Patch: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2247a05385..a7791acb28 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:0c1211b0: Makefile.defs: version set to 5.6.0-dev0
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 0c1211b02b48bf7776bd490454d0ad9ae785032e URL: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:51:26+02:00 Makefile.defs: version set to 5.6.0-dev0 - master branch is open for new features to be part of future release series 5.6.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… Patch: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2247a05385..027c985798 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 5 +PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:a8217183: Makefile.defs: version set to 5.5.0-pre1
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: a82171835767f65aa7365d303e53c097bf59e21a URL: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:48:20+02:00 Makefile.defs: version set to 5.5.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… Patch: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 1d8e131e12..2247a05385 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:54fe6aa0: topos_redis: set attributes always for provisional replies
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 54fe6aa05a266bfbf0cffedde89134ba534c8d1b URL: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:46:29+02:00 topos_redis: set attributes always for provisional replies --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… Patch: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 93f02da0fd..5f0fda701e 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1171,15 +1171,14 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &tt_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &tt_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &tt_key_b_contact, argv, argvlen); } if((mode & TPS_DBU_RPLATTRS) && msg->first_line.type==SIP_REPLY) { - if(sd->b_tag.len<=0 - && msg->first_line.u.reply.statuscode>=180 + if(msg->first_line.u.reply.statuscode>=180 && msg->first_line.u.reply.statuscode<200) { TPS_REDIS_SET_ARGS(&md->b_rr, argc, &tt_key_y_rr, argv, argvlen);

1 0

git:master:86b05ed4: ims_charging: fixed compiler warnings for kemi exports
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 86b05ed47d2ec44535b3615dbebac59e4c2c99ca URL: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T09:29:26+02:00 ims_charging: fixed compiler warnings for kemi exports --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… Patch: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index a8883dc548..a01a08b566 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -409,7 +409,7 @@ static int ki_ro_ccr_stop(sip_msg_t *msg, str* p_direction, int p_code, str* p_r struct ro_session* ro_session; struct ro_session_entry *ro_session_entry; unsigned int h_entry; - str s_code, s_reason; + str s_reason; unsigned int code; int dir = 0; /*any side*/ char *c_direction; @@ -527,7 +527,7 @@ static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int re return RO_RETURN_ERROR; } - dir = get_direction_as_int(&s_direction); + dir = get_direction_as_int(s_direction); if (dir == RO_ORIG_DIRECTION) { //get caller IMPU from asserted identity @@ -610,7 +610,7 @@ static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int re goto done; } - ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, &s_incoming_trunk_id, &s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel); + ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, s_incoming_trunk_id, s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel); if(ret < 0){ LM_ERR("Failed to send CCR\n"); @@ -669,6 +669,7 @@ static int ki_ro_set_session_id_avp(sip_msg_t *msg) { res = create_response_avp_string("ro_session_id", &ro_session->ro_session_id); dlgb.release_dlg(dlg); unref_ro_session(ro_session, 1, 1); + return res; } static int ro_fixup_stop(void **param, int param_no) { @@ -702,4 +703,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(ims_charging_kemi_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:06e265b3: ims_diameter_server: removed goto label used in single place
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 06e265b38a857789b64ca1370db039eeca5a0e50 URL: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T09:36:31+02:00 ims_diameter_server: removed goto label used in single place --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… Patch: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index 2270a62560..3ee51601ec 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -286,7 +286,10 @@ int ki_diameter_request(struct sip_msg * msg, str* s_peer, int i_appid, int i_co session = 0; } - if (!req) goto error1; + if (!req) { + LM_ERR("Error occurred trying to send request\n"); + return -1; + } if (!addAVPsfromJSON(req, s_message)) { LM_ERR("Failed to parse JSON Request\n"); @@ -325,12 +328,6 @@ int ki_diameter_request(struct sip_msg * msg, str* s_peer, int i_appid, int i_co } } } -error1: - //Only free UAR IFF it has not been passed to CDP - if (req) cdpb.AAAFreeMessage(&req); - LM_ERR("Error occurred trying to send request\n"); - return -1; - } int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* commandcode, char* message, int async) {

1 0

git:master:94068d2e: dmq: skip removing local node via rpc command
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 94068d2e40eb867a5d6da44868d5edb52949f817 URL: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T08:36:11+02:00 dmq: skip removing local node via rpc command --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Patch: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 631dce11d5..4300f80b54 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -328,9 +328,12 @@ void pkg_free_node(dmq_node_t *node) } /** - * @brief delete dmq node + * @brief delete dmq node with filter rules + * - list - the list of nodes + * - node - the structure with characteristics of the node to be deleted + * - filter - if 0: delete node always; if 1: delete node if not local */ -int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +int dmq_node_del_filter(dmq_node_list_t *list, dmq_node_t *node, int filter) { dmq_node_t *cur, **prev; lock_get(&list->lock); @@ -338,8 +341,10 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) prev = &list->nodes; while(cur) { if(cmp_dmq_node(cur, node)) { - *prev = cur->next; - destroy_dmq_node(cur, 1); + if(filter==0 || cur->local==0) { + *prev = cur->next; + destroy_dmq_node(cur, 1); + } lock_release(&list->lock); return 1; } @@ -350,6 +355,14 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node + */ +int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +{ + return dmq_node_del_filter(list, node, 0); +} + /** * @brief delete dmq node by uri */ @@ -363,7 +376,7 @@ int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) return -1; } - return del_dmq_node(list, &dnode); + return dmq_node_del_filter(list, &dnode, 1); } /**

1 0

git:master:0fa5455d: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 0fa5455d9bc1d603c142cd9a767df5b248eba64a URL: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T19:31:12+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Patch: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 78196f8ce1..1e7d6ff375 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -56,6 +56,7 @@ Charles Chance 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 2. Developer Guide @@ -87,6 +88,7 @@ Charles Chance 1.14. dmq_t_replicate usage 1.15. dmq_is_from_node usage 1.16. dmq.list_nodes usage + 1.17. dmq.remove usage 2.1. dmq_api_t structure 2.2. register_dmq_peer usage 2.3. bcast_message usage @@ -125,6 +127,7 @@ Chapter 1. Admin Guide 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 1. Overview @@ -464,6 +467,7 @@ ext/plain"); 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 5.1. dmq.list_nodes @@ -474,6 +478,18 @@ ext/plain"); kamcmd dmq.list_nodes ... +5.2. dmq.remove + + Remove a DMQ node by address. + + Parameters: + * address - the SIP address of the DMQ node to remove. + + Example 1.17. dmq.remove usage +... +kamctl rpc dmq.remove sip:1.2.3.4:5060 +... + Chapter 2. Developer Guide Table of Contents

1 0

Branching 5.5 on git repo for 5.5.x releases
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Hello, since freezing the development for 5.5 series, I did quite a lot of code analyzing with a bunch of tools as well as run various tests, no major issue being in my list at this moment, therefore I think we can plan branching 5.5 on git repo in the near future. If there is no other suggestion or argument against it, I propose to create the branch 5.5 on Thursday next week (April 22, 2021). After that, master branch will be open for new features (to become part of 5.6 or what ever version will be decided to be next), testing will continue for branch 5.5 for another 1-2 weeks, then we will release 5.5.0 as first stable version in the 5.5.x series. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:955152db: dmq: added dmq.remove rpc command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 955152dbe5d1f05bf24d6ba23b091fe91a202cc3 URL: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:09:21+02:00 dmq: added dmq.remove rpc command - make it possible to remove a node that still is reachable by old address without having to shut dowm all nodes --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h --- Diff: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Patch: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index fea60e0cc4..1db7cdd1f4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -430,8 +430,29 @@ static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) static const char *dmq_rpc_list_nodes_doc[2] = {"Print all nodes", 0}; +void rpc_dmq_remove(rpc_t* rpc, void* ctx) +{ + str taddr = STR_NULL; + + if (rpc->scan(ctx, ".S", &taddr) < 1) { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(dmq_node_del_by_uri(dmq_node_list, &taddr)<0) { + rpc->fault(ctx, 500, "Failure"); + return; + } +} + +static const char* rpc_dmq_remove_doc[3] = { + "Remove a DMQ node", + "address - the DMQ node address", + 0 +}; + static rpc_export_t rpc_methods[] = { {"dmq.list_nodes", dmq_rpc_list_nodes, dmq_rpc_list_nodes_doc, RET_ARRAY}, + {"dmq.remove", rpc_dmq_remove, rpc_dmq_remove_doc, 0}, {0, 0, 0, 0} }; diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 7e6ef93bdf..631dce11d5 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -350,6 +350,22 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node by uri + */ +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) +{ + dmq_node_t dnode; + + memset(&dnode, 0, sizeof(dmq_node_t)); + if(parse_uri(suri->s, suri->len, &dnode.uri) < 0) { + LM_ERR("error parsing uri [%.*s]\n", suri->len, suri->s); + return -1; + } + + return del_dmq_node(list, &dnode); +} + /** * @brief add dmq node */ diff --git a/src/modules/dmq/dmqnode.h b/src/modules/dmq/dmqnode.h index 45cac604a4..22c5c6fb1d 100644 --- a/src/modules/dmq/dmqnode.h +++ b/src/modules/dmq/dmqnode.h @@ -69,6 +69,7 @@ dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node); dmq_node_t *find_dmq_node_uri(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node_uri2(str *uri); int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node); +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri); int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode); int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status); dmq_node_t *shm_dup_node(dmq_node_t *node);

1 0

git:master:adf8919f: dmq: docs for rpc dmq.remove command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: adf8919f52841800f0cd4528c33679c7ef80f2c5 URL: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:16:21+02:00 dmq: docs for rpc dmq.remove command --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Patch: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0e749e901e..ebc6f44e1a 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -518,6 +518,30 @@ modparam("dmq", "ping_interval", 90) <programlisting format="linespecific"> ... &kamcmd; dmq.list_nodes +... + </programlisting> + </example> + </section> + <section id="dmq.r.list_nodes"> + <title>dmq.remove</title> + <para> + Remove a DMQ node by address. + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>address</emphasis> - the SIP address + of the DMQ node to remove. + </para> + </listitem> + </itemizedlist> + + <example> + <title>dmq.remove usage</title> + <programlisting format="linespecific"> +... +&kamctl; rpc dmq.remove sip:1.2.3.4:5060 ... </programlisting> </example>

1 0

Crashes because of mixed shm and pkg in kamailio
by Rick Barenthin 21 Apr '21

21 Apr '21

Hi everyone, We have seen some crashes in kamailio version 5.3 which happens in some modules who are getting the request for a reply from the transaction by the tm module export and try to parse extra header in this request by the parser functions. This seems to create a mix of shm with pkg which lead to a crash in retransmission. My question is, is there a way to make sure that there is no mix of shm and pkg or is the parsing on the message from the transaction not a planned way of usage? Best regards Rick

3 2

git:master:1b956d74: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 1b956d74b25c9f80f01a6aa0bc7a6ff8f3d0f712 URL: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T11:31:26+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Patch: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff…

1 0

git:master:17e757c9: dmq: docs for server_socket address
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 17e757c91e6e96f6711d9251979d81a792aaef08 URL: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T10:55:18+02:00 dmq: docs for server_socket address --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… Patch: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 20a2e647b3..0e749e901e 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -121,7 +121,12 @@ sip:192.168.40.17:5060;status=active <section id="dmq.p.server_address"> <title><varname>server_address</varname>(str)</title> <para> - The local server address. This is the interface over which the DMQ engine will send/receive messages. + The local server address. This is the addres with which the local DMQ + node joins the servers group to send/receive messages. + </para> + <para> + Note: if server_socket is not set, then this address has to match a + local socket, which will be used to send/receive messages. </para> <para> <emphasis>Default value is <quote>NULL</quote>.</emphasis> @@ -134,6 +139,28 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") ... +</programlisting> + </example> + </section> + <section id="dmq.p.server_socket"> + <title><varname>server_socket</varname>(str)</title> + <para> + The local listen address. This is the interface over which the DMQ + engine will send/receive messages. + </para> + <para> + Note: if this parameter is not set, the socket to send/receice + messages is built from server_address parameter. + </para> + <para> + <emphasis>Default value is <quote>NULL</quote>.</emphasis> + </para> + <example> + <title>Set <varname>server_socket</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq", "server_socket", "udp:10.0.0.20:5060") +... </programlisting> </example> </section>

1 0

git:master:a9a8bb31: dmq: exposed the server socket to modparam list
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: a9a8bb31ed8f3d08579fc1d8b4e3b598c77c93be URL: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T10:49:39+02:00 dmq: exposed the server socket to modparam list --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… Patch: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 27e950e472..fea60e0cc4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -118,6 +118,7 @@ static param_export_t params[] = { {"num_workers", INT_PARAM, &dmq_num_workers}, {"ping_interval", INT_PARAM, &dmq_ping_interval}, {"server_address", PARAM_STR, &dmq_server_address}, + {"server_socket", PARAM_STR, &dmq_server_socket}, {"notification_address", PARAM_STR|USE_FUNC_PARAM, dmq_add_notification_address}, {"notification_channel", PARAM_STR, &dmq_notification_channel}, {"multi_notify", INT_PARAM, &dmq_multi_notify}, @@ -229,10 +230,12 @@ static int mod_init(void) return -1; } - /* create socket string out of the server_uri */ - if(make_socket_str_from_uri(&dmq_server_uri, &dmq_server_socket) < 0) { - LM_ERR("failed to create socket out of server_uri\n"); - return -1; + if(dmq_server_socket.s==NULL || dmq_server_socket.len<=0) { + /* create socket string out of the server_uri */ + if(make_socket_str_from_uri(&dmq_server_uri, &dmq_server_socket) < 0) { + LM_ERR("failed to create socket out of server_uri\n"); + return -1; + } } if(lookup_local_socket(&dmq_server_socket) == NULL) { LM_ERR("server_uri is not a socket the proxy is listening on\n"); @@ -354,9 +357,6 @@ static void destroy(void) dmq_self_node->status = DMQ_NODE_DISABLED; request_nodelist(dmq_notification_node, 1); } - if(dmq_server_socket.s) { - pkg_free(dmq_server_socket.s); - } if(dmq_init_callback_done) { shm_free(dmq_init_callback_done); }

1 0

[kamailio/kamailio] export functions of ims_charging and ims_diameter_server to kemi (#2704)
by Riccardo-78 20 Apr '21

20 Apr '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  export functions of ims_charging and ims_diameter_server to kemi You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2704 -- Commit Summary -- * Merge pull request #1 from kamailio/master * ims_charging: export functions to kemi * ims_diameter_server: export functions to kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (27) M src/modules/ims_diameter_server/ims_diameter_server.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2704.patch https://github.com/kamailio/kamailio/pull/2704.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2704

2 5

git:master:4436fb7d: ims_charging: export functions to kemi
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 4436fb7dc6bf868f30e9c7bcfd1ad57e49d6be0d URL: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:44:15+02:00 ims_charging: export functions to kemi --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57… Patch: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57…

1 0

git:master:1ddc27f1: ims_diameter_server: export functions to kemi
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 1ddc27f199061025a6a43da3e8a1388fcaddfe19 URL: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:44:15+02:00 ims_diameter_server: export functions to kemi --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388… Patch: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388…

1 0

[kamailio/kamailio] smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() (#2702)
by alexyosifov 20 Apr '21

20 Apr '21

- Added new sms pdu data: originating & destination address flags; SCTS(DELIVER)/VP(SUBMIT) absolute time format. - decode_3gpp_sms(): added support for DELIVER type; Added VP-AbsoluteTimeFormat for SUBMIT type. - pv_sms_body(): added support for ucs2 coding. - Extends of pv_get_sms() and pv_set_sms(): added support for originating & destination address flags.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2702 -- Commit Summary -- * smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() -- File Changes -- M src/modules/smsops/smsops_impl.c (343) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2702.patch https://github.com/kamailio/kamailio/pull/2702.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2702

2 3

git:master:e2b8bdda: smsops: Imrovements in decode_3gpp_sms() and pv_sms_body()
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: e2b8bddad08f12f7eb48db199fad6ed184c58bac URL: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:38:51+02:00 smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() - Added new sms pdu data: originating & destination address flags; SCTS(DELIVER)/VP(SUBMIT) absolute time format. - decode_3gpp_sms(): added support for DELIVER type; Added VP-AbsoluteTimeFormat for SUBMIT type. - pv_sms_body(): added support for ucs2 coding. - Extends of pv_get_sms() and pv_set_sms(): added support for originating & destination address flags. --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed… Patch: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed…

1 0

[kamailio/kamailio] pkg/kamailio/obs: used more recent gcc for RHEL and CentOS dists (#2711)
by sergey-safarov 20 Apr '21

20 Apr '21

#### Pre-Submission Checklist - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [*] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description PR upgraded GCC for RPM packaging. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2711 -- Commit Summary -- * pkg/kamailio/obs: used more recent gcc for RHEL and CentOS dists -- File Changes -- M pkg/kamailio/obs/kamailio.spec (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2711.patch https://github.com/kamailio/kamailio/pull/2711.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2711

3 9

[kamailio/kamailio] rtpengine: session refresh, do not try use other rtpengine node on rtpengine node failure (#2713)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description I want to use Session timers to refresh SDP on RTPengine node failure. If call RTP streams established via first RTPengine node, and then this RTPengine node is stopped, then rtpengine Kamailio module do not try to use other RTPengine nodes. ### Troubleshooting #### Reproduction Update /etc/kamailio/kamailio.cfg using patch like ```diff diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index be71dbb54a..1a6788f79f 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,4 +1,7 @@ #!KAMAILIO +#!define WITH_DEBUG +#!define WITH_NAT +#!define WITH_RTPENGINE # # Kamailio SIP Server v5.5 - default configuration script # - web: https://www.kamailio.org @@ -195,6 +198,8 @@ children=8 * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ # listen=udp:10.0.0.10:5060 +listen=tcp:3.236.25.6:5060 +listen=tcp:[2600:1f18:578:5700::6]:5060 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ @@ -456,7 +461,7 @@ modparam("presence_xml", "force_active", 1) #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- -modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") +modparam("rtpengine", "rtpengine_sock", "udp6:rtp-us-east-1a-6.nga911.com:2223 udp6:rtp-us-east-1a-7.nga911.com:2223") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") @@ -528,6 +533,11 @@ request_route { # handle requests within SIP dialogs route(WITHINDLG); + if (loose_route()) { + route(NATMANAGE); + record_route(); + route(RELAY); + } ### only initial requests (no To tag) # authentication @@ -850,10 +860,11 @@ route[NATMANAGE] { if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE - if(nat_uac_test("8")) { - rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); + if($avp(rtpengine_offer) == "done") { + rtpengine_answer("ICE=remove address-family=IP4 SDES=off"); } else { - rtpengine_manage("replace-origin replace-session-connection"); + rtpengine_offer("ICE=remove address-family=IP6 SDES=off"); + $avp(rtpengine_offer) = "done"; } #!else if(nat_uac_test("8")) { ``` Establish call via this Kamailio. In my case used `Route` header in initial INVITE. When a call is established, then need stop RTPengine daemon on node used for media proxing. Wait when the caller sends a session refresh. According to Kamailio logs not attempt to reach another RTPengine node if the first node not available more. #### Log Messages In [kam.log](https://github.com/kamailio/kamailio/files/6330914/kam.log) please check messages related to ``` Call-ID: 6aac81b6-a028-11eb-8bf8-870daa274dfe CSeq: 34815260 INVITE ``` In log you will find at string 3437 ``` 11(31837) exec: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} *** cfgtrace:dbg_cfg_trace(): branch_route=[NATMANAGE] c=[/root/kamailio/etc/kamailio.cfg] l=866 a=25 n=rtpengine_offer 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine_funcs.c:144]: check_content_type(): type <application/sdp> found valid 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:1834]: build_rtpp_socks(): same rtpengines list version: 1 (1618738091) 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3266]: select_rtpp_node_old(): rtpengine hash table lookup find node=udp6:rtp-us-east-1a-7.nga911.com:2223 for calllen=36 callid=6aac81b6-a028-11eb-8bf8-870daa274dfe viabranch= 11(31837) ERROR: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3027]: send_rtpp_command(): can't send command "offer" to RTPEngine <udp6:rtp-us-east-1a-7.nga911.com:2223> 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:1834]: build_rtpp_socks(): same rtpengines list version: 1 (1618738091) 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3266]: select_rtpp_node_old(): rtpengine hash table lookup find node=udp6:rtp-us-east-1a-7.nga911.com:2223 for calllen=36 callid=6aac81b6-a028-11eb-8bf8-870daa274dfe viabranch= 11(31837) ERROR: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:2664]: rtpp_function_call(): no available proxies ``` At this moment one other RTPengine node is available, but rtpengine Kamailio module does not try to reach this node. #### SIP Traffic [no-rtpengine-swithover.pcap.gz](https://github.com/kamailio/kamailio/files/… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [centos@sbc-a2 ~]$ kamailio -v version: kamailio 5.5.0-pre0 (x86_64/linux) 9413fc flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9413fc compiled on 04:03:33 Apr 3 2021 with gcc 8.3.1 ``` * **Operating System**: ``` [centos@sbc-a2 ~]$ cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- 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/2713

2 4

git:master:14019c67: topos: set downstream rr set for replies
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 14019c67d7fcf8f4d027fa1552ae15cb42d31bdb URL: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:16:31+02:00 topos: set downstream rr set for replies --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… Patch: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 384ae1750e..2389026d14 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -548,6 +548,14 @@ int tps_pack_message(sip_msg_t *msg, tps_data_t *ptsd) ptsd->as_contact.len, ZSW(ptsd->as_contact.s), ptsd->as_contact.len, ptsd->bs_contact.len, ZSW(ptsd->bs_contact.s), ptsd->bs_contact.len); ptsd->x_rr = ptsd->a_rr; + if(isreq==0) { + if(msg->first_line.u.reply.statuscode >= 180 + && msg->first_line.u.reply.statuscode < 199) { + /* provisional replies that create early dialogs + * - skip 199 Early Dialog Terminated */ + ptsd->y_rr = ptsd->b_rr; + } + } ptsd->s_method_id = get_cseq(msg)->method_id; if(_tps_context_value.len>0) { ptsd->x_context = _tps_context_value;

1 0

[kamailio/kamailio] absolute dns names trigger error (#2706)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description To avoid extra DNS requests I want to use absolute DNS names instead of relative. To do this I configured ``` modparam("siptrace", "duplicate_uri", "sip:sip-trace6.example.com.:9060" ``` And now I can see errors ``` CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri ``` I am expecting "sip-trace6.example.com." DNS name resolution without errors in Kamailio log. used current master. -- 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/2706

2 8

[kamailio/kamailio] rtpengine_manage: send SDP two times (#2715)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description When used `rtpengine_manage` function then `RTPengine` node returns the correct response but in the outbound SIP message, SDP is duplicated. ### Troubleshooting #### Reproduction Updated /etc/kamailio/kamailio.cfg like in this patch. ```diff diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index be71dbb54a..89960b38d8 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,4 +1,7 @@ #!KAMAILIO +#!define WITH_DEBUG +#!define WITH_NAT +#!define WITH_RTPENGINE # # Kamailio SIP Server v5.5 - default configuration script # - web: https://www.kamailio.org @@ -195,6 +198,8 @@ children=8 * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ # listen=udp:10.0.0.10:5060 +listen=tcp:3.236.25.6:5060 +listen=tcp:[2600:1f18:578:5700::6]:5060 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ @@ -456,7 +461,7 @@ modparam("presence_xml", "force_active", 1) #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- -modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") +modparam("rtpengine", "rtpengine_sock", "udp6:rtp-us-east-1a-6.nga911.com:2223 udp6:rtp-us-east-1a-7.nga911.com:2223") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") @@ -528,6 +533,11 @@ request_route { # handle requests within SIP dialogs route(WITHINDLG); + if (loose_route()) { + route(NATMANAGE); + record_route(); + route(RELAY); + } ### only initial requests (no To tag) # authentication @@ -850,10 +860,11 @@ route[NATMANAGE] { if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE - if(nat_uac_test("8")) { - rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); + if($avp(rtpengine_offer) == "done") { + rtpengine_manage("ICE=remove address-family=IP4 SDES=off"); } else { - rtpengine_manage("replace-origin replace-session-connection"); + rtpengine_manage("ICE=remove address-family=IP6 SDES=off"); + $avp(rtpengine_offer) = "done"; } #!else if(nat_uac_test("8")) { ``` Make a call via Kamailio node. In my case used a call with "Route" headers. #### Log Messages In Kamailio [rtpengine_manage.log](https://github.com/kamailio/kamailio/files/6331086/rt…, you will find the correct RTPengine response, like: ``` 9(32302) DEBUG: {1 34817407 INVITE 6b2a7c4c-a032-11eb-8c29-870daa274dfe} rtpengine [rtpengine.c:2677]: rtpp_function_call(): proxy reply: d3:sdp599:v=0^M o=2600hz 1618708279 1618708280 IN IP4 192.168.2.10^M s=2600hz^M c=IN IP6 2600:1f18:578:5700::1:e^M t=0 0^M m=audio 16476 RTP/AVP 0 8 102 9 3 103 101 13 104 105^M a=rtpmap:0 PCMU/8000^M a=rtpmap:8 PCMA/8000^M a=rtpmap:102 opus/48000/2^M a=fmtp:102 useinbandfec=1; maxaveragebitrate=30000; maxplaybackrate=48000; ptime=20; minptime=10; maxptime=40^M a=rtpmap:9 G722/8000^M a=rtpmap:3 GSM/8000^M a=rtpmap:103 SPEEX/8000^M a=rtpmap:101 telephone-event/8000^M a=fmtp:101 0-16^M a=rtpmap:13 CN/8000^M a=rtpmap:104 telephone-event/48000^M a=fmtp:104 0-16^M a=rtpmap:105 CN/48000^M a=sendrecv^M a=rtcp:16477^M a=ptime:20^M ``` But SIP message will have duplicated SDP. #### SIP Traffic [rtpengine_manage.pcap.gz](https://github.com/kamailio/kamailio/files/633108… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [centos@sbc-a2 ~]$ kamailio -v version: kamailio 5.5.0-pre0 (x86_64/linux) 9413fc flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9413fc compiled on 04:03:33 Apr 3 2021 with gcc 8.3.1 ``` * **Operating System**: ``` [centos@sbc-a2 ~]$ cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- 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/2715

2 2

git:master:6d05333a: secsipid: propagate return code from lib functions
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 6d05333adee28da347e56d71a8e309698ec9c6a3 URL: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T10:35:50+02:00 secsipid: propagate return code from lib functions --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… Patch: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 4390e73fae..7553e8ede7 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -223,7 +223,7 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) } LM_DBG("identity check: failed\n"); - return -1; + return ret; } /** @@ -281,7 +281,7 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) } LM_DBG("identity check: failed\n"); - return -1; + return ret; } /** @@ -466,7 +466,7 @@ static sr_kemi_xval_t* ki_secsipid_get_url(sip_msg_t *msg, str *surl) */ static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *povar) { - int r; + int ret; pv_spec_t *ovar; pv_value_t val; str surl = {NULL, 0}; @@ -484,10 +484,10 @@ static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *povar) _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, secsipid_cache_expire); } - r = _secsipid_papi.SecSIPIDGetURLContent(surl.s, secsipid_timeout, + ret = _secsipid_papi.SecSIPIDGetURLContent(surl.s, secsipid_timeout, &_secsipid_get_url_val.s, &_secsipid_get_url_val.len); - if(r!=0) { - return -1; + if(ret!=0) { + return ret; } ovar = (pv_spec_t *)povar;

1 0

git:master:d80abf80: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: d80abf806a1643a704057ea383d47004cdb2ba9b URL: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-20T08:46:21+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… Patch: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… --- diff --git a/src/modules/lcr/README b/src/modules/lcr/README index 2ac22a3f4a..56a9ee4658 100644 --- a/src/modules/lcr/README +++ b/src/modules/lcr/README @@ -725,7 +725,7 @@ modparam("lcr", "lcr_count", 10) Example 1.29. Setting gw_uri_avp module parameter ... -modparam("lcr", "gw_uri_avp", "$avp(i:709)") +modparam("lcr", "gw_uri_avp", "$avp(lcr_gwuri)") ... 3.30. ruri_user_avp (AVP string) @@ -738,7 +738,7 @@ modparam("lcr", "gw_uri_avp", "$avp(i:709)") Example 1.30. Setting ruri_user_avp module parameter ... -modparam("lcr", "ruri_user_avp", "$avp(i:500)") +modparam("lcr", "ruri_user_avp", "$avp(lcr_ruri_user)") ... 3.31. tag_avp (AVP string) @@ -764,7 +764,7 @@ modparam("lcr", "tag_avp", "$avp(lcr_tag)") Example 1.32. Setting flags_avp module parameter ... -modparam("lcr", "flags_avp", "$avp(i:712)") +modparam("lcr", "flags_avp", "$avp(lcr_flags)") ... 3.33. rule_id_avp (AVP string) @@ -776,9 +776,9 @@ modparam("lcr", "flags_avp", "$avp(i:712)") not stored anywhere. Example 1.33. Setting rule_id_avp module parameter - ... - modparam("lcr", "rule_id_avp", "$avp(i:712)") - ... +... +modparam("lcr", "rule_id_avp", "$avp(lcr_ruleid)") +... 3.34. mt_pv_values (AVP string) @@ -792,7 +792,7 @@ modparam("lcr", "flags_avp", "$avp(i:712)") Example 1.34. Setting tag_avp module parameter ... -modparam("lcr", "mt_pv_values", "$avp(mt_values)") +modparam("lcr", "mt_pv_values", "$avp(lcr_mt_values)") ... 3.35. mtree (string) @@ -828,7 +828,7 @@ modparam("lcr", "defunct_capability", 1) Example 1.37. Setting lcr_id_avp module parameter ... -modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") +modparam("lcr", "lcr_id_avp", "$avp(lcr_id)") ... 3.38. defunct_gw_avp (AVP string) @@ -841,7 +841,7 @@ modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") Example 1.38. Setting defunct_gw_avp module parameter ... -modparam("lcr", "defunct_gw_avp", "$avp(s:defunct_gw_avp)") +modparam("lcr", "defunct_gw_avp", "$avp(lcr_defunct_gw)") ... 3.39. lcr_rule_hash_size (integer) @@ -1122,7 +1122,7 @@ defunct_gw(60); Example 1.54. from_gw usage ... -if (from_gw(1, $avp(s:real_source_addr), 2) { +if (from_gw(1, $avp(real_source_addr), 2) { ... }; ...

1 0

git:master:053a727a: lcr: docs - use string avps in examples
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 053a727aa5d41cfbb0800b8ab532aa3f3f7689ec URL: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T08:35:13+02:00 lcr: docs - use string avps in examples - more coherent examples, one example was also conflicting by using same id - removed trailing white spaces and aligned examples --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3… Patch: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3…

1 0

DMQ design issues and incurring problems
by Daniel-Constantin Mierla 19 Apr '21

19 Apr '21

Hello, as I added support for other transports (tcp, tls, ...) to DMQ inter-nodes communications and trying to configure it for a few testing scenarios, I ended up in some design issues/limitations. Two of them seem to prevent usual operations, therefore I want to get more opinions and see what would be the best way to go further. 1) there is no decoupling between server_address and server socket. The server socket is kept internally, but it is built from server_address parameter. The actual problem appears when trying to use FQDN as notification_address, because it ends up to have duplicate peer addresses for the same node. For example: - server1 with ip 1.2.3.4 and domain server1.sip.com - server2 with ip 5.6.7.8 and domain server2.sip.com On server1: modparam("dmq", "server_address", "sip:1.2.3.4:5060") modparam("dmq", "notification_address", "sip:server2.sip.com:5060") On server2: modparam("dmq", "server_address", "sip:5.6.7.8:5060") modparam("dmq", "notification_address", "sip:server1.sip.com:5060") Then each node end ups with 4 peer nodes. On server1: - sip:1.2.3.4:5060 (local=1) - sip:server1.sip.com:5060 (local=0) - sip:5.6.7.8:5060 (local=0) - sip:server2.sip.com:5060 (local=0) On server2: - sip:1.2.3.4:5060 (local=0) - sip:server1.sip.com:5060 (local=0) - sip:5.6.7.8:5060 (local=1) - sip:server2.sip.com:5060 (local=0) Practically each server considers the local FQDN being a remote peer. There are KDMQ requests sent to itself, but a real problematic issue is that presence replication (as I tested, could be for the other modules as well) is broken, because instead of an update it happens a replace. The case was a PUBLISH with body having state open, then in 30sec there is an PUBLISH to refresh using same ETag and empty body (as per spec), but instead of just updating the expires value, it also updates the body to empty string. If notification_address is using IP address instead of FQDN of the other server, everything works as expected, with body being kept on refresh and only expires being updated. The looping/spiralling is overwriting the purpose of the KDMQ replication action. Use of FQDN is needed for TLS transport in order to be able to validate the domain against the attributes in certificate. Currently it does not work to have server_address with FQDN (maybe it would work with advertise address to listen, but that will force to use for SIP headers, which is not wanted). To solve it I would introduce server_socket modparam, which if it is not set, then it is computed from server_address like for now. This keeps backward compatibility. 2) The second issue is a bit related. As there was a need to remove the FQDN and change the notification_address to be with the IP of the other node, I restarted each node, but the FQDNs stayed there, because after the restart of the server 1, it got the list with FQDNs from the server 2. Then restarting the server 2, ended up by sync'ing with server 1 and receiving again all the addresses. Practically the solution was to shut down all the nodes, which is something one is likely not wanting to do, because the entire platform is down with no active node, and even if it is for short time, for cases when data is only in memory (e.g., htable items, or in-memory only presence) everything is lost. In other words, there is no way to remove a peer address that still points to an active node but it is no longer wanted, because it persists in the other running nodes. Could be also the case of changing the domain to be used for notification address. This issue leads to the 1), because one node then appears many times (old FQDN and new FQDN), leading to loops/spirals with unwanted/broken side effects. I haven't thought much of it, but one solution could be an RPC command to be able to remove unwanted addresses from list of peers. It still can be a race of sync'ing immediately after removing via rpc, before being able to remove from the other node, but then one can check with rpc dmq.list_nodes and re-run the rpc command if it is the case. Given that Kamailio is in testing phase for 5.5, I want to see if anyone thinks of other solutions to fix this issues without introducing a new parameter (again, with backward compatibility) and a new rpc command (which does not have effect in breaking existing behaviour). Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

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

19 Apr '21

Module: kamailio Branch: master Commit: 38692da8abff093b45f5a50994b7a95e5aa515f9 URL: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-19T10:16:20+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… Patch: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index e92e50ada6..14cf3b36a6 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -239,7 +239,7 @@ Chapter 1. Admin Guide findService contains only one location, which is selected via this parameter as follows: * 0 - takes the first location of any type - * 1 - takes the last last of any type + * 1 - takes the last location of any type * 2 - takes the first geodetic location * 3 - takes the first civic location

1 0

git:master:b0ee86a7: lost: doc - typo removed
by Wolfgang Kampichler 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: b0ee86a7b8ab6866b40320c1141bf95aec5d2071 URL: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-19T10:13:13+02:00 lost: doc - typo removed --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… Patch: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 1df4aefd21..7f4597632b 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -211,7 +211,7 @@ <emphasis>0</emphasis> - takes the first location of any type </para></listitem> <listitem><para> - <emphasis>1</emphasis> - takes the last last of any type + <emphasis>1</emphasis> - takes the last location of any type </para></listitem> <listitem><para> <emphasis>2</emphasis> - takes the first geodetic location

1 0

[kamailio/kamailio] domain: fix use after free on domain reload (#2712)
by Mancaș George 19 Apr '21

19 Apr '21

#### Pre-Submission Checklist - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [*] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [*] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I observed this when glancing over commit https://github.com/kamailio/kamailio/commit/f50177003c21f53564be6349c0bb493… The invalid access is pretty clear, and so is the fix. Cheers! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2712 -- Commit Summary -- * domain: fix use after free on domain reload -- File Changes -- M src/modules/domain/hash.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2712.patch https://github.com/kamailio/kamailio/pull/2712.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2712

2 2

git:master:62d981da: Merge pull request #2712 from mancasg/patch-1
by GitHub 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: 62d981daa5d8d61f3f4f72996a613b8ad8e88f26 URL: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: GitHub <noreply(a)github.com> Date: 2021-04-19T08:20:20+02:00 Merge pull request #2712 from mancasg/patch-1 domain: fix use after free on domain reload --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… Patch: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 4cb968e458..b085d8f9cb 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,8 +204,9 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + next = np->next; shm_free(np); - np = np->next; + np = next; } hash_table[DOM_HASH_SIZE] = NULL;

1 0

git:master:207d7ada: domain: fix use after free on domain reload
by GitHub 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: 207d7adae4ca5d9a197c38ae333ff98124c01b47 URL: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… Author: MancaÈ George <mancasg(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-04-16T19:26:35+03:00 domain: fix use after free on domain reload --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… Patch: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 4cb968e458..b085d8f9cb 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,8 +204,9 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + next = np->next; shm_free(np); - np = np->next; + np = next; } hash_table[DOM_HASH_SIZE] = NULL;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev