sr-dev

sr-dev@lists.kamailio.org

3 participants
45196 discussions

git:master:7747f91f: stun: convert to memory logging helper
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 7747f91f6c482a99cfab4813e3b2ad5e6e970d07 URL: https://github.com/kamailio/kamailio/commit/7747f91f6c482a99cfab4813e3b2ad5… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:06:41Z stun: convert to memory logging helper --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/7747f91f6c482a99cfab4813e3b2ad5… Patch: https://github.com/kamailio/kamailio/commit/7747f91f6c482a99cfab4813e3b2ad5… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index 04f52fa2bfd..0ddbb00ed1c 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -408,7 +408,7 @@ static int stun_create_response( */ res->msg.buf.s = (char *) pkg_malloc(sizeof(char)*STUN_MSG_LEN); if (res->msg.buf.s == NULL) { - LOG(L_ERR, "ERROR: STUN: out of memory\n"); + PKG_MEM_ERROR; return FATAL_ERROR; } @@ -822,7 +822,7 @@ static struct stun_unknown_att* stun_alloc_unknown_attr(USHORT_T type) attr = (struct stun_unknown_att *) pkg_malloc(sizeof(struct stun_unknown_att)); if (attr == NULL) { - LOG(L_ERR, "ERROR: STUN: out of memory\n"); + PKG_MEM_ERROR; return NULL; }

1 0

git:master:d5ab93a1: statsc: convert to memory logging helper, free memory in case of error
by Henning Westerholt 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: d5ab93a1e642aec9c842c9ffe9cb712c0f41e4c0 URL: https://github.com/kamailio/kamailio/commit/d5ab93a1e642aec9c842c9ffe9cb712… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-24T19:08:29Z statsc: convert to memory logging helper, free memory in case of error --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5ab93a1e642aec9c842c9ffe9cb712… Patch: https://github.com/kamailio/kamailio/commit/d5ab93a1e642aec9c842c9ffe9cb712… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 3b636b81fc5..92447339151 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -202,7 +202,7 @@ int statsc_nmap_add(str *sname, str *rname) + STRLEN_ROUNDUP(sname->len) + STRLEN_ROUNDUP(rname->len); sm = shm_malloc(sz); if(sm==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(sm, 0, sz); @@ -241,7 +241,7 @@ int statsc_init(void) _statsc_info = shm_malloc(sizeof(statsc_info_t)); if(_statsc_info==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(_statsc_info, 0, sizeof(statsc_info_t)); @@ -250,7 +250,8 @@ int statsc_init(void) sz = sizeof(statsc_nmap_t) + statsc_items * sizeof(int64_t); sm = shm_malloc(sz); if(sm==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; + shm_free(_statsc_info); return -1; } memset(sm, 0, sz);

1 0

[kamailio/kamailio] Application crash due to intensive "dispather.add" using (Issue #3424)
by Nikolay Shakin 24 Apr '23

24 Apr '23

### Description I want to add addresses to dispatcher.list dynamically ``` modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "ds_ping_interval", 10) modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_inactive_threshold", 1) modparam("dispatcher", "ds_probing_threshold", 1) modparam("dispatcher", "reload_delta", 0) modparam("dispatcher", "ds_timer_mode", 1) ... if(!ds_is_from_list("1","0","$var(contact)")) { jsonrpc_exec( '{ "jsonrpc": "2.0", "method": "dispatcher.add", "params": [1, "$var(contact)"], "id": 1 }' ); } ``` this scheme works with low load(one or two UAs) but it doesn't work with dozens of requests, kamailio crashes ### Troubleshooting ``` Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: CRITICAL: {1 12016 REGISTER db88353a-66cf-4ca6-91e2-6f306e43cee9} <core> [core/mem/q_malloc.c:519]: qm_free(): BUG: freeing already freed pointer (0x7f2f964578b8), called from dispatcher: dispatch.c: reindex_dests(790), first free dispatcher: dispatch.c: ds_avl_destroy(4013) - ignoring Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: INFO: {1 12016 REGISTER db88353a-66cf-4ca6-91e2-6f306e43cee9} dispatcher [dispatch.c:682]: dp_init_relative_weights(): extra rweight 100 for last active destination in group 1 Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6827]: INFO: {1 16898 REGISTER eebaeca9-c642-465f-bc09-67d1448ba6b7} dispatcher [dispatch.c:682]: dp_init_relative_weights(): extra rweight 100 for last active destination in group 1 Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: ERROR: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: WARNING: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: ERROR: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: WARNING: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: ERROR: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6825]: WARNING: {1 27217 REGISTER 885dc562-c8f3-477a-bc4b-ba3718cdf8db} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: ERROR: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: WARNING: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: ERROR: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: WARNING: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: ERROR: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6829]: WARNING: {1 40473 REGISTER bd8d332f-d896-4dab-b4ab-3904f8a29dda} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: ERROR: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: WARNING: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: ERROR: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: WARNING: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: ERROR: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:407]: pack_dest(): bad uri [] Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6832]: WARNING: {1 55015 REGISTER bfc85ce0-6aee-40c3-9b73-d0f64e835dc1} dispatcher [dispatch.c:2624]: ds_add_dest_cb(): failed to add destination in group 1 - Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6808]: ALERT: <core> [main.c:774]: handle_sigs(): child process 6825 exited by a signal 11 Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6808]: ALERT: <core> [main.c:777]: handle_sigs(): core was not generated Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6808]: INFO: <core> [main.c:799]: handle_sigs(): terminating due to SIGCHLD Apr 22 22:18:09 kamailio /usr/sbin/kamailio[6827]: INFO: <core> [main.c:854]: sig_usr(): signal 15 received Apr 22 22:18:10 kamailio /usr/sbin/kamailio[6808]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized Apr 22 22:18:10 kamailio systemd[1]: kamailio.service: Main process exited, code=exited, status=1/FAILURE Apr 22 22:18:10 kamailio systemd[1]: kamailio.service: Failed with result 'exit-code'. Apr 22 22:18:10 kamailio systemd[1]: kamailio.service: Consumed 1.304s CPU time. ``` #### Reproduction use code from Description section on request route #### Debugging Data ``` (gdb) bt full #0 0x000055945e0ccd20 in ?? () No symbol table info available. #1 0x000055945e0cd6ee in qm_malloc () No symbol table info available. #2 0x000055945e0da9c9 in qm_shm_malloc () No symbol table info available. #3 0x00007f325a05e921 in pack_dest () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #4 0x00007f325a060ad4 in add_dest2list () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #5 0x00007f325a087cf9 in ds_filter_dest_cb () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #6 0x00007f325a05affb in ds_iter_set () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #7 0x00007f325a088706 in ds_remove_dst () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #8 0x00007f325a0af7a8 in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so No symbol table info available. #9 0x00007f325e7e82f5 in jsonrpc_exec_ex () from /usr/lib/x86_64-linux-gnu/kamailio/modules/jsonrpcs.so No symbol table info available. #10 0x00007f325e7e875e in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/jsonrpcs.so No symbol table info available. #11 0x000055945ddce3f3 in do_action () No symbol table info available. #12 0x000055945dddd391 in run_actions () No symbol table info available. #13 0x000055945ddce2d3 in do_action () No symbol table info available. #14 0x000055945dddd391 in run_actions () No symbol table info available. #15 0x000055945ddce2d3 in do_action () No symbol table info available. #16 0x000055945dddd391 in run_actions () No symbol table info available. #17 0x000055945ddca244 in do_action () No symbol table info available. --Type <RET> for more, q to quit, c to continue without paging-- #18 0x000055945dddd391 in run_actions () No symbol table info available. #19 0x000055945ddce2d3 in do_action () No symbol table info available. #20 0x000055945dddd391 in run_actions () No symbol table info available. #21 0x000055945ddddc0b in run_top_route () No symbol table info available. #22 0x000055945df3b1b2 in receive_msg () No symbol table info available. #23 0x000055945e09ea5d in udp_rcv_loop () No symbol table info available. #24 0x000055945ddb709b in main_loop () No symbol table info available. #25 0x000055945ddc420c in main () No symbol table info available. ``` ```(gdb) info locals No symbol table info available.``` ```(gdb) list 1 ../sysdeps/unix/sysv/linux/dl-vdso-setup.c: No such file or directory.``` #### SIP Traffic [kamailio.txt](https://github.com/kamailio/kamailio/files/11302151/kamailio.… ### Possible Solutions no idea ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@kamailio:[/etc]: kamailio -v version: kamailio 5.6.3 (x86_64/linux) 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: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` root@kamailio:[/etc]: uname -a Linux kamailio 5.10.0-21-amd64 #1 SMP Debian 5.10.162-1 (2023-01-21) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3424 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3424(a)github.com>

3 6

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

24 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 build Alpine docker image and push to GitHub packages as `kamailio/kamailio-ci` docker image You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3425 -- Commit Summary -- * .github/workflows: added GitHub action script to build Alpine based docker image -- File Changes -- A .github/workflows/alpine.yml (179) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3425.patch https://github.com/kamailio/kamailio/pull/3425.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3425 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3425(a)github.com>

2 1

git:master:83789e7e: .github/workflows: added GitHub action script to build Alpine based docker image
by Victor Seva 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 83789e7efe6e1a3479e7742812eaff2ffd7ebdd3 URL: https://github.com/kamailio/kamailio/commit/83789e7efe6e1a3479e7742812eaff2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-24T16:44:52+02:00 .github/workflows: added GitHub action script to build Alpine based docker image --- Added: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/83789e7efe6e1a3479e7742812eaff2… Patch: https://github.com/kamailio/kamailio/commit/83789e7efe6e1a3479e7742812eaff2…

1 0

git:master:338e3d8b: auth: exported proxy_challenge() to kemi
by Daniel-Constantin Mierla 24 Apr '23

24 Apr '23

Module: kamailio Branch: master Commit: 338e3d8bab15eb3422a9804a83d92c077960203c URL: https://github.com/kamailio/kamailio/commit/338e3d8bab15eb3422a9804a83d92c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-24T08:32:16+02:00 auth: exported proxy_challenge() to kemi --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/338e3d8bab15eb3422a9804a83d92c0… Patch: https://github.com/kamailio/kamailio/commit/338e3d8bab15eb3422a9804a83d92c0… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index e522538e415..5538ffb4f03 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -1110,6 +1110,14 @@ static int ki_www_challenge(struct sip_msg *msg, str* realm, int flags) return auth_challenge_hftype(msg, realm, flags, HDR_AUTHORIZATION_T); } +/** + * + */ +static int ki_proxy_challenge(struct sip_msg *msg, str* realm, int flags) +{ + return auth_challenge_hftype(msg, realm, flags, HDR_PROXYAUTH_T); +} + /** * */ @@ -1272,6 +1280,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("proxy_challenge"), + SR_KEMIP_INT, ki_proxy_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

git:master:9643d65a: submodule udpadate [skip ci]
by Sergey Safarov 23 Apr '23

23 Apr '23

Module: kamailio Branch: master Commit: 9643d65a98574e0739b771b4770101bd747b5966 URL: https://github.com/kamailio/kamailio/commit/9643d65a98574e0739b771b4770101b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-04-23T17:00:02+03:00 submodule udpadate [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/9643d65a98574e0739b771b4770101b… Patch: https://github.com/kamailio/kamailio/commit/9643d65a98574e0739b771b4770101b… --- diff --git a/pkg/docker b/pkg/docker index 1bcbae2ddd1..d34e8eed774 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1bcbae2ddd1bd7978135760dd3ff742daf6c4563 +Subproject commit d34e8eed77428f84ef15c57bd7402e5161b6021f

1 0

git:master:569714ea: sl: convert to memory logging helper
by Henning Westerholt 21 Apr '23

21 Apr '23

Module: kamailio Branch: master Commit: 569714ea692f751580d902900912caf3c56203dd URL: https://github.com/kamailio/kamailio/commit/569714ea692f751580d902900912caf… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-21T17:58:01Z sl: convert to memory logging helper --- Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c Modified: src/modules/sl/sl_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/569714ea692f751580d902900912caf… Patch: https://github.com/kamailio/kamailio/commit/569714ea692f751580d902900912caf… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 746abeda80a..b9c667b42e4 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -498,7 +498,7 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) } rbuf = (char *)pkg_malloc(reason->len); if (rbuf==NULL) { - LM_ERR("not enough memory\n"); + PKG_MEM_ERROR; ret = -1; goto restore; } diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 9b7a64b4299..29213a59633 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -90,7 +90,7 @@ int sl_startup() sl_timeout = (unsigned int*)shm_malloc(sizeof(unsigned int)); if (!sl_timeout) { - LM_ERR("no more free memory!\n"); + SHM_MEM_ERROR; return -1; } *(sl_timeout)=get_ticks_raw(); @@ -244,13 +244,13 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) if ((hf = (hdr_field_t*) pkg_malloc(sizeof(struct hdr_field))) == NULL) { - LM_ERR("out of package memory\n"); + PKG_MEM_ERROR; goto event_route_error; } if ((cseqb = (struct cseq_body *) pkg_malloc(sizeof(struct cseq_body))) == NULL) { - LM_ERR("out of package memory\n"); + PKG_MEM_ERROR; pkg_free(hf); goto event_route_error; } @@ -259,7 +259,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) * (msg->first_line.u.request.method.len + 5); if ((tmp = (char *) pkg_malloc(tsize)) == NULL) { - LM_ERR("out of package memory\n"); + PKG_MEM_ERROR; pkg_free(cseqb); pkg_free(hf); goto event_route_error; @@ -518,7 +518,7 @@ int sl_register_callback(sl_cbelem_t *cbe) p1 = (sl_cbelem_t*)pkg_malloc(sizeof(sl_cbelem_t)); if(p1==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } diff --git a/src/modules/sl/sl_stats.c b/src/modules/sl/sl_stats.c index 9b7cf51259d..826fe544a86 100644 --- a/src/modules/sl/sl_stats.c +++ b/src/modules/sl/sl_stats.c @@ -109,7 +109,7 @@ int init_sl_stats(void) { sl_stats = (struct sl_stats**)shm_malloc(sizeof(struct sl_stats*)); if (!sl_stats) { - ERR("Unable to allocated shared memory for sl statistics\n"); + SHM_MEM_ERROR_FMT("for sl statistics\n"); return -1; } *sl_stats = 0; @@ -124,7 +124,7 @@ int init_sl_stats_child(void) len = sizeof(struct sl_stats) * get_max_procs(); *sl_stats = shm_malloc(len); if (*sl_stats == 0) { - ERR("No shmem\n"); + SHM_MEM_ERROR; shm_free(sl_stats); return -1; }

1 0

git:master:2a9402d4: sms: convert to memory logging helper, fix some related wrong log messages
by Henning Westerholt 21 Apr '23

21 Apr '23

Module: kamailio Branch: master Commit: 2a9402d4159824f857a5c8b8fcb5f96f42094e5a URL: https://github.com/kamailio/kamailio/commit/2a9402d4159824f857a5c8b8fcb5f96… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-21T17:59:50Z sms: convert to memory logging helper, fix some related wrong log messages --- Modified: src/modules/sms/sms.c Modified: src/modules/sms/sms_funcs.c Modified: src/modules/sms/sms_report.c --- Diff: https://github.com/kamailio/kamailio/commit/2a9402d4159824f857a5c8b8fcb5f96… Patch: https://github.com/kamailio/kamailio/commit/2a9402d4159824f857a5c8b8fcb5f96… --- diff --git a/src/modules/sms/sms.c b/src/modules/sms/sms.c index 123ba127fa8..a6f0a2d3afa 100644 --- a/src/modules/sms/sms.c +++ b/src/modules/sms/sms.c @@ -540,7 +540,7 @@ int global_init(void) domain.len = si->name.len + i*(si->port_no_str.len+1); domain.s = (char*)pkg_malloc(domain.len); if (!domain.s) { - LM_ERR("no free pkg memory!\n"); + PKG_MEM_ERROR; goto error; } p = domain.s; @@ -584,7 +584,7 @@ int global_init(void) /* alloc in shm for queued_msgs */ queued_msgs = (int*)shm_malloc(sizeof(int)); if (!queued_msgs) { - LM_ERR("cannot get shm memory!\n"); + SHM_MEM_ERROR; goto error; } *queued_msgs = 0; diff --git a/src/modules/sms/sms_funcs.c b/src/modules/sms/sms_funcs.c index 6c44dc87da1..34e980bf163 100644 --- a/src/modules/sms/sms_funcs.c +++ b/src/modules/sms/sms_funcs.c @@ -226,7 +226,7 @@ int push_on_network(struct sip_msg *msg, int net) /* allocs a new sms_msg structure in shared memory */ sms_messg = (struct sms_msg*)shm_malloc(len); if (!sms_messg) { - LM_ERR("failed to get shm memory!\n"); + SHM_MEM_ERROR; goto error; } p = (char*)sms_messg + sizeof(struct sms_msg); @@ -341,7 +341,7 @@ int send_sip_msg_request(str *to, str *from_user, str *body) if (hdrs.s) pkg_free(hdrs.s); return foo; error: - LM_ERR("no free pkg memory!\n"); + PKG_MEM_ERROR; if (from.s) pkg_free(from.s); if (hdrs.s) pkg_free(hdrs.s); return -1; @@ -371,7 +371,7 @@ static inline int send_error(struct sms_msg *sms_messg, char *msg1_s, int msg1_l pkg_free( body.s ); return foo; error: - LM_ERR("no free pkg memory!\n"); + PKG_MEM_ERROR; return -1; } diff --git a/src/modules/sms/sms_report.c b/src/modules/sms/sms_report.c index 4dcfa44b1d5..9b7983ea54c 100644 --- a/src/modules/sms/sms_report.c +++ b/src/modules/sms/sms_report.c @@ -126,7 +126,7 @@ int init_report_queue(void) report_queue = (struct report_cell*) shm_malloc(NR_CELLS*sizeof(struct report_cell)); if (!report_queue) { - LM_ERR("no more free pkg_mem!\n"); + SHM_MEM_ERROR; return -1; } memset( report_queue , 0 , NR_CELLS*sizeof(struct report_cell) );

1 0

git:master:f898704e: sdpops: convert to memory logging helper
by Henning Westerholt 21 Apr '23

21 Apr '23

Module: kamailio Branch: master Commit: f898704e9d4f51f1b8fa65be92ff8cc504dfcd66 URL: https://github.com/kamailio/kamailio/commit/f898704e9d4f51f1b8fa65be92ff8cc… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-21T18:01:01Z sdpops: convert to memory logging helper --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f898704e9d4f51f1b8fa65be92ff8cc… Patch: https://github.com/kamailio/kamailio/commit/f898704e9d4f51f1b8fa65be92ff8cc… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 1d08bd6fb80..71abaf29717 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -1990,7 +1990,7 @@ static int sdp_set_sess_version(sip_msg_t* msg, str* disabled_old_sess_version, new_sess_version.s = pkg_malloc((new_sess_version.len * sizeof(char))); if (new_sess_version.s == NULL) { - LM_ERR("Out of pkg memory\n"); + PKG_MEM_ERROR; return -1; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev