Module: kamailio Branch: 6.0 Commit: 9bdcb7f3bb304c2f0824006542bd613c20d39f0d URL: https://github.com/kamailio/kamailio/commit/9bdcb7f3bb304c2f0824006542bd613c...
Author: Victor Seva linuxmaniac@torreviejawireless.org Committer: Victor Seva linuxmaniac@torreviejawireless.org Date: 2025-07-21T11:06:10+02:00
ims_isc: remove function names from log messages
* use generic PKG_MEM_ERROR messages on pkg_malloc errors
(cherry picked from commit 48d3fdb3cfa3e5eec777853e1a4d32d844e94e8f)
---
Modified: src/modules/ims_isc/third_party_reg.c
---
Diff: https://github.com/kamailio/kamailio/commit/9bdcb7f3bb304c2f0824006542bd613c... Patch: https://github.com/kamailio/kamailio/commit/9bdcb7f3bb304c2f0824006542bd613c...
---
diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index b1b6de69076..71f26314c65 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -168,7 +168,7 @@ int build_p_associated_uri(ims_subscription *s) if(!p_associated_uri.buf) { p_associated_uri.data_len = 0; p_associated_uri.buf_len = 0; - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; return -1; } else { p_associated_uri.buf_len = p_associated_uri.data_len; @@ -384,8 +384,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) str b = {0, 0}; uac_req_t req;
- LM_DBG("r_send_third_party_reg: REGISTER to <%.*s>\n", r->req_uri.len, - r->req_uri.s); + LM_DBG("REGISTER to <%.*s>\n", r->req_uri.len, r->req_uri.s);
h.len = event_hdr.len + max_fwds_hdr.len; h.len += expires_s.len + 12 + expires_e.len; @@ -432,7 +431,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires)
h.s = pkg_malloc(h.len); if(!h.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", h.len); + PKG_MEM_ERROR; h.len = 0; return 0; } @@ -490,8 +489,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = body_s.len + r->body.content.len + body_e.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -508,8 +506,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = r->body.content.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -524,8 +521,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) b.len = r->body.content.len; b.s = pkg_malloc(b.len); if(!b.s) { - LM_ERR("r_send_third_party_reg: Error allocating %d bytes\n", - b.len); + PKG_MEM_ERROR; b.len = 0; goto error; } @@ -541,7 +537,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) TMCB_RESPONSE_IN | TMCB_ON_FAILURE | TMCB_LOCAL_COMPLETED, r_third_party_reg_response, &(r->req_uri)); if(isc_tmb.t_request(&req, &(r->req_uri), &(r->to), &(r->from), 0) < 0) { - LM_ERR("r_send_third_party_reg: Error sending in transaction\n"); + LM_ERR("Error sending in transaction\n"); goto error; } if(h.s) @@ -568,9 +564,9 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) void r_third_party_reg_response( struct cell *t, int type, struct tmcb_params *ps) { - LM_DBG("r_third_party_reg_response: code %d\n", ps->code); + LM_DBG("code %d\n", ps->code); if(!ps->rpl) { - LM_ERR("r_third_party_reg_response: No reply\n"); + LM_ERR("No reply\n"); return; }
@@ -581,6 +577,6 @@ void r_third_party_reg_response( return; } else if(ps->code == 404) { } else { - LM_DBG("r_third_party_reg_response: code %d\n", ps->code); + LM_DBG("code %d\n", ps->code); } }