sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
311 discussions

git:5.6:5fea7e17: xlog: add kemi xlog_facility function

by Stefan-Cristian Mititelu

Module: kamailio Branch: 5.6 Commit: 5fea7e17389dfc71efee7caff215668335867699 URL: https://github.com/kamailio/kamailio/commit/5fea7e17389dfc71efee7caff215668… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-01-19T15:39:14+02:00 xlog: add kemi xlog_facility function (cherry-picked from commit e506b60c1045cfbd4485434165305fbc2fb57aa9) --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/5fea7e17389dfc71efee7caff215668… Patch: https://github.com/kamailio/kamailio/commit/5fea7e17389dfc71efee7caff215668… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index a6fe9e9aace..94920ca421d 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -877,8 +877,9 @@ static int xlog_log_colors_param(modparam_t type, void *val) /** * write message after evaluation of lmsg for pseudo-variables */ -int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) +int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) { + int lf = xlog_facility; pv_elem_t *xmodel = NULL; str txt = {0, 0}; @@ -895,13 +896,23 @@ int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) pv_elem_free_all(xmodel); return -1; } - LOG_FN(xlog_facility, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); + + if(lfacility != NULL) { + lfacility->s[lfacility->len] = '\0'; + lf = str2facility(lfacility->s); + if(lf == -1) { + LM_WARN("invalid syslog facility %.*s, using default\n", + lfacility->len, lfacility->s); + lf = xlog_facility; + } + } + LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); ; pv_elem_free_all(xmodel); return 1; } -int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +int ki_xlog_get_level(str *slevel) { int llevel; @@ -926,42 +937,55 @@ int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) } else { llevel = L_ERR; } - return ki_xlog_ex(msg, llevel, lmsg); + + return llevel; +} + +int ki_xlog_facility(sip_msg_t *msg, str *lfacility, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, lfacility, llevel, lmsg); +} + +int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, NULL, llevel, lmsg); } int ki_xdbg(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_DBG, lmsg); + return ki_xlog_ex(msg, NULL, L_DBG, lmsg); } int ki_xerr(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ERR, lmsg); + return ki_xlog_ex(msg, NULL, L_ERR, lmsg); } int ki_xinfo(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_INFO, lmsg); + return ki_xlog_ex(msg, NULL, L_INFO, lmsg); } int ki_xnotice(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_NOTICE, lmsg); + return ki_xlog_ex(msg, NULL, L_NOTICE, lmsg); } int ki_xwarn(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_WARN, lmsg); + return ki_xlog_ex(msg, NULL, L_WARN, lmsg); } int ki_xalert(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ALERT, lmsg); + return ki_xlog_ex(msg, NULL, L_ALERT, lmsg); } int ki_xcrit(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_CRIT, lmsg); + return ki_xlog_ex(msg, NULL, L_CRIT, lmsg); } /** @@ -1009,6 +1033,11 @@ static sr_kemi_t sr_kemi_xlog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("xlog"), str_init("xlog_facility"), + SR_KEMIP_INT, ki_xlog_facility, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

11 months, 1 week

git:5.7:306b4b09: xlog: add kemi xlog_facility function

by Stefan-Cristian Mititelu

Module: kamailio Branch: 5.7 Commit: 306b4b09e3cb46a0fe8bc2d25344e5cfa52941e0 URL: https://github.com/kamailio/kamailio/commit/306b4b09e3cb46a0fe8bc2d25344e5c… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-01-19T15:38:26+02:00 xlog: add kemi xlog_facility function (cherry picked from commit e506b60c1045cfbd4485434165305fbc2fb57aa9) --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/306b4b09e3cb46a0fe8bc2d25344e5c… Patch: https://github.com/kamailio/kamailio/commit/306b4b09e3cb46a0fe8bc2d25344e5c… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index 03063bbfb1f..c7d239ea299 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -878,8 +878,9 @@ static int xlog_log_colors_param(modparam_t type, void *val) /** * write message after evaluation of lmsg for pseudo-variables */ -int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) +int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) { + int lf = xlog_facility; pv_elem_t *xmodel = NULL; str txt = {0, 0}; @@ -896,13 +897,23 @@ int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) pv_elem_free_all(xmodel); return -1; } - LOG_FN(xlog_facility, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); + + if(lfacility != NULL) { + lfacility->s[lfacility->len] = '\0'; + lf = str2facility(lfacility->s); + if(lf == -1) { + LM_WARN("invalid syslog facility %.*s, using default\n", + lfacility->len, lfacility->s); + lf = xlog_facility; + } + } + LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); ; pv_elem_free_all(xmodel); return 1; } -int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +int ki_xlog_get_level(str *slevel) { int llevel; @@ -927,42 +938,55 @@ int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) } else { llevel = L_ERR; } - return ki_xlog_ex(msg, llevel, lmsg); + + return llevel; +} + +int ki_xlog_facility(sip_msg_t *msg, str *lfacility, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, lfacility, llevel, lmsg); +} + +int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, NULL, llevel, lmsg); } int ki_xdbg(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_DBG, lmsg); + return ki_xlog_ex(msg, NULL, L_DBG, lmsg); } int ki_xerr(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ERR, lmsg); + return ki_xlog_ex(msg, NULL, L_ERR, lmsg); } int ki_xinfo(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_INFO, lmsg); + return ki_xlog_ex(msg, NULL, L_INFO, lmsg); } int ki_xnotice(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_NOTICE, lmsg); + return ki_xlog_ex(msg, NULL, L_NOTICE, lmsg); } int ki_xwarn(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_WARN, lmsg); + return ki_xlog_ex(msg, NULL, L_WARN, lmsg); } int ki_xalert(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ALERT, lmsg); + return ki_xlog_ex(msg, NULL, L_ALERT, lmsg); } int ki_xcrit(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_CRIT, lmsg); + return ki_xlog_ex(msg, NULL, L_CRIT, lmsg); } /** @@ -1010,6 +1034,11 @@ static sr_kemi_t sr_kemi_xlog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("xlog"), str_init("xlog_facility"), + SR_KEMIP_INT, ki_xlog_facility, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

11 months, 1 week

[kamailio/kamailio] xlog: add kemi xlog_facility function (PR #3708)

by Stefan Mititelu

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add kemi xlog function to be able to log in other facilities other than the default one. Can this be backported to 5.6 and 5.7? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3708 -- Commit Summary -- * xlog: add kemi xlog_facility function -- File Changes -- M src/modules/xlog/xlog.c (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3708.patch https://github.com/kamailio/kamailio/pull/3708.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3708 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3708(a)github.com>

11 months, 1 week

git:master:e506b60c: xlog: add kemi xlog_facility function

by Stefan Mititelu

Module: kamailio Branch: master Commit: e506b60c1045cfbd4485434165305fbc2fb57aa9 URL: https://github.com/kamailio/kamailio/commit/e506b60c1045cfbd4485434165305fb… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-01-19T15:34:37+02:00 xlog: add kemi xlog_facility function --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/e506b60c1045cfbd4485434165305fb… Patch: https://github.com/kamailio/kamailio/commit/e506b60c1045cfbd4485434165305fb… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index 03063bbfb1f..c7d239ea299 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -878,8 +878,9 @@ static int xlog_log_colors_param(modparam_t type, void *val) /** * write message after evaluation of lmsg for pseudo-variables */ -int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) +int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) { + int lf = xlog_facility; pv_elem_t *xmodel = NULL; str txt = {0, 0}; @@ -896,13 +897,23 @@ int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) pv_elem_free_all(xmodel); return -1; } - LOG_FN(xlog_facility, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); + + if(lfacility != NULL) { + lfacility->s[lfacility->len] = '\0'; + lf = str2facility(lfacility->s); + if(lf == -1) { + LM_WARN("invalid syslog facility %.*s, using default\n", + lfacility->len, lfacility->s); + lf = xlog_facility; + } + } + LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); ; pv_elem_free_all(xmodel); return 1; } -int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +int ki_xlog_get_level(str *slevel) { int llevel; @@ -927,42 +938,55 @@ int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) } else { llevel = L_ERR; } - return ki_xlog_ex(msg, llevel, lmsg); + + return llevel; +} + +int ki_xlog_facility(sip_msg_t *msg, str *lfacility, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, lfacility, llevel, lmsg); +} + +int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, NULL, llevel, lmsg); } int ki_xdbg(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_DBG, lmsg); + return ki_xlog_ex(msg, NULL, L_DBG, lmsg); } int ki_xerr(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ERR, lmsg); + return ki_xlog_ex(msg, NULL, L_ERR, lmsg); } int ki_xinfo(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_INFO, lmsg); + return ki_xlog_ex(msg, NULL, L_INFO, lmsg); } int ki_xnotice(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_NOTICE, lmsg); + return ki_xlog_ex(msg, NULL, L_NOTICE, lmsg); } int ki_xwarn(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_WARN, lmsg); + return ki_xlog_ex(msg, NULL, L_WARN, lmsg); } int ki_xalert(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ALERT, lmsg); + return ki_xlog_ex(msg, NULL, L_ALERT, lmsg); } int ki_xcrit(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_CRIT, lmsg); + return ki_xlog_ex(msg, NULL, L_CRIT, lmsg); } /** @@ -1010,6 +1034,11 @@ static sr_kemi_t sr_kemi_xlog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("xlog"), str_init("xlog_facility"), + SR_KEMIP_INT, ki_xlog_facility, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

11 months, 1 week

git:master:4a2665a8: pv: increase the number of slots for transformations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4a2665a8c5ff31d50468bd998ef0853c3ff510cc URL: https://github.com/kamailio/kamailio/commit/4a2665a8c5ff31d50468bd998ef0853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-19T10:18:33+01:00 pv: increase the number of slots for transformations - safer handling of chained transformations --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/4a2665a8c5ff31d50468bd998ef0853… Patch: https://github.com/kamailio/kamailio/commit/4a2665a8c5ff31d50468bd998ef0853… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 92aa7b6be61..0cc6f8f2e2c 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -59,7 +59,7 @@ static param_t *_tr_uri_params = NULL; /*! transformation buffer size */ #define TR_BUFFER_SIZE 65536 -#define TR_BUFFER_SLOTS 8 +#define TR_BUFFER_SLOTS 16 /*! transformation buffer */ static char **_tr_buffer_list = NULL;

11 months, 1 week

git:master:59104fe7: core: increase default pv buffer size to accomodate safer webrtc traffic

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 59104fe7d57bc8c75c835bbb75d5a1b7d01f6bda URL: https://github.com/kamailio/kamailio/commit/59104fe7d57bc8c75c835bbb75d5a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-19T10:09:46+01:00 core: increase default pv buffer size to accomodate safer webrtc traffic --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/59104fe7d57bc8c75c835bbb75d5a1b… Patch: https://github.com/kamailio/kamailio/commit/59104fe7d57bc8c75c835bbb75d5a1b… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 0bb20367ba5..34d0a9bcb3c 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2029,7 +2029,7 @@ void pv_destroy_api(void) * - buffer to print PVs */ static char **_pv_print_buffer = NULL; -#define PV_DEFAULT_PRINT_BUFFER_SIZE 8192 /* 8kB */ +#define PV_DEFAULT_PRINT_BUFFER_SIZE 32768 /* 32kB */ static int _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; static int _pv_print_buffer_size_active = 0; /* 6 mod params + 4 direct usage from mods */

11 months, 1 week

git:master:cc26d25e: pv: convert pv value to long for ftime transformation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cc26d25eefac40ec1c7e209e25312eed978cf348 URL: https://github.com/kamailio/kamailio/commit/cc26d25eefac40ec1c7e209e25312ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-19T09:49:55+01:00 pv: convert pv value to long for ftime transformation --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/cc26d25eefac40ec1c7e209e25312ee… Patch: https://github.com/kamailio/kamailio/commit/cc26d25eefac40ec1c7e209e25312ee… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 84c3a0c703f..92aa7b6be61 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1011,7 +1011,7 @@ int tr_eval_string( return -1; } if(!(val->flags & PV_VAL_INT) - && (str2int(&val->rs, (unsigned int *)&val->ri) != 0)) { + && (str2slong(&val->rs, &val->ri) != 0)) { LM_ERR("value is not numeric (cfg line: %d)\n", get_cfg_crt_line()); return -1; @@ -1036,6 +1036,8 @@ int tr_eval_string( memcpy(s, st.s, st.len); s[st.len] = '\0'; t = val->ri; + memset(&tmv, 0, sizeof(struct tm)); + _tr_buffer[0] = '\0'; localtime_r(&t, &tmv); val->rs.len = strftime(_tr_buffer, TR_BUFFER_SIZE - 1, s, &tmv); pkg_free(s);

11 months, 1 week

git:master:a2bff77c: jansson: declare variables at the beginning of blocks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a2bff77c3f7bfee8dae90c3ef20522d480f2e14d URL: https://github.com/kamailio/kamailio/commit/a2bff77c3f7bfee8dae90c3ef20522d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-19T09:44:33+01:00 jansson: declare variables at the beginning of blocks --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a2bff77c3f7bfee8dae90c3ef20522d… Patch: https://github.com/kamailio/kamailio/commit/a2bff77c3f7bfee8dae90c3ef20522d… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index dab15d488f3..4202cd56fe8 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -40,6 +40,9 @@ int janssonmod_get_helper( pv_value_t dst_val; json_t *json = NULL; json_error_t parsing_error; + char *path = NULL; + char *freeme = NULL; + STR_VTOZ(src_s->s[src_s->len], c); json = json_loads(src_s->s, JSON_REJECT_DUPLICATES, &parsing_error); STR_ZTOV(src_s->s[src_s->len], c); @@ -50,14 +53,13 @@ int janssonmod_get_helper( goto fail; } - char *path = path_s->s; + path = path_s->s; json_t *v = json_path_get(json, path, pmode); if(!v) { goto fail; } - char *freeme = NULL; if(jansson_to_val(&dst_val, &freeme, v) < 0) goto fail; @@ -149,6 +151,12 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, char c; pv_spec_t *result_pv; pv_value_t result_val; + json_t *result_json = NULL; + json_t *value = NULL; + char *freeme = NULL; + json_error_t parsing_error = {0}; + char *endptr; + char *path = NULL; if(fixup_get_svalue(msg, (gparam_p)type_in, &type_s) != 0) { ERR("cannot get type string value\n"); @@ -180,12 +188,6 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, LM_DBG("value is: %.*s\n", value_s.len, value_s.s); LM_DBG("result is: %.*s\n", result_val.rs.len, result_val.rs.s); - json_t *result_json = NULL; - json_t *value = NULL; - char *freeme = NULL; - json_error_t parsing_error = {0}; - char *endptr; - /* check the type */ if(STR_EQ_STATIC(type_s, "object") || STR_EQ_STATIC(type_s, "obj")) { STR_VTOZ(value_s.s[value_s.len], c); @@ -260,7 +262,8 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, goto fail; } - char *path = path_s.s; + path = path_s.s; + STR_VTOZ(result_val.rs.s[result_val.rs.len], c); result_json = json_loads(result_val.rs.s, JSON_REJECT_DUPLICATES, &parsing_error); @@ -300,6 +303,8 @@ int janssonmod_array_size( str path_s; pv_spec_t *dst_pv; pv_value_t dst_val; + char *path = NULL; + int size = 0; if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { ERR("cannot get json string value\n"); @@ -324,7 +329,7 @@ int janssonmod_array_size( goto fail; } - char *path = path_s.s; + path = path_s.s; json_t *v = json_path_get(json, path, 0); if(!v) { @@ -337,7 +342,7 @@ int janssonmod_array_size( goto fail; } - int size = json_array_size(v); + size = json_array_size(v); dst_val.ri = size; dst_val.flags = PV_TYPE_INT | PV_VAL_INT;

11 months, 1 week

[kamailio/kamailio] ndb_redis doesn't use AUTH on a slave server in redis cluster. (Issue #3654)

by Dries De Gendt

### Description & troubleshooting I have defined a redis cluster as followed. The cluster consists of 3 masters (port 6379) and 3 slaves (port 6380). The password is identical on all nodes through redis option 'requirepass'. ``` modparam("ndb_redis", "server", "name=sbcredis;addr=SBCMASTERREDISIP;port=6379;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=PRIVATEIP;port=6380;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=ASTP5IP;port=6380;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=ASTP6IP;port=6379;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=ASTP3IP;port=6380;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=ASTP4IP;port=6379;db=0;pass=REDACTED") modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "debug", 3) ``` When executing the redis_cmd command, most of the times an expected warning is shown due to another server providing the requested slot: `"(error) MOVED ... 192.168.136.241:6380"` Notice that I've enabled "allow_dynamic_nodes" to make sure there is an automated connection attempt to the indicated server. However, it appears that sometimes a "NOAUTH Authentication required." error is thrown when there is a redirection to a slave server serving that slot. I can authenticate succesfull on the redis-cli when using the identical password though. Also note that when a redis master is queried, the redis_cmd is successful. #### Reproduction Each simple redis command that needs authentication (GET, SET, ...) `redis_cmd("sbcredis", "SET TESTKEY TESTVALUE", "r");` #### Log Messages ``` ndb_redis [redis_client.c:1089]: redisc_exec(): Redis error:NOAUTH Authentication required. ``` ### Possible Solutions None for now except disabling the password on all nodes. ### Additional Information ``` kamailio 5.7.2 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3654 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3654(a)github.com>

11 months, 1 week

git:master:8a161309: core: parser - check diversion pointer before accessing it

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8a1613096ad86db125398e50d2ecced5d3ff1978 URL: https://github.com/kamailio/kamailio/commit/8a1613096ad86db125398e50d2ecced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-18T18:48:22+01:00 core: parser - check diversion pointer before accessing it --- Modified: src/core/parser/parse_diversion.c --- Diff: https://github.com/kamailio/kamailio/commit/8a1613096ad86db125398e50d2ecced… Patch: https://github.com/kamailio/kamailio/commit/8a1613096ad86db125398e50d2ecced… --- diff --git a/src/core/parser/parse_diversion.c b/src/core/parser/parse_diversion.c index 92690296935..557950052fa 100644 --- a/src/core/parser/parse_diversion.c +++ b/src/core/parser/parse_diversion.c @@ -210,17 +210,19 @@ int parse_diversion_header(struct sip_msg *msg) int free_diversion_body(diversion_body_t *div_b) { - int i = 0; + int i; + + if(div_b == NULL) { + return -1; + } for(i = 0; i < div_b->num_ids; i++) { /* Free to_body pointer parameters */ if(div_b->id[i].param_lst) { free_to_params(&(div_b->id[i])); } } + pkg_free(div_b); - if(div_b != NULL) { - pkg_free(div_b); - } return 0; }

11 months, 1 week

← Newer
1
...
12
13
14
15
16
17
18
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2024