sr-dev

sr-dev@lists.kamailio.org

16 participants
45381 discussions

git:master:2f6f8e5f: misctest: add rpc param
by Henning Westerholt 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: 2f6f8e5f8e318fc4c5cc3f940fd785f4e05c6de9 URL: https://github.com/kamailio/kamailio/commit/2f6f8e5f8e318fc4c5cc3f940fd785f… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-07-16T15:32:35+02:00 misctest: add rpc param --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2f6f8e5f8e318fc4c5cc3f940fd785f… Patch: https://github.com/kamailio/kamailio/commit/2f6f8e5f8e318fc4c5cc3f940fd785f… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 66e9938c4cc..50863ea1554 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -1355,7 +1355,13 @@ static const char *rpc_mt_lock_test_doc[2] = { static void rpc_mt_lock_test(rpc_t *rpc, void *c) { - lock_test(1000000000); + int executions = 0; + int n_args = rpc->scan(c, "d", &executions); + if(n_args == 1 && executions < 1) { + rpc->fault(c, 400, "Argument must be a positive integer"); + return; + } + lock_test(executions); return; }

1 0

git:master:23f16631: misctest: Add lock_test function and rpc
by Henning Westerholt 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: 23f166311e841197e9e1aa3b355509943c17b158 URL: https://github.com/kamailio/kamailio/commit/23f166311e841197e9e1aa3b3555099… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-07-16T15:32:35+02:00 misctest: Add lock_test function and rpc --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/23f166311e841197e9e1aa3b3555099… Patch: https://github.com/kamailio/kamailio/commit/23f166311e841197e9e1aa3b3555099… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index c103022ebc2..66e9938c4cc 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -58,6 +58,7 @@ MODULE_VERSION static int mt_mem_alloc_f(struct sip_msg *, char *, char *); static int mt_mem_free_f(struct sip_msg *, char *, char *); static int mt_tcp_thread_exec_f(sip_msg_t *, char *, char *); +static int mt_lock_test_f(struct sip_msg *, char *, char *); static int mod_init(void); static void mod_destroy(void); @@ -75,6 +76,7 @@ static cmd_export_t cmds[]={ {"mt_mem_alloc", mt_mem_alloc_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, {"mt_mem_free", mt_mem_free_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, {"mt_tcp_thread_exec", mt_tcp_thread_exec_f, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"mt_lock_test", mt_lock_test_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, {0, 0, 0, 0, 0} }; /* clang-format on */ @@ -965,6 +967,25 @@ static int mem_test_destroy(int id) return -(tst == 0); } + +static int lock_test(int executions) +{ + gen_lock_t *my_lock = NULL; + my_lock = lock_alloc(); + + if(my_lock == NULL) { + LM_ERR("Error creating lock\n"); + return -1; + } + LM_INFO("Start lock test, %d executions\n", executions); + for(int i = 0; i < executions; i++) { + lock_get(my_lock); + lock_release(my_lock); + } + LM_INFO("Finished lock test\n"); + return 0; +} + /* script functions: */ @@ -991,6 +1012,16 @@ static int mt_mem_free_f(struct sip_msg *msg, char *sz, char *foo) } +static int mt_lock_test_f(struct sip_msg *msg, char *sz, char *foo) +{ + int size; + + if(sz == 0 || get_int_fparam(&size, msg, (fparam_t *)sz) < 0) + return -1; + return lock_test(size) >= 0 ? 1 : -1; +} + + /* RPC exports: */ @@ -1319,6 +1350,16 @@ static void rpc_mt_test_list(rpc_t *rpc, void *c) } +static const char *rpc_mt_lock_test_doc[2] = { + "Test a number of locking operations", 0}; + +static void rpc_mt_lock_test(rpc_t *rpc, void *c) +{ + lock_test(1000000000); + return; +} + + /* clang-format off */ static rpc_export_t mt_rpc[] = { {"mt.mem_alloc", rpc_mt_alloc, rpc_mt_alloc_doc, 0}, @@ -1332,6 +1373,7 @@ static rpc_export_t mt_rpc[] = { {"mt.mem_test_destroy_all", rpc_mt_test_destroy_all, rpc_mt_test_destroy_all_doc, 0}, {"mt.mem_test_list", rpc_mt_test_list, rpc_mt_test_list_doc, 0}, + {"mt.lock_test", rpc_mt_lock_test, rpc_mt_lock_test_doc, 0}, {0, 0, 0, 0} }; /* clang-format on */

1 0

git:master:a07b845c: crypto: init call-id rand seeding with the first usage
by Daniel-Constantin Mierla 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: a07b845cffe0a6a5fb6410d735aee6c510f8ff8e URL: https://github.com/kamailio/kamailio/commit/a07b845cffe0a6a5fb6410d735aee6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-16T12:02:57+02:00 crypto: init call-id rand seeding with the first usage - randomization per process --- Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/crypto_uuid.c Modified: src/modules/crypto/crypto_uuid.h --- Diff: https://github.com/kamailio/kamailio/commit/a07b845cffe0a6a5fb6410d735aee6c… Patch: https://github.com/kamailio/kamailio/commit/a07b845cffe0a6a5fb6410d735aee6c… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 84f70813602..a079987a9ff 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -139,10 +139,6 @@ static int mod_init(void) } if(_crypto_register_callid != 0) { - if(crypto_init_callid() < 0) { - LM_ERR("failed to init callid callback\n"); - return -1; - } if(crypto_register_callid_func() < 0) { LM_ERR("unable to register callid callback\n"); return -1; @@ -166,11 +162,6 @@ static int mod_init(void) */ static int child_init(int rank) { - if(_crypto_register_callid != 0 && crypto_child_init_callid(rank) < 0) { - LM_ERR("failed to register callid callback\n"); - return -1; - } - return 0; } diff --git a/src/modules/crypto/crypto_uuid.c b/src/modules/crypto/crypto_uuid.c index 660d1fe7ccb..6be44b184da 100644 --- a/src/modules/crypto/crypto_uuid.c +++ b/src/modules/crypto/crypto_uuid.c @@ -82,11 +82,20 @@ static inline int crypto_bytes2hex( /** * \brief Initialize the Call-ID generator + * - process initialization, permute seed with pid * \return 0 on success, -1 on error */ -int crypto_init_callid(void) +static int _crypto_init_callid_done = 0; +static int crypto_init_callid(void) { static char crypto_callid_seed_str[2 * SEED_LEN] = {0}; + unsigned int pid = my_pid(); + + if(_crypto_init_callid_done == pid) { + return 0; + } + _crypto_init_callid_done = pid; + if(!(RAND_bytes(crypto_callid_seed, sizeof(crypto_callid_seed)))) { LOG(L_ERR, "ERROR: Unable to get random bytes for Call-ID seed\n"); return -1; @@ -95,29 +104,13 @@ int crypto_init_callid(void) crypto_callid_seed, sizeof(crypto_callid_seed)); DBG("Call-ID initialization: '0x%.*s'\n", 2 * SEED_LEN, crypto_callid_seed_str); - return 0; -} - - -/** - * \brief Child initialization, permute seed with pid - * \param rank not used - * \return 0 on success, -1 on error - */ -int crypto_child_init_callid(int rank) -{ - static char crypto_callid_seed_str[2 * SEED_LEN] = {0}; - unsigned int pid = my_pid(); - if(SEED_LEN < 2) { - LOG(L_CRIT, "BUG: Call-ID seed is too short\n"); - return -1; - } crypto_callid_seed[0] ^= (pid >> 0) % 0xff; crypto_callid_seed[1] ^= (pid >> 8) % 0xff; crypto_bytes2hex(crypto_callid_seed_str, sizeof(crypto_callid_seed_str), crypto_callid_seed, sizeof(crypto_callid_seed)); - DBG("Call-ID initialization: '0x%.*s'\n", 2 * SEED_LEN, + DBG("Call-ID process initialization: '0x%.*s'\n", 2 * SEED_LEN, crypto_callid_seed_str); + return 0; } @@ -188,6 +181,13 @@ void crypto_generate_callid(str *callid) static char crypto_sbuf[UUID_LEN] = {0}; crypto_inc_counter(crypto_callid_counter, CTR_LEN); + if(crypto_init_callid() < 0) { + LM_ERR("cannot initialize the seed\n"); + callid->s = NULL; + callid->len = 0; + return; + } + #if OPENSSL_VERSION_NUMBER > 0x030000000L if((crypto_ctx = EVP_MD_CTX_new()) == NULL) { LM_ERR("can't get new context\n"); diff --git a/src/modules/crypto/crypto_uuid.h b/src/modules/crypto/crypto_uuid.h index 53a81ccda88..5373f9783b1 100644 --- a/src/modules/crypto/crypto_uuid.h +++ b/src/modules/crypto/crypto_uuid.h @@ -35,21 +35,6 @@ #include "../../core/str.h" -/** - * \brief Initialize the Call-ID generator - * \return 0 on success, -1 on error - */ -int crypto_init_callid(void); - - -/** - * \brief Child initialization - * \param rank not used - * \return 0 on success, -1 on error - */ -int crypto_child_init_callid(int rank); - - /** * \brief TM API export */

1 0

git:master:4722cc9e: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: 4722cc9e4df86e04604c37fd1131e2789bffde0a URL: https://github.com/kamailio/kamailio/commit/4722cc9e4df86e04604c37fd1131e27… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-16T09:46:12+02:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/4722cc9e4df86e04604c37fd1131e27… Patch: https://github.com/kamailio/kamailio/commit/4722cc9e4df86e04604c37fd1131e27…

1 0

[kamailio/kamailio] acc_json: add cdr_skip parameter (PR #4323)
by Lucian Balaceanu 16 Jul '25

16 Jul '25

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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  Skip cdr generation for dialogs with this dlg_var set. This is analogue to parameter in acc module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4323 -- Commit Summary -- * acc_json: add cdr_skip parameter -- File Changes -- M src/modules/acc_json/acc_json_mod.c (16) M src/modules/acc_json/doc/acc_json_admin.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4323.patch https://github.com/kamailio/kamailio/pull/4323.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4323 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4323(a)github.com>

2 3

git:master:c09961d5: acc_json: add cdr_skip parameter
by Lucian Balaceanu 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: c09961d5b3144b1fb5809a29280c5baa776ee6ea URL: https://github.com/kamailio/kamailio/commit/c09961d5b3144b1fb5809a29280c5ba… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2025-07-16T10:44:04+03:00 acc_json: add cdr_skip parameter --- Modified: src/modules/acc_json/acc_json_mod.c Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c09961d5b3144b1fb5809a29280c5ba… Patch: https://github.com/kamailio/kamailio/commit/c09961d5b3144b1fb5809a29280c5ba… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 3008012ecdd..a24ff607c79 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -99,6 +99,7 @@ str cdr_q_name = {0, 0}; static char *cdr_log_facility_str = 0; static char *cdr_json_pre_encoded_prefix_str = 0; str cdr_json_pre_encoded_prefix = {0, 0}; +str acc_json_cdr_skip = {NULL, 0}; static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; @@ -118,6 +119,7 @@ static param_export_t params[] = {{"acc_flag", PARAM_INT, &acc_flag}, {"cdr_pre_encoded_prefix", PARAM_STRING, &cdr_json_pre_encoded_prefix_str}, {"cdr_enable", PARAM_INT, &cdr_enable}, + {"cdr_skip", PARAM_STR, &acc_json_cdr_skip}, {"cdr_expired_dlg_enable", PARAM_INT, &cdr_expired_dlg_enable}, {"cdr_log_level", PARAM_INT, &cdr_log_level}, {"cdr_log_facility", PARAM_STRING, &cdr_log_facility_str}, @@ -452,7 +454,19 @@ int cdr_json_write(struct dlg_cell *dlg, struct sip_msg *req, cdr_info_t *inf) int extra_cnt = 0; int core_cnt = 0; - json_t *object = json_object(); + json_t *object = NULL; + + /* Skip cdr if cdr_skip dlg_var exists */ + if(acc_json_cdr_skip.len > 0) { + str nocdr_val = {0}; + dlgb.get_dlg_varval(dlg, &acc_json_cdr_skip, &nocdr_val); + if(nocdr_val.s) { + LM_DBG("cdr_skip dlg_var set, skip cdr!"); + return 0; + } + } + + object = json_object(); /* get default values */ core_cnt = accb.get_core_cdr_attrs(dlg, inf->varr, inf->iarr, inf->tarr); diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 08bb113d06c..8d3ae12bf8f 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -348,6 +348,24 @@ modparam("acc_json", "cdr_enable", 1) </example> </section> + <section id="acc_json.p.cdr_skip"> + <title><varname>cdr_skip</varname> (string)</title> + <para> + Skip cdr generation for dialogs with this dlg_var set. + </para> + <para> + Default value is NULL. + </para> + <example> + <title>cdr_skip example</title> + <programlisting format="linespecific"> +... +modparam("acc_json", "cdr_skip", "nocdr") +... +</programlisting> + </example> + </section> + <section id="acc.p.cdr_extra"> <title><varname>cdr_extra</varname> (str)</title> <para>

1 0

git:master:dfd5358f: dispatcher: docs for event_callback_mode parameter
by Daniel-Constantin Mierla 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: dfd5358fd4a685d5c368753e826bff63c4e38988 URL: https://github.com/kamailio/kamailio/commit/dfd5358fd4a685d5c368753e826bff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-16T09:31:34+02:00 dispatcher: docs for event_callback_mode parameter --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dfd5358fd4a685d5c368753e826bff6… Patch: https://github.com/kamailio/kamailio/commit/dfd5358fd4a685d5c368753e826bff6… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 1f897f8335b..9429afba67f 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1073,6 +1073,40 @@ end </example> </section> + <section id="dispatcher.p.event_callback_mode"> + <title><varname>event_callback_mode</varname> (int)</title> + <para> + Controls when the event_route or the KEMI event callback function + are executed. If set to 0, they are executed when the destination + state changes based on OPTIONS keepalives or the use of config + functions to set the state (e.g., ds_mark_dst(...)). If set to 1, + they are executed only on state change due to OPTIONS keepalives. + </para> + <para> + Note that event routes are not executed on RPC commands setting + the destination state. + </para> + <para> + <emphasis> + Default value is '0'. + </emphasis> + </para> + <example> + <title>Set <varname>event_callback_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dispatcher", "event_callback_mode", 1) +... +-- event callback function implemented in Lua +function ksr_dispatcher_event(evname) + KSR.info("===== dispatcher module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> + <section id="dispatcher.p.ds_attrs_none"> <title><varname>ds_attrs_none</varname> (int)</title> <para> @@ -2634,39 +2668,45 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <section id="dispatcher.ex.event_routes"> <title>Event routes</title> <section> - <title> - <function moreinfo="none">dispatcher:dst-down</function> - </title> - <para> + <title> + <function moreinfo="none">dispatcher:dst-down</function> + </title> + <para> When defined, the module calls event_route[dispatcher:ds-down] when a destination goes down (becomes probing). A typical use case is to update NMC equipment as to the status of a destination. - </para> + </para> + <para> + Its execution is controlled by event_callback_mode parameter. + </para> <programlisting format="linespecific"> ... event_route[dispatcher:dst-down] { xlog("L_ERR", "Destination down: $rm $ru ($du)\n"); } ... - </programlisting> +</programlisting> </section> <section> - <title> - <function moreinfo="none">dispatcher:dst-up</function> - </title> - <para> + <title> + <function moreinfo="none">dispatcher:dst-up</function> + </title> + <para> When defined, the module calls event_route[dispatcher:ds-up] when a destination that was previously down (probing) comes up. A typical use case is to update NMC equipment as to the status of a destination. - </para> + </para> + <para> + Its execution is controlled by event_callback_mode parameter. + </para> <programlisting format="linespecific"> ... event_route[dispatcher:dst-up] { xlog("L_ERR", "Destination up: $rm $ru\n"); } ... - </programlisting> +</programlisting> </section> </section>

1 0

git:master:77805bc1: dispatcher: added parameter event_callback_mode
by Daniel-Constantin Mierla 16 Jul '25

16 Jul '25

Module: kamailio Branch: master Commit: 77805bc1f028f4cca956d4f05dd9dc3c0d534d0f URL: https://github.com/kamailio/kamailio/commit/77805bc1f028f4cca956d4f05dd9dc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-16T09:31:34+02:00 dispatcher: added parameter event_callback_mode - control when event route and KEMI callback functions are executed --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/77805bc1f028f4cca956d4f05dd9dc3… Patch: https://github.com/kamailio/kamailio/commit/77805bc1f028f4cca956d4f05dd9dc3…

1 0

git:master:48d3fdb3: ims_isc: remove function names from log messages
by Victor Seva 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: 48d3fdb3cfa3e5eec777853e1a4d32d844e94e8f URL: https://github.com/kamailio/kamailio/commit/48d3fdb3cfa3e5eec777853e1a4d32d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-15T18:17:41+02:00 ims_isc: remove function names from log messages * use generic PKG_MEM_ERROR messages on pkg_malloc errors --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/48d3fdb3cfa3e5eec777853e1a4d32d… Patch: https://github.com/kamailio/kamailio/commit/48d3fdb3cfa3e5eec777853e1a4d32d… --- 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); } }

1 0

git:master:db7c46d9: ims_isc: fix wrong log level messages
by Victor Seva 15 Jul '25

15 Jul '25

Module: kamailio Branch: master Commit: db7c46d97cf2d3f47024dbf9583aad575dd14b35 URL: https://github.com/kamailio/kamailio/commit/db7c46d97cf2d3f47024dbf9583aad5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-07-15T18:03:07+02:00 ims_isc: fix wrong log level messages this are clearly debug log messages, not errors --- Modified: src/modules/ims_isc/third_party_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/db7c46d97cf2d3f47024dbf9583aad5… Patch: https://github.com/kamailio/kamailio/commit/db7c46d97cf2d3f47024dbf9583aad5… --- diff --git a/src/modules/ims_isc/third_party_reg.c b/src/modules/ims_isc/third_party_reg.c index 3cae9211e06..b1b6de69076 100644 --- a/src/modules/ims_isc/third_party_reg.c +++ b/src/modules/ims_isc/third_party_reg.c @@ -485,7 +485,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) LM_DBG("BODY TYPE(3rd PARTY REGISTER):<%d>\n", r->body.content_type); if(r->body.content_type != CT_NONE) { if(r->body.content_type == CT_SERVICE_INFO) { - LM_ERR("BODY (3rd PARTY REGISTER) \"SI\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"SI\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = body_s.len + r->body.content.len + body_e.len; b.s = pkg_malloc(b.len); @@ -503,7 +503,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) STR_APPEND(h, ct_service_info); STR_APPEND(h, content_type_e); } else if(r->body.content_type == CT_REGISTER_REQ) { - LM_ERR("BODY (3rd PARTY REGISTER) \"REQ\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"REQ\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = r->body.content.len; b.s = pkg_malloc(b.len); @@ -519,7 +519,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) STR_APPEND(h, ct_register_req); STR_APPEND(h, content_type_e); } else if(r->body.content_type == CT_REGISTER_RESP) { - LM_ERR("BODY (3rd PARTY REGISTER) \"RESP\": <%.*s>\n", + LM_DBG("BODY (3rd PARTY REGISTER) \"RESP\": <%.*s>\n", r->body.content.len, r->body.content.s); b.len = r->body.content.len; b.s = pkg_malloc(b.len);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
4539
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev