sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
303 discussions

git:master:703d6202: core: resolve - safety check for setting port

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 703d6202e73e4e3778a2c66f4e29ae87dc6ac211 URL: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:32:38+02:00 core: resolve - safety check for setting port --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… Patch: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index deb20a740c..c2ea36d9ec 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1225,7 +1225,7 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto, * and *proto!=0 or port==0 && proto==0) * when performing SRV lookup (*port==0) it will use *proto to look for * tcp or udp hosts, otherwise proto is unused; if proto==0 => no SRV lookup - * If zt is set, name will be assumed to be 0 terminated and some copy + * If zt is set, name will be assumed to be 0 terminated and some copy * operations will be avoided. * If is_srv is set it will assume name has the srv prefixes for sip already * appended and it's already 0-term'ed; if not it will append them internally. @@ -1313,7 +1313,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, do_srv: /* try to find the SRV records inside previous ARs first*/ for (l=ars; l; l=l->next){ - if (l->type!=T_SRV) continue; + if (l->type!=T_SRV) continue; srv=(struct srv_rdata*) l->rdata; if (srv==0){ LM_CRIT("null rdata\n"); @@ -1325,7 +1325,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("found SRV(%s) = %s:%d in AR\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1344,7 +1344,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("SRV(%s) = %s:%d\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1356,7 +1356,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, goto end; } /* cleanup on exit */ - LM_DBG("no SRV record found for %.*s," + LM_DBG("no SRV record found for %.*s," " trying 'normal' lookup...\n", name->len, name->s); } }

3 years, 7 months

Releasing Kamailio v5.4.5

by Daniel-Constantin Mierla

Hello, I am considering to release Kamailio v5.4.5 sometime next week, likely on Thursday, April 15, 2020. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. 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/

3 years, 7 months

onsend reply route issue with KEMI

by Salah Uddin Ahmed

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 years, 7 months

git:master:0640645e: core: updated onsend_route_enabled() macro condtition

by Daniel-Constantin Mierla

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

3 years, 7 months

git:master:7231be07: seas: check when walking the list

by Daniel-Constantin Mierla

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

3 years, 7 months

git:master:c30cd3db: avp: check for null string

by Daniel-Constantin Mierla

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

3 years, 7 months

git:master:6c8d6185: imc: safety checks for function parameters

by Daniel-Constantin Mierla

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

3 years, 7 months

git:master:e84c1985: group: check if credentials are parsed

by Daniel-Constantin Mierla

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

3 years, 7 months

git:master:005f4468: sca: return on rpc fault

by Daniel-Constantin Mierla

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

3 years, 7 months

git:master:b123dec9: pike: safety check for ll variable

by Daniel-Constantin Mierla

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 )

3 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021