sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
319 discussions

git:master:5e0fb402: Makefile.defs: set LIBSSL_SET_MUTEX_SHARED by default to 1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e0fb402a7755ea22c41c0b8fcefbdf9694442b8 URL: https://github.com/kamailio/kamailio/commit/5e0fb402a7755ea22c41c0b8fcefbdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T11:24:58+02:00 Makefile.defs: set LIBSSL_SET_MUTEX_SHARED by default to 1 - one can set LIBSSL_SET_MUTEX_SHARED=0 in make command line to switch to detection mode if it is need to set it or not based on libssl version - GH #3458, GH #3384 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5e0fb402a7755ea22c41c0b8fcefbdf… Patch: https://github.com/kamailio/kamailio/commit/5e0fb402a7755ea22c41c0b8fcefbdf… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a40cfa55cd3..ca7d525b688 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -181,7 +181,7 @@ LD_EXTRA_OPTS ?= # enable workaround for libssl 1.1+ to set shared mutex attribute -LIBSSL_SET_MUTEX_SHARED ?= +LIBSSL_SET_MUTEX_SHARED ?= 1 ifneq ($(LIBSSL_SET_MUTEX_SHARED), 1) ifeq ($(CROSS_COMPILE),)

11 months, 2 weeks

git:master:2eb17e9c: github: GitHub Actions Version Updater

by Victor Seva

Module: kamailio Branch: master Commit: 2eb17e9ccfa3963813215e6ddf2fdadeb588f485 URL: https://github.com/kamailio/kamailio/commit/2eb17e9ccfa3963813215e6ddf2fdad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-17T10:09:53+02:00 github: GitHub Actions Version Updater > https://github.com/marketplace/actions/github-actions-version-updater * PAT created using kamailio-sync * organization secret WORKFLOW_SECRET created --- Added: .github/workflows/updater.yml --- Diff: https://github.com/kamailio/kamailio/commit/2eb17e9ccfa3963813215e6ddf2fdad… Patch: https://github.com/kamailio/kamailio/commit/2eb17e9ccfa3963813215e6ddf2fdad… --- diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 00000000000..d517b85edbe --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,17 @@ +name: GitHub Actions Version Updater +on: + schedule: + # Automatically run on every Sunday + - cron: '0 0 * * 0' +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + token: ${{ secrets.WORKFLOW_SECRET }} + - name: Run GitHub Actions Version Updater + uses: saadmk11/github-actions-version-updater(a)v0.7.4 + with: + token: ${{ secrets.WORKFLOW_SECRET }} + pull_request_user_reviewers: linuxmaniac

11 months, 2 weeks

git:master:4c524547: topoh: don't set 0 twice at the end of masked/unmasked call-id

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4c524547e1fdd4aa6dfa0ed0ada57b002296a258 URL: https://github.com/kamailio/kamailio/commit/4c524547e1fdd4aa6dfa0ed0ada57b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T09:57:20+02:00 topoh: don't set 0 twice at the end of masked/unmasked call-id - fomatting updates --- Modified: src/modules/topoh/th_mask.c Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/4c524547e1fdd4aa6dfa0ed0ada57b0… Patch: https://github.com/kamailio/kamailio/commit/4c524547e1fdd4aa6dfa0ed0ada57b0… --- diff --git a/src/modules/topoh/th_mask.c b/src/modules/topoh/th_mask.c index 122d0935a5..7dcec50136 100644 --- a/src/modules/topoh/th_mask.c +++ b/src/modules/topoh/th_mask.c @@ -96,19 +96,20 @@ char* th_mask_encode(char *in, int ilen, str *prefix, int *olen) *olen = (((ilen+2)/3)<<2) + ((prefix!=NULL&&prefix->len>0)?prefix->len:0); out = (char*)pkg_malloc((*olen+1)*sizeof(char)); - if(out==NULL) - { + if(out==NULL) { PKG_MEM_ERROR; *olen = 0; return NULL; } + + /* set 0 at the end of the value */ memset(out, 0, (*olen+1)*sizeof(char)); - if(prefix!=NULL&&prefix->len>0) + if(prefix!=NULL&&prefix->len>0) { memcpy(out, prefix->s, prefix->len); + } p = out + (int)((prefix!=NULL&&prefix->len>0)?prefix->len:0); - for(idx=0; idx<ilen; idx+=3) - { + for(idx=0; idx<ilen; idx+=3) { left = ilen - idx - 1 ; left = (left>1)?2:left; @@ -149,24 +150,21 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) out = (char*)pkg_malloc((*olen+1+extra)*sizeof(char)); - if(out==NULL) - { + if(out==NULL) { PKG_MEM_ERROR; *olen = 0; return NULL; } + /* set 0 at the end of the value */ memset(out, 0, (*olen+1+extra)*sizeof(char)); end = ilen - n; i = (prefix!=NULL&&prefix->len>0)?prefix->len:0; - for(idx=0; i<end; idx+=3) - { + for(idx=0; i<end; idx+=3) { block = 0; - for(j=0; j<4 && i<end ; j++) - { + for(j=0; j<4 && i<end ; j++) { c = _th_DB64[(int)in[i++]]; - if(c<0) - { + if(c<0) { LM_ERR("invalid input string\"%.*s\"\n", ilen, in); pkg_free(out); *olen = 0; @@ -175,11 +173,11 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) block += c << (18 - 6*j); } - for(j=0, n=16; j<3 && idx+j< *olen; j++, n-=8) + for(j=0, n=16; j<3 && idx+j< *olen; j++, n-=8) { out[idx+j] = (char)((block >> n) & 0xff); + } } return out; } - diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 8698b7ab5d..0bc9fda97d 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -562,8 +562,6 @@ int th_mask_callid_str(str *icallid, str *ocallid) LM_ERR("cannot encode call-id\n"); return -1; } - - out.s[out.len] = '\0'; ocallid->s = out.s; ocallid->len = out.len; @@ -572,7 +570,6 @@ int th_mask_callid_str(str *icallid, str *ocallid) int th_unmask_callid_str(str *icallid, str *ocallid) { - str out; if(th_param_mask_callid==0) @@ -597,8 +594,6 @@ int th_unmask_callid_str(str *icallid, str *ocallid) LM_ERR("failed to decode call-id\n"); return -2; } - - out.s[out.len] = '\0'; ocallid->s = out.s; ocallid->len = out.len;

11 months, 2 weeks

git:master:991de5e5: topos: small formatting fixes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 991de5e51e799a0110b7aa489eb27f4f01f5dfd2 URL: https://github.com/kamailio/kamailio/commit/991de5e51e799a0110b7aa489eb27f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T09:53:03+02:00 topos: small formatting fixes --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/991de5e51e799a0110b7aa489eb27f4… Patch: https://github.com/kamailio/kamailio/commit/991de5e51e799a0110b7aa489eb27f4… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index bda9d93181..7887232958 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -776,7 +776,7 @@ int tps_mask_callid(sip_msg_t *msg) return -1; } - LM_DBG("updated (masked) call-id: [%.*s]\n",out.len, out.s); + LM_DBG("updated (masked) call-id: [%.*s]\n", out.len, out.s); if(out.s==NULL) { LM_ERR("cannot encode callid\n"); return -1; @@ -820,22 +820,20 @@ int tps_unmask_callid(sip_msg_t *msg) in=msg->callid->body; umask_ret=thb.unmask_callid(&in, &out); if(umask_ret == 1) { - LM_DBG("Unmask not required\n"); + LM_DBG("unmask not required\n"); return 0; - }else if(umask_ret != 0) { + } else if(umask_ret != 0) { LM_ERR("cannot decode callid\n"); return -1; } LM_DBG("updated (unmasked) call-id: [%.*s]\n", out.len, out.s); - if(out.s==NULL) - { + if(out.s==NULL) { LM_ERR("cannot decode callid\n"); return -1; } l=del_lump(msg, msg->callid->body.s-msg->buf, msg->callid->body.len, 0); - if (l==0) - { + if (l==0) { LM_ERR("failed deleting callid\n"); pkg_free(out.s); return -1;

11 months, 2 weeks

git:master:85b62cef: topoh: memory leak fix for API call

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 85b62cefa8d33bc736f1ab16e7c40646c903c812 URL: https://github.com/kamailio/kamailio/commit/85b62cefa8d33bc736f1ab16e7c4064… Author: harish <toharishs(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-17T09:52:29+02:00 topoh: memory leak fix for API call th_mask_callid_str & th_unmask_callid_str funtions used for API call to encode/decode call-ID uses static array declaration for callid_mbuf was unable to free callid data lump after use and leads to memory leak. when these futions was used through API call for topos memory leak bug as reported qm_free(): BUG: bad pointer 0x7faec4a7xxxx (out of memory block!) called from core: core/data_lump.c: free_lump(470) --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/85b62cefa8d33bc736f1ab16e7c4064… Patch: https://github.com/kamailio/kamailio/commit/85b62cefa8d33bc736f1ab16e7c4064… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 4762691845..8698b7ab5d 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -542,11 +542,8 @@ int th_unmask_callid(sip_msg_t *msg) return 0; } -#define TH_CALLID_SIZE 256 - int th_mask_callid_str(str *icallid, str *ocallid) { - static char th_callid_mbuf[TH_CALLID_SIZE]; str out; if(th_param_mask_callid==0) @@ -565,19 +562,9 @@ int th_mask_callid_str(str *icallid, str *ocallid) LM_ERR("cannot encode call-id\n"); return -1; } - - if(out.len>=TH_CALLID_SIZE) { - pkg_free(out.s); - LM_ERR("not enough callid buf size (needed %d)\n", out.len); - return -2; - } - - memcpy(th_callid_mbuf, out.s, out.len); - th_callid_mbuf[out.len] = '\0'; - - pkg_free(out.s); - - ocallid->s = th_callid_mbuf; + + out.s[out.len] = '\0'; + ocallid->s = out.s; ocallid->len = out.len; return 0; @@ -585,7 +572,7 @@ int th_mask_callid_str(str *icallid, str *ocallid) int th_unmask_callid_str(str *icallid, str *ocallid) { - static char th_callid_buf[TH_CALLID_SIZE]; + str out; if(th_param_mask_callid==0) @@ -610,18 +597,9 @@ int th_unmask_callid_str(str *icallid, str *ocallid) LM_ERR("failed to decode call-id\n"); return -2; } - if(out.len>=TH_CALLID_SIZE) { - pkg_free(out.s); - LM_ERR("not enough callid buf size (needed %d)\n", out.len); - return -2; - } - - memcpy(th_callid_buf, out.s, out.len); - th_callid_buf[out.len] = '\0'; - - pkg_free(out.s); - - ocallid->s = th_callid_buf; + + out.s[out.len] = '\0'; + ocallid->s = out.s; ocallid->len = out.len; return 0;

11 months, 2 weeks

[kamailio/kamailio] topoh: memory leak fix for API call (PR #3456)

by Harish S

th_mask_callid_str & th_unmask_callid_str functions used for API call to encode/decode call-ID uses static array declaration for callid_mbuf was unable to free callid data lump after use and leads to memory leak. when these functions was used through API call for topos module memory leak bug as reported qm_free(): BUG: bad pointer 0x7faec4a7xxxx (out of memory block!) called from core: core/data_lump.c: free_lump(470) This two funtions are not used other than API.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3456 -- Commit Summary -- * topoh: memory leak fix for API call -- File Changes -- M src/modules/topoh/th_msg.c (36) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3456.patch https://github.com/kamailio/kamailio/pull/3456.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3456 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3456(a)github.com>

11 months, 2 weeks

git:5.7:a6513043: pkg/kamailio/obs: packaged math module

by Sergey Safarov

Module: kamailio Branch: 5.7 Commit: a651304380283854f916b8e6fae8ff0a4937d411 URL: https://github.com/kamailio/kamailio/commit/a651304380283854f916b8e6fae8ff0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-05-17T10:24:24+03:00 pkg/kamailio/obs: packaged math module (cherry picked from commit bafefbc841eb7a6929baeff0b3fbe185860f4290) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a651304380283854f916b8e6fae8ff0… Patch: https://github.com/kamailio/kamailio/commit/a651304380283854f916b8e6fae8ff0… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index bb608525b54..838aaf7530e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1570,6 +1570,7 @@ fi %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.lrkproxy %doc %{_docdir}/kamailio/modules/README.mangler +%doc %{_docdir}/kamailio/modules/README.math %doc %{_docdir}/kamailio/modules/README.matrix %doc %{_docdir}/kamailio/modules/README.maxfwd %doc %{_docdir}/kamailio/modules/README.mediaproxy @@ -1731,6 +1732,7 @@ fi %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/lrkproxy.so %{_libdir}/kamailio/modules/mangler.so +%{_libdir}/kamailio/modules/math.so %{_libdir}/kamailio/modules/matrix.so %{_libdir}/kamailio/modules/maxfwd.so %{_libdir}/kamailio/modules/mediaproxy.so

11 months, 2 weeks

git:master:fe4c47bb: siptrace: fix destination target parameter on ki_sip_trace_msg

by Victor Seva

Module: kamailio Branch: master Commit: fe4c47bb47e466af2eddc0a8987c13cb976e5a3b URL: https://github.com/kamailio/kamailio/commit/fe4c47bb47e466af2eddc0a8987c13c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-17T09:22:10+02:00 siptrace: fix destination target parameter on ki_sip_trace_msg fixes #3457 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/fe4c47bb47e466af2eddc0a8987c13c… Patch: https://github.com/kamailio/kamailio/commit/fe4c47bb47e466af2eddc0a8987c13c… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 0a2d9b327e1..538e3b6a70b 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1231,7 +1231,14 @@ static int w_sip_trace_msg(sip_msg_t *msg, char *vmsg, char *saddr, char *taddr, static int ki_sip_trace_msg(sip_msg_t *msg, str *vmsg, str *saddr, str *taddr, str *duri, str *corrid) { - trace_send_hep_duplicate(vmsg, saddr, taddr, (duri && duri->len>0)?&duri:NULL, + dest_info_t dest; + if(duri && duri->len>0) { + if (siptrace_parse_uri(duri, &dest) < 0) { + LM_ERR("failed to parse mirroring destination uri\n"); + return -1; + } + } + trace_send_hep_duplicate(vmsg, saddr, taddr, (duri && duri->len>0)?&dest:NULL, (corrid && corrid->len>0)?corrid:NULL); return 1;

11 months, 2 weeks

[kamailio/kamailio] build warning (Issue #3457)

by sergey-safarov

**incompatible-pointer-types** ``` make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M sipcapture.so] sipcapture.so CC (gcc) [M siptrace.so] siptrace.o siptrace.c: In function 'ki_sip_trace_msg': siptrace.c:1234:74: warning: passing argument 4 of 'trace_send_hep_duplicate' from incompatible pointer type [-Wincompatible-pointer-types] trace_send_hep_duplicate(vmsg, saddr, taddr, (duri && duri->len>0)?&duri:NULL, ^ In file included from siptrace.c:58: siptrace_hep.h:30:34: note: expected 'struct dest_info *' but argument is of type 'str **' {aka 'struct _str **'} str *body, str *from, str *to, struct dest_info *, str *correlation_id); ^~~~~~~~~~~~~~~~~~ CC (gcc) [M siptrace.so] siptrace_hep.o CC (gcc) [M siptrace.so] siptrace_send.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3457 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3457(a)github.com>

11 months, 2 weeks

git:master:bafefbc8: pkg/kamailio/obs: packaged math module

by Sergey Safarov

Module: kamailio Branch: master Commit: bafefbc841eb7a6929baeff0b3fbe185860f4290 URL: https://github.com/kamailio/kamailio/commit/bafefbc841eb7a6929baeff0b3fbe18… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-05-17T09:23:07+03:00 pkg/kamailio/obs: packaged math module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/bafefbc841eb7a6929baeff0b3fbe18… Patch: https://github.com/kamailio/kamailio/commit/bafefbc841eb7a6929baeff0b3fbe18… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index bb608525b54..838aaf7530e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1570,6 +1570,7 @@ fi %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.lrkproxy %doc %{_docdir}/kamailio/modules/README.mangler +%doc %{_docdir}/kamailio/modules/README.math %doc %{_docdir}/kamailio/modules/README.matrix %doc %{_docdir}/kamailio/modules/README.maxfwd %doc %{_docdir}/kamailio/modules/README.mediaproxy @@ -1731,6 +1732,7 @@ fi %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/lrkproxy.so %{_libdir}/kamailio/modules/mangler.so +%{_libdir}/kamailio/modules/math.so %{_libdir}/kamailio/modules/matrix.so %{_libdir}/kamailio/modules/maxfwd.so %{_libdir}/kamailio/modules/mediaproxy.so

11 months, 2 weeks

← Newer
1
...
16
17
18
19
20
21
22
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023