sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
304 discussions

git:5.4:3a9cf652: pkg/kamailio/deb: version set 5.4.5
by Victor Seva 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 3a9cf652716fdc3f5a679cf79c704daf43ac8783 URL: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T09:51:16+02:00 pkg/kamailio/deb: version set 5.4.5 --- Modified: pkg/kamailio/deb/bionic/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/3a9cf652716fdc3f5a679cf79c704da… Patch: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da…

1 0

git:5.4:9e6d4182: pkg/kamailio: version set to 5.4.5 for rpm specs and alpine
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 9e6d418212171f84236af4d537bae973de879fa9 URL: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T09:41:16+02:00 pkg/kamailio: version set to 5.4.5 for rpm specs and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… Patch: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 913168c652..e6576c616a 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.4 +pkgver=5.4.5 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 0bd9c0238a..ba4cb80618 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.4 +%define ver 5.4.5 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.4:1e6561f8: core: resolve - safety check for setting port
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 1e6561f86d4a139834952ff21b74ecca0b508966 URL: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:40+02:00 core: resolve - safety check for setting port (cherry picked from commit 703d6202e73e4e3778a2c66f4e29ae87dc6ac211) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… Patch: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 3796f05ceb..cfed6b5e1d 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1211,7 +1211,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. @@ -1299,7 +1299,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"); @@ -1311,7 +1311,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; } @@ -1330,7 +1330,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; } @@ -1342,7 +1342,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); } }

1 0

git:5.4:a10a7b5b: core: updated onsend_route_enabled() macro condtition
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

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

1 0

git:5.4:98b091d1: seas: check when walking the list
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

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

1 0

git:5.4:e5de8af6: avp: check for null string
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

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

1 0

git:5.4:cbe81cd6: imc: safety checks for function parameters
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

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

1 0

git:5.4:95bbb4f0: group: check if credentials are parsed
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

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

1 0

git:5.4:681952d1: sca: return on rpc fault
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

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

1 0

git:5.4:ce30413e: pike: safety check for ll variable
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: ce30413e6e60c1674d7200c32469779398860c40 URL: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:37+02:00 pike: safety check for ll variable (cherry picked from commit b123dec934769522407dad619bbb6c2074719884) --- Modified: src/modules/pike/pike_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… Patch: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… --- diff --git a/src/modules/pike/pike_funcs.c b/src/modules/pike/pike_funcs.c index 804ebb6ec0..7a01739fe1 100644 --- a/src/modules/pike/pike_funcs.c +++ b/src/modules/pike/pike_funcs.c @@ -211,8 +211,10 @@ void clean_routine(unsigned int ticks , void *param) /* unlink the node -> the list will get shorter and it will be * faster for the next branches to process it */ - ll->prev->prev->next = ll; - ll->prev = ll->prev->prev; + if(ll) { + ll->prev->prev->next = ll; + ll->prev = ll->prev->prev; + } node->expires = 0; node->timer_ll.prev = node->timer_ll.next = 0; if ( node->flags&NODE_EXPIRED_FLAG )

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021