sr-dev April 2023

sr-dev@lists.kamailio.org

15 participants
264 discussions

git:master:30f3bb9c: xcap_server: convert to memory logging helper, improve mem error handling
by Henning Westerholt 21 Apr '23

21 Apr '23

Module: kamailio Branch: master Commit: 30f3bb9c0be0de638021ae4c7108db85330d3cbb URL: https://github.com/kamailio/kamailio/commit/30f3bb9c0be0de638021ae4c7108db8… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-21T17:40:27Z xcap_server: convert to memory logging helper, improve mem error handling --- Modified: src/modules/xcap_server/xcap_misc.c Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/30f3bb9c0be0de638021ae4c7108db8… Patch: https://github.com/kamailio/kamailio/commit/30f3bb9c0be0de638021ae4c7108db8… --- diff --git a/src/modules/xcap_server/xcap_misc.c b/src/modules/xcap_server/xcap_misc.c index 0910b7d36e7..8c15ce17b93 100644 --- a/src/modules/xcap_server/xcap_misc.c +++ b/src/modules/xcap_server/xcap_misc.c @@ -589,7 +589,7 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) outbuf->s = (char*)pkg_malloc(size+1); if(outbuf->s==NULL) { - LM_ERR("no pkg for output\n"); + PKG_MEM_ERROR_FMT("for output\n"); xmlFree(xmem); goto error; } @@ -643,7 +643,7 @@ int xcaps_xpath_ns_param(modparam_t type, void *val) if(ns==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; goto error; } memset(ns, 0, sizeof(param_t)); @@ -735,7 +735,7 @@ pv_xcap_uri_t *pv_xcap_uri_get_struct(str *name) it = (pv_xcap_uri_t*)pkg_malloc(sizeof(pv_xcap_uri_t)); if(it==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return NULL; } memset(it, 0, sizeof(pv_xcap_uri_t)); @@ -762,8 +762,10 @@ int pv_parse_xcap_uri_name(pv_spec_p sp, str *in) pxs = (pv_xcap_uri_spec_t*)pkg_malloc(sizeof(pv_xcap_uri_spec_t)); if(pxs==NULL) + { + PKG_MEM_ERROR; return -1; - + } memset(pxs, 0, sizeof(pv_xcap_uri_spec_t)); p = in->s; diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 20bb585e3a4..450634abbb9 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -171,7 +171,7 @@ static int mod_init(void) xcaps_buf.s = (char*)pkg_malloc(xcaps_buf.len+1); if(xcaps_buf.s==NULL) { - LM_ERR("no pkg\n"); + PKG_MEM_ERROR; return -1; } @@ -266,7 +266,7 @@ static int xcaps_send_reply(sip_msg_t *msg, int code, str *reason, if (tbuf.len==0) { - LM_ERR("out of pkg memory\n"); + PKG_MEM_ERROR; return -1; } memcpy(tbuf.s, "Content-Type: ", sizeof("Content-Type: ") - 1); @@ -545,7 +545,7 @@ static int ki_xcaps_put(sip_msg_t* msg, str* uri, str* path, body.s = (char*)pkg_malloc(pbody->len+1); if(body.s==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; goto error; } memcpy(body.s, pbody->s, pbody->len); @@ -1033,6 +1033,11 @@ static int xcaps_get_directory(struct sip_msg *msg, str *user, str *domain, str else { server_name.s = pkg_malloc(IP6_MAX_STR_SIZE + 6); + if(!server_name.s) + { + PKG_MEM_ERROR; + goto error; + } server_name.len = ip_addr2sbuf(&msg->rcv.dst_ip, server_name.s, IP6_MAX_STR_SIZE); directory->len += snprintf(directory->s + directory->len, xcaps_buf.len - directory->len, @@ -1172,7 +1177,7 @@ static int ki_xcaps_get(sip_msg_t* msg, str* uri, str* path) { if((new_body.s = pkg_malloc(body.len))==NULL) { - LM_ERR("allocating package memory\n"); + PKG_MEM_ERROR; goto error; } new_body.len = body.len;

1 0

git:master:070279f9: xlog: improve memory error handling
by Henning Westerholt 21 Apr '23

21 Apr '23

Module: kamailio Branch: master Commit: 070279f902413023558391249bb579a7717eb391 URL: https://github.com/kamailio/kamailio/commit/070279f902413023558391249bb579a… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-21T17:35:06Z xlog: improve memory error handling --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/070279f902413023558391249bb579a… Patch: https://github.com/kamailio/kamailio/commit/070279f902413023558391249bb579a… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index ea05e51833c..34487fd488a 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -234,6 +234,7 @@ static int mod_init(void) _xlog_prefix_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char)); if(_xlog_prefix_buf==NULL) { + pkg_free(_xlog_buf); PKG_MEM_ERROR; return -1; }

1 0

git:master:ad687875: xprint: convert to memory logging helper, improve mem error handling
by Henning Westerholt 21 Apr '23

21 Apr '23

Module: kamailio Branch: master Commit: ad687875c190e863d45a99f5d77422dde37223f7 URL: https://github.com/kamailio/kamailio/commit/ad687875c190e863d45a99f5d77422d… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-21T17:33:17Z xprint: convert to memory logging helper, improve mem error handling --- Modified: src/modules/xprint/xp_lib.c Modified: src/modules/xprint/xprint.c --- Diff: https://github.com/kamailio/kamailio/commit/ad687875c190e863d45a99f5d77422d… Patch: https://github.com/kamailio/kamailio/commit/ad687875c190e863d45a99f5d77422d… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 3b1c59e57cc..6e6417ae736 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1062,7 +1062,17 @@ static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_c else e = pkg_malloc(sizeof(xl_elog_t)); if(!e) + { + if(shm) + { + SHM_MEM_ERROR; + } + else + { + PKG_MEM_ERROR; + } goto error; + } memset(e, 0, sizeof(xl_elog_t)); n++; if(*el == NULL) @@ -1843,7 +1853,11 @@ int xl_mod_init() int i; s=(char*)pkg_malloc(HOSTNAME_MAX); - if (!s) return -1; + if (!s) + { + PKG_MEM_ERROR; + return -1; + } if (gethostname(s, HOSTNAME_MAX)<0) { str_fullname.len = 0; str_fullname.s = NULL; @@ -1872,6 +1886,7 @@ int xl_mod_init() } s=(char*)pkg_malloc(HOSTNAME_MAX); if (!s) { + PKG_MEM_ERROR; pkg_free(str_fullname.s); return -1; } @@ -1896,8 +1911,9 @@ int xl_mod_init() memcpy(str_ipaddr.s, s, str_ipaddr.len); str_ipaddr.s[str_ipaddr.len] = '\0'; } else { + pkg_free(s); str_ipaddr.len=0; - LOG(L_ERR, "ERROR: xl_mod_init: No memory left for str_ipaddr\n"); + PKG_MEM_ERROR_FMT("for str_ipaddr\n"); } } else if (strncmp(str_ipaddr.s, s, str_ipaddr.len)!=0) { LOG(L_WARN, "WARNING: xl_mod_init: more IP %s not used\n", s); diff --git a/src/modules/xprint/xprint.c b/src/modules/xprint/xprint.c index 26ce25e550e..68f84271b3c 100644 --- a/src/modules/xprint/xprint.c +++ b/src/modules/xprint/xprint.c @@ -105,7 +105,7 @@ static int mod_init(void) log_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char)); if(log_buf==NULL) { - LOG(L_ERR, "mod_init: ERROR: no more memory\n"); + PKG_MEM_ERROR; return -1; } @@ -215,7 +215,7 @@ static int xplog_fixup(void** param, int param_no) * needs to be created */ p = (fparam_t*)pkg_malloc(sizeof(fparam_t)); if (!p) { - LOG(L_ERR, "xplog_fixup: not enough memory\n"); + PKG_MEM_ERROR; return -1; } p->v.i = level;

1 0

[kamailio/kamailio] .github/workflows: added GitHub action script to build Alpine docker (PR #3420)
by sergey-safarov 21 Apr '23

21 Apr '23

#### 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) - [ ] 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 Created GitHub action script to allow building Alpine docker image. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3420 -- Commit Summary -- * .github/workflows: added GitHub action script to build Alpine based docker image -- File Changes -- A .github/workflows/alpine.yml (47) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3420.patch https://github.com/kamailio/kamailio/pull/3420.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3420 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3420(a)github.com>

2 40

[kamailio/kamailio] Use www_challenge method via kemi on lua (Issue #3423)
by Nicolò 21 Apr '23

21 Apr '23

### Description We would use **www_challenge** method of **auth** module on our kemi lua script. Function is not mapped on [auth kemi](https://kamailio.org/docs/tutorials/5.3.x/kamailio-kemi-framework/mod… so we tried to use [modf](https://kamailio.org/docs/tutorials/5.3.x/kamailio-kemi-framework/kem… but we have every time this log ``` app_lua [app_lua_api.c:1725]: sr_kemi_lua_modf(): function 'www_challenge' has fixup - cannot be used ``` We tried this call to the method on lua script ``` KSR.x.modf("www_challenge", realm, 1); ``` The question is: are we calling method on a bad way or is not possible to call www_challenge method by kemi lua ?  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3423 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3423(a)github.com>

3 5

git:master:b65c19fa: auth: expose www_challenge() to kemi
by Daniel-Constantin Mierla 21 Apr '23

21 Apr '23

Module: kamailio Branch: master Commit: b65c19fa29976b59403433ed8a5de4b7eef41afc URL: https://github.com/kamailio/kamailio/commit/b65c19fa29976b59403433ed8a5de4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-21T11:32:07+02:00 auth: expose www_challenge() to kemi - GH #3423 --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b65c19fa29976b59403433ed8a5de4b… Patch: https://github.com/kamailio/kamailio/commit/b65c19fa29976b59403433ed8a5de4b… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 3a05689f002..e522538e415 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -1102,6 +1102,14 @@ static int www_challenge(struct sip_msg *msg, char* realm, char *flags) return -1; } +/** + * + */ +static int ki_www_challenge(struct sip_msg *msg, str* realm, int flags) +{ + return auth_challenge_hftype(msg, realm, flags, HDR_AUTHORIZATION_T); +} + /** * */ @@ -1259,6 +1267,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("www_challenge"), + SR_KEMIP_INT, ki_www_challenge, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("auth"), str_init("pv_auth_check"), SR_KEMIP_INT, pv_auth_check, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT,

1 0

Debian SBOM for kamailio
by Olle E. Johansson 20 Apr '23

20 Apr '23

Hi! Using the “syft” tool from Anchore I created an SBOM for a server with Kamailio installed from Debian. The result is quite interesting. Some notes: - For each component (debian package) a list of licenses are made. - The CPEs - filters for matching with NVD - are based on the debian package names, which is incorrect I will try with a newer system, like Debian Bullseye. My question is if we can fix this somehow by modifying meta data in our packages. Will have to check what syft is using, but this SBOM is not very useful…. Cheers, /O Examples: "cpe": "cpe:2.3:a:kamailio-extra-modules:kamailio-extra-modules:5.3.9\\+bpo10:*:*:*:*:*:*:*", "licenses": [ { "license": { "id": "Apache-1.0" } }, { "license": { "id": "BSD-2-Clause" } }, { "license": { "id": "BSD-3-Clause" } }, { "license": { "name": "Expat" } }, { "license": { "id": "GPL-2.0-only" } }, { "license": { "id": "GPL-2.0-or-later" } }, { "license": { "id": "GPL-2.0-or-later" } }, { "license": { "id": "ISC" } }, { "license": { "id": "MIT" } },

3 12

Roadmap to next major release series v5.7.x
by Daniel-Constantin Mierla 20 Apr '23

20 Apr '23

Hello, it is time to make the roadmap to the next major release series v5.7.x. In my opinion, I would try to freeze the development during the first part of April 2023, tentatively proposing April 14 as freezing date, being like 4 weeks from now. Then testing phase and first release (v5.7.0) sometime during May 2023. Alternative timelines can be proposed, of course. If anyone wants to add new features/modules, they have to be published till freezing date, either pushed in the git repository or proposed as pull request. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com Kamailio Advanced Training - Online - March 27-30, 2023 - www.asipto.com

3 5

git:master:8a144a85: Makefile.groups: added math to group extra
by Daniel-Constantin Mierla 20 Apr '23

20 Apr '23

Module: kamailio Branch: master Commit: 8a144a85c803424be087d7519d65b97b226501c1 URL: https://github.com/kamailio/kamailio/commit/8a144a85c803424be087d7519d65b97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-20T12:53:53+02:00 Makefile.groups: added math to group extra --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/8a144a85c803424be087d7519d65b97… Patch: https://github.com/kamailio/kamailio/commit/8a144a85c803424be087d7519d65b97… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 7f1a868e51..e70dedb4fe 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -23,7 +23,7 @@ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ - sipjson lrkproxy xhttp_prom + sipjson lrkproxy math xhttp_prom # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

[kamailio/kamailio] Does kamailio supports SIPREC? (Issue #3416)
by laurnzdj 20 Apr '23

20 Apr '23

Hi, Currently studying SIPREC call recording, I just want to ask if Kamailio supports SIPREC or does it have modules that supports it similar to OpenSips? https://opensips.org/docs/modules/3.4.x/siprec.html Thank you! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3416 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3416(a)github.com>

2 3

← Newer
1
...
16
17
18
19
20
21
22
...
27
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 2023