- sr-dev - kamailio.org

git:master:9b3b8ec9: corex: docs for dns_file parameter
by Daniel-Constantin Mierla 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: 9b3b8ec968c6f7bda0d10a0d4fe593a92560ee7d URL: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-06T08:35:19+02:00 corex: docs for dns_file parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… Patch: https://github.com/kamailio/kamailio/commit/9b3b8ec968c6f7bda0d10a0d4fe593a… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index d5cfe1db477..3cdad0aa2a5 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -162,6 +162,41 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") modparam("corex", "dns_cache", "type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0") modparam("corex", "dns_cache", "type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0") ... +</programlisting> + </example> + </section> + <section id="corex.p.dns_file"> + <title><varname>dns_file</varname> (string)</title> + <para> + Path to the file from where to load dns_cache records. It can be set + many times to add more than one file. + </para> + <para> + Inside the file, the dns_cache record has to be in a single line, with + the format of the dns_cache module parameter (see above). Empty lines + or lines with whitespaces only are ignored. Comment lines have to start + with '#'. Comments are not accepted after dns_cache records, only on + separate lines. + </para> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dns_file</varname> parameter</title> + <programlisting format="linespecific"> +... +# content of /etc/kamailio/kamailio-cache.dns + +# IPv4 record +type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0 +# IPv6 record +type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0 +... +... +modparam("corex", "dns_file", "/etc/kamailio/kamailio-cache.dns") +... </programlisting> </example> </section> @@ -1291,4 +1326,3 @@ sub do_uncompress() { </example> </section> </chapter> -

1 0

git:master:c8cf642c: corex: added dns_file modparam
by Daniel-Constantin Mierla 06 Apr '24

06 Apr '24

Module: kamailio Branch: master Commit: c8cf642c21169bcaee82347db858d8f3bcb6a42c URL: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-06T08:19:19+02:00 corex: added dns_file modparam - can be set to the path of a file containing dns_cache records - each line has to contain a dns_cache-param-formatted record - empty lines are allowed - comment line has to start with #, comments can be only on separate line, not supported after dns_cache record --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… Patch: https://github.com/kamailio/kamailio/commit/c8cf642c21169bcaee82347db858d8f… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 4152fbf5df4..6739e4cee16 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -32,6 +32,7 @@ #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../core/str_list.h" +#include "../../core/trim.h" #include "../../core/events.h" #include "../../core/onsend.h" #include "../../core/forward.h" @@ -82,12 +83,15 @@ static int corex_evrt_reply_out_no = -1; int corex_alias_subdomains_param(modparam_t type, void *val); int corex_dns_cache_param(modparam_t type, void *val); +int corex_dns_file_param(modparam_t type, void *val); +int corex_dns_file_load(void); static int mod_init(void); static int child_init(int); static void mod_destroy(void); static str_list_t *corex_dns_cache_list = NULL; +static str_list_t *corex_dns_file_list = NULL; static int corex_dns_cache_param_add(str *pval); @@ -176,6 +180,8 @@ static param_export_t params[] = { (void *)corex_alias_subdomains_param}, {"dns_cache", PARAM_STR | USE_FUNC_PARAM, (void *)corex_dns_cache_param}, + {"dns_file", PARAM_STR | USE_FUNC_PARAM, + (void *)corex_dns_file_param}, {"nio_intercept", INT_PARAM, &nio_intercept}, {"nio_min_msg_len", INT_PARAM, &nio_min_msg_len}, {"nio_msg_avp", PARAM_STR, &nio_msg_avp_param}, @@ -226,6 +232,9 @@ static int mod_init(void) return -1; } } + if(corex_dns_file_load() < 0) { + return -1; + } if((nio_intercept > 0) && (nio_intercept_init() < 0)) { LM_ERR("failed to register network io intercept callback\n"); @@ -385,6 +394,67 @@ int corex_dns_cache_param(modparam_t type, void *val) return 0; } +int corex_dns_file_param(modparam_t type, void *val) +{ + str_list_t *sit; + + if(val == NULL || ((str *)val)->s == NULL || ((str *)val)->len == 0) { + LM_ERR("invalid parameter\n"); + return -1; + } + + sit = (str_list_t *)pkg_mallocxz(sizeof(str_list_t)); + if(sit == NULL) { + PKG_MEM_ERROR; + return -1; + } + sit->s = *((str *)val); + if(corex_dns_file_list != NULL) { + sit->next = corex_dns_file_list; + } + corex_dns_file_list = sit; + + return 0; +} + +int corex_dns_file_load(void) +{ + str_list_t *sit; + str sline; + char lbuf[512]; + FILE *FP; + + for(sit = corex_dns_file_list; sit != NULL; sit = sit->next) { + FP = fopen(sit->s.s, "r"); + if(FP == NULL) { + LM_ERR("failed to open file '%.*s'\n", sit->s.len, sit->s.s); + return -1; + } + while(fgets(lbuf, 512, FP)) { + sline.s = lbuf; + sline.len = strlen(sline.s); + trim(&sline); + if(sline.len <= 0) { + /* empty line */ + continue; + } + if(sline.s[0] == '#') { + /* comment */ + continue; + } + if(corex_dns_cache_param_add(&sline) < 0) { + LM_ERR("failed to add record: '%.*s' (%.*s)\n", sline.len, + sline.s, sit->s.len, sit->s.s); + fclose(FP); + return -1; + } + } + fclose(FP); + } + + return 0; +} + static int corex_dns_cache_param_add(str *pval) { str sval;

1 0

git:master:92d3573b: ims_ipsec_pcscf: log error message made info
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 92d3573b500374d100639484e5a84cb640dc6b1d URL: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T21:42:12+02:00 ims_ipsec_pcscf: log error message made info --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… Patch: https://github.com/kamailio/kamailio/commit/92d3573b500374d100639484e5a84cb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 4f7301b56c1..b5a598b44ba 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1126,7 +1126,8 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", ci.via_host.len, ci.via_host.s, dst_port); - } else if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TLS)) { + } else if((_cflags & IPSEC_SETDSTURI_FULL) + && (dst_proto == PROTO_TLS)) { buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tls", ci.via_host.len, ci.via_host.s, dst_port); @@ -1143,7 +1144,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) memcpy(m->dst_uri.s, buf, buf_len); m->dst_uri.len = buf_len; m->dst_uri.s[m->dst_uri.len] = '\0'; - LM_ERR("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); + LM_INFO("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); } // Set send socket

1 0

git:master:5b689721: modules: readme files regenerated - xhttp_prom ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 5b689721332a311dd2fb93d154e09c775701dab4 URL: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T20:31:21+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7… Patch: https://github.com/kamailio/kamailio/commit/5b689721332a311dd2fb93d154e09c7…

1 0

git:master:bae35e49: xhttp_prom: update documentation for uptime statistic
by Ovidiu Sas 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: bae35e49fa364de6a4c003c4484358d5592677de URL: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-05T18:28:32Z xhttp_prom: update documentation for uptime statistic --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… Patch: https://github.com/kamailio/kamailio/commit/bae35e49fa364de6a4c003c4484358d… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index 83cede92633..d3b5961a218 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -182,8 +182,9 @@ modparam("xhttp_prom", "xhttp_prom_stats", "") </programlisting> </example> </section> + <section id="xhttp_prom.p.xhttp_prom_pkg_stats"> - <title><varname>xhttp_prom_pkg_stats</varname> (str)</title> + <title><varname>xhttp_prom_pkg_stats</varname> (integer)</title> <para> Enable or disable internal &kamailio; pkg memory statistics. </para> @@ -201,6 +202,29 @@ modparam("xhttp_prom", "xhttp_prom_stats", "") ... # enable pkg stats modparam("xhttp_prom", "xhttp_prom_pkg_stats", 1) +... + </programlisting> + </example> + </section> + <section id="xhttp_prom.p.xhttp_prom_uptime_stat"> + <title><varname>xhttp_prom_uptime_stat</varname> (integer)</title> + <para> + Enable or disable &kamailio; uptime statistic. + </para> + <para> + <emphasis>If not 0</emphasis>, uptime statistic will be displayed. + </para> + <para> + <emphasis> + Default value is 0 (no uptime statistic). + </emphasis> + </para> + <example> + <title>Set <varname>xhttp_prom_uptime_stat</varname> parameter</title> + <programlisting format="linespecific"> +... +# enable uptime statistic +modparam("xhttp_prom", "xhttp_prom_uptime_stat", 1) ... </programlisting> </example>

1 0

git:master:6af0ae46: xhttp_prom: new uptime statistic
by Ovidiu Sas 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 6af0ae461486554481cbace41d50b8639b2ade8a URL: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-05T18:21:29Z xhttp_prom: new uptime statistic --- Modified: src/modules/xhttp_prom/prom.c Modified: src/modules/xhttp_prom/xhttp_prom.c Modified: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… Patch: https://github.com/kamailio/kamailio/commit/6af0ae461486554481cbace41d50b86… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index 786a2c3e40a..efe111b752a 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -33,6 +33,7 @@ #include <inttypes.h> #include <stdarg.h> +#include "../../core/globals.h" #include "../../core/counters.h" #include "../../core/ut.h" #include "../../core/pt.h" @@ -204,6 +205,36 @@ static int metric_generate( return 0; } +/** + * @brief Generate a string suitable for Prometheus pkgmem metric. + * + * @return 0 on success. + */ +static int prom_metric_uptime_print(prom_ctx_t *ctx) +{ + int uptime; + time_t now; + uint64_t ts; + + if(get_timestamp(&ts)) { + LM_ERR("Fail to get timestamp\n"); + goto error; + } + + time(&now); + uptime = (int)(now - up_since); + if(prom_body_printf(ctx, "%.*suptime %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, uptime, ts) + == -1) { + LM_ERR("Fail to print\n"); + goto error; + } + return 0; + +error: + return -1; +} + /** * @brief Generate a string suitable for Prometheus pkgmem metric. * @@ -322,6 +353,13 @@ int prom_stats_get(prom_ctx_t *ctx, str *stat) } } + if(uptime_stat_enabled) { + if(prom_metric_uptime_print(ctx)) { + LM_ERR("Fail to print uptime metric\n"); + return -1; + } + } + LM_DBG("Statistics for: %.*s\n", stat->len, stat->s); int len = stat->len; diff --git a/src/modules/xhttp_prom/xhttp_prom.c b/src/modules/xhttp_prom/xhttp_prom.c index 6eaffb640a3..f54cfb19f17 100644 --- a/src/modules/xhttp_prom/xhttp_prom.c +++ b/src/modules/xhttp_prom/xhttp_prom.c @@ -153,6 +153,8 @@ int buf_size = 0; /**< size of buffer that contains the reply. */ int timeout_minutes = 60; /**< timeout in minutes to delete old metrics. */ +int uptime_stat_enabled = 0; /**< enable or disable uptime statistic. */ + int pkgmem_stats_enabled = 0; /**< enable or disable pkgmem statistics. */ char error_buf[ERROR_REASON_BUF_LEN]; @@ -213,6 +215,7 @@ static param_export_t params[] = {{"xhttp_prom_buf_size", INT_PARAM, &buf_size}, {"prom_histogram", PARAM_STRING | USE_FUNC_PARAM, (void *)prom_histogram_param}, {"xhttp_prom_timeout", INT_PARAM, &timeout_minutes}, + {"xhttp_prom_uptime_stat", INT_PARAM, &uptime_stat_enabled}, {"xhttp_prom_pkg_stats", INT_PARAM, &pkgmem_stats_enabled}, {0, 0, 0}}; struct module_exports exports = { diff --git a/src/modules/xhttp_prom/xhttp_prom.h b/src/modules/xhttp_prom/xhttp_prom.h index 12851368df4..fa1aa611ae2 100644 --- a/src/modules/xhttp_prom/xhttp_prom.h +++ b/src/modules/xhttp_prom/xhttp_prom.h @@ -84,6 +84,11 @@ extern str xhttp_prom_beginning; */ extern int timeout_minutes; +/** + * @brief enable or disable uptime statistic. + */ +extern int uptime_stat_enabled; + /** * @brief enable or disable pkgmem statistics. */

1 0

git:master:d1118064: siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: d1118064d04bb77c818540e68edf1766db1d560a URL: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T16:19:42+02:00 siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri --- Modified: src/modules/siputils/checks.c --- Diff: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… Patch: https://github.com/kamailio/kamailio/commit/d1118064d04bb77c818540e68edf176… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 2ba80b5be94..6cc977197fb 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -780,7 +780,7 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) return 1; /* reserve memory for clean tel uri */ - tel_uri.s = pkg_malloc(uri.len + 1); + tel_uri.s = pkg_mallocxz(uri.len + 1); if(tel_uri.s == 0) { LM_ERR("no more pkg memory\n"); return -1; @@ -839,7 +839,7 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) /* reserve memory for resulting sip uri */ sip_uri.len = 4 + tel_uri.len - 4 + 1 + hostpart.len + 1 + 10; - sip_uri.s = pkg_malloc(sip_uri.len + 1); + sip_uri.s = pkg_mallocxz(sip_uri.len + 1); if(sip_uri.s == 0) { LM_ERR("no more pkg memory\n"); pkg_free(tel_uri.s); @@ -873,6 +873,8 @@ int tel2sip2(struct sip_msg *_msg, char *_uri, char *_hostpart, char *_res) /* tel_uri is not needed anymore */ pkg_free(tel_uri.s); + sip_uri.len = strlen(sip_uri.s); + /* set result pv value and write sip uri to result pv */ res_val.rs = sip_uri; res_val.flags = PV_VAL_STR;

1 0

git:master:8523eb21: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 8523eb2180ec878278863c5315ca4067586824bb URL: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T13:01:11+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406… Patch: https://github.com/kamailio/kamailio/commit/8523eb2180ec878278863c5315ca406…

1 0

git:master:3208dd82: textopsx: docs for msg_changed_route(...)
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 3208dd822f94cff7b28d9682b083f3d144d7368e URL: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 textopsx: docs for msg_changed_route(...) --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… Patch: https://github.com/kamailio/kamailio/commit/3208dd822f94cff7b28d9682b083f3d… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index b6b50916051..92666736c86 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -50,6 +50,33 @@ if(msg_apply_changes()) </example> </section> + <section id="textopsx.f.msg_changed_route"> + <title> + <function moreinfo="none">msg_changed_route(rname)</function> + </title> + <para> + Execute a route block specified by rname, using a new SIP message + structure build using the current SIP message with applied changes. + The current SIP message does not get the changes applied. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>msg_changed_route()</function> usage</title> + <programlisting format="linespecific"> +... +append_hf("My-Header: yes\r\n"); +msg_changed_route("UPDATEDMSG"); +... +route[UPDATEDMSG] { + xinfo("My-Header-Value: $hdr(My-Header)\n"); +} +... +</programlisting> + </example> + </section> + <section id="textopsx.f.msg_set_buffer"> <title> <function moreinfo="none">msg_set_buffer(data)</function>

1 0

git:master:ac22a5c1: textopsx: added msg_changed_route(rname)
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: ac22a5c174d4652ae09b779a5384182211700f20 URL: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 textopsx: added msg_changed_route(rname) - execute a route block using the changed message, without efectivelly changing the current message structure (it stays without changes applied) --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… Patch: https://github.com/kamailio/kamailio/commit/ac22a5c174d4652ae09b779a5384182… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 5710cfeb864..8982924296a 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -46,6 +46,7 @@ MODULE_VERSION static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); +static int msg_changed_route_f(sip_msg_t *msg, char *str1, char *str2); static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2); static int change_reply_status_f(sip_msg_t *, char *, char *); @@ -122,6 +123,8 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"msg_changed_route", (cmd_function)msg_changed_route_f, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {"msg_set_buffer", (cmd_function)msg_set_buffer_f, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, @@ -276,6 +279,92 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) return sip_msg_apply_changes(msg); } +/** + * + */ +static int ki_msg_changed_route(sip_msg_t *msg, str *rname) +{ + str obuf = STR_NULL; + int ridx = -1; + sip_msg_t lmsg; + sr_kemi_eng_t *keng = NULL; + run_act_ctx_t ctx; + str evname = str_init("textopsx:msg-changed-route"); + + keng = sr_kemi_eng_get(); + if(keng == NULL) { + ridx = route_lookup(&main_rt, rname->s); + if(ridx < 0) { + LM_ERR("route block [%.*s] not found\n", rname->len, rname->s); + return -1; + } + } + + if(sip_msg_eval_changes(msg, &obuf) < 0 || obuf.s == NULL) { + LM_ERR("failed to evaluate msg changes\n"); + return -1; + } + + memset(&lmsg, 0, sizeof(sip_msg_t)); + lmsg.buf = obuf.s; + lmsg.len = obuf.len; + lmsg.id = msg->id; + lmsg.pid = msg->pid; + lmsg.rcv = msg->rcv; + lmsg.set_global_address = msg->set_global_address; + lmsg.set_global_port = msg->set_global_port; + lmsg.flags = msg->flags; + lmsg.msg_flags = msg->msg_flags; + memcpy(lmsg.xflags, msg->xflags, KSR_XFLAGS_SIZE * sizeof(flag_t)); + lmsg.hash_index = msg->hash_index; + lmsg.force_send_socket = msg->force_send_socket; + + /* parse the local message */ + LM_DBG("SIP message content updated - parsing\n"); + if(parse_msg(lmsg.buf, lmsg.len, &lmsg) != 0) { + LM_ERR("parsing new sip message failed [[%.*s]]\n", lmsg.len, lmsg.buf); + return -1; + } + if(parse_headers(&lmsg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0) + < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + lmsg.len, lmsg.buf); + return -1; + } + init_run_actions_ctx(&ctx); + + if(keng == NULL) { + run_top_route(main_rt.rlist[ridx], &lmsg, &ctx); + } else { + if(sr_kemi_ctx_route(keng, &ctx, &lmsg, get_route_type(), + rname, &evname) + < 0) { + LM_ERR("error running route kemi callback\n"); + } + } + + free_sip_msg(&lmsg); + + pkg_free(obuf.s); + + return 1; +} + +/** + * + */ +static int msg_changed_route_f(sip_msg_t *msg, char *prname, char *str2) +{ + str rname = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)prname, &rname) < 0) { + LM_ERR("could not get route name param value\n"); + return -1; + } + + return ki_msg_changed_route(msg, &rname); +} + /** * */

1 0

git:master:756f01ee: pv: use core helper to evaluate changes for pv updated message buffer
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 756f01eecec754726c09a7067e11db9781e35ac1 URL: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 pv: use core helper to evaluate changes for pv updated message buffer --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… Patch: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1f998bfc1d3..40557ba4628 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -522,8 +522,6 @@ static str _ksr_pv_msg_buf_updated = STR_NULL; int pv_get_msg_buf_updated( struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - dest_info_t send_info; - if(msg == NULL) return -1; @@ -533,17 +531,7 @@ int pv_get_msg_buf_updated( _ksr_pv_msg_buf_updated.len = 0; } - init_dest_info(&send_info); - send_info.proto = PROTO_UDP; - if(msg->first_line.type == SIP_REPLY) { - _ksr_pv_msg_buf_updated.s = generate_res_buf_from_sip_res(msg, - (unsigned int *)&_ksr_pv_msg_buf_updated.len, - BUILD_NO_VIA1_UPDATE); - } else if(msg->first_line.type == SIP_REQUEST) { - _ksr_pv_msg_buf_updated.s = build_req_buf_from_sip_req(msg, - (unsigned int *)&_ksr_pv_msg_buf_updated.len, &send_info, - BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); - } else { + if(sip_msg_eval_changes(msg, &_ksr_pv_msg_buf_updated) < 0) { return pv_get_null(msg, param, res); }

1 0

git:master:cad94eb7: core: msg translator - helper function to evaluate changes
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: cad94eb73c1223ddcf69aa0d073deb3118b46e3f URL: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 core: msg translator - helper function to evaluate changes --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… Patch: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index acd5911867a..ab02fb7c47c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3485,6 +3485,33 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) return 1; } +/** + * evaluate changes and set the output buffer + * - obuf->s has to be pkg freed + * - return: 1 on success, -1 on failure + */ +int sip_msg_eval_changes(sip_msg_t *msg, str *obuf) +{ + dest_info_t dst; + + init_dest_info(&dst); + dst.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + obuf->s = generate_res_buf_from_sip_res( + msg, (unsigned int *)&obuf->len, BUILD_NO_VIA1_UPDATE); + } else { + obuf->s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf->len, + &dst, + BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); + } + if(obuf->s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + return -1; + } + + return 1; +} + /** * */ diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index eac64186d56..9d41b472767 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -173,6 +173,11 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, */ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf); +/** + * evaluate changes and set the output buffer + */ +int sip_msg_eval_changes(sip_msg_t *msg, str *obuf); + /** * apply changes to sip msg buffer and reparse */

1 0

git:master:95f7af6f: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 95f7af6f3aea7ff01fdc06a72703441c4ef320ca URL: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T11:31:18+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441… Patch: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441…

1 0

[kamailio/kamailio] DBURL can't read env params (Issue #3800)
by gao114882 05 Apr '24

05 Apr '24

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` I want to read params from environment, so define #!defenv MYSQL_IP #!trydef DBURL "mysql://kamailio:kamailio@MYSQL_IP/kamailio" but It can't read this ”MYSQL_IP“。 root@d2e1fcc3f89e:/# env |grep MYSQL* MYSQL_URL=172.16.4.111 MYSQL_IP=172.16.4.111 ``` #### Log Messages  ``` 0(34) ERROR: db_mysql [km_my_con.c:166]: db_mysql_new_connection(): driver error: Unknown server host 'MYSQL_IP' (-2) 0(34) ERROR: <core> [db.c:324]: db_do_init2(): could not add connection to the pool 0(34) ERROR: dispatcher [dispatch.c:955]: ds_connect_db(): cannot initialize db connection 0(34) ERROR: dispatcher [dispatch.c:989]: ds_init_db(): unable to connect to the database 0(34) ERROR: dispatcher [dispatcher.c:439]: mod_init(): could not initiate a connect to the database 0(34) ERROR: <core> [core/sr_module.c:1030]: init_mod(): Error while initializing module dispatcher (/usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (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, MEM_JOIN_FREE, 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 12.2.0 ``` * **Operating System**:  ``` cat /proc/version Linux version 3.10.0-1160.105.1.el7.x86_64 (mockbuild(a)kbuilder.bsys.centos.org) (gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC) ) #1 SMP Thu Dec 7 15:39:45 UTC 2023 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3800 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3800(a)github.com>

3 3

[kamailio/kamailio] Topos breaks early dialog transactions on multi-homed kamailio instances using enable_double_rr and versions >= 5.6.5 (Issue #3757)
by George Diamantopoulos 05 Apr '24

05 Apr '24

### Description All kamailio versions on the 5.7.x train and additionally point release 5.6.5 break early dialog transactions, at least when the following conditions are (cumulatively) met: * topos-redis is enabled (haven't tested other storage backends yet, let me know if needed) * kamailio is multihomed * enable_double_rr is enabled (the default) ### Troubleshooting #### SIP Traffic Here's an exchange demonstrating the problem: ``` kamailio instance ──────────┬──────────────────┬───────── internal external peer 172.30.154.1:5060 185.73.43.241:5060 195.167.21.66:5060 ──────────┬──────────────────┬───────── ──────────┬───────── │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ INVITE (SDP) │ │ │ ──────────────────────────> │ │ │ 100 Trying │ │ │ <────────────────────────── │ │ │ 183 Session Progress (SDP) │ │ │ <────────────────────────── │ │ │ PRACK │ │ │ ──────────────────────────> │ │ │ 200 OK │ │ │ <────────────────────────── │ │ │ UPDATE (SDP) │ UPDATE (SDP) │ │ <─────────────────────────── │ │ ``` Whereas the expected behaviour should be: ``` │ │ UPDATE (SDP) │ | <────────────────────────── │ UPDATE (SDP)│ │ │ <───────── │ │ │ ``` This is also exemplified by examining the Via headers as rewritten by kamailio. Not working (>= 5.6.5, 5.7.x): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bKtjlwcpvfh03epe0thhtjhq3qg;Role=3;Hpt=8e58_16` * Oubound Via: `Via: SIP/2.0/UDP 185.73.43.241;branch=z9hG4bK66c4.3453dd9a219858819d528b9da671e39e.0` Working (5.6.4): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bK8lj1ahz6npz65khd8jkzl1ohh;Role=3;Hpt=8e68_16` * Oubound Via: `Via: SIP/2.0/UDP 172.30.154.1;branch=z9hG4bK4dce.4f5448efd64465fa5dbaf5eef0dc35b7.0` ### Possible Solutions Only solution I have found so far is to downgrade to kamailio 5.6.4  ### Additional Information ``` version: kamailio 5.7.4 (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, MEM_JOIN_FREE, 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 ``` But I have also tested all 5.7.x versions, which are all affected, as well 5.6.5. * **Operating System**:  ``` Linux host 5.10.0-27-amd64 #1 SMP Debian 5.10.205-2 (2023-12-31) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3757 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3757(a)github.com>

3 8

git:master:8330158b: rtpengine: docs for write_sdp_pv_mode parameter
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 8330158b88815f28326fc5293831c83cebc2e41c URL: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T11:06:53+02:00 rtpengine: docs for write_sdp_pv_mode parameter --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… Patch: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 6d79abfaeff..f898aa32979 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -478,6 +478,32 @@ route { </example> </section> + <section id="rtpengine.p.write_sdp_pv_mode"> + <title><varname>write_sdp_pv_mode</varname> (int)</title> + <para> + If this parameter is set to 1, the returned SDP is written to pv + and also set to message body. + </para> + <para> + Default value: 0 (write SDP only to pv). + </para> + <example> + <title>Set <varname>write_sdp_pv_mode</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "write_sdp_pv", "$avp(sdp)") +modparam("rtpengine", "write_sdp_pv_mode", 1) +... +route { + ... + rtpengine_manage(); + xinfo("new sdp: $avp(sdp)\n"); +} +</programlisting> + </example> + </section> + + <section id="rtpengine.p.rtp_inst_pvar"> <title><varname>rtp_inst_pvar</varname> (string)</title> <para>

1 0

git:master:664190b3: rtpengine: added param write_sdp_pv_mode
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 664190b31303b52728f957113d97bd77a7ab4f8d URL: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T10:55:09+02:00 rtpengine: added param write_sdp_pv_mode - if set to 1, write the returned sdp in pv and set the body - default 0, write only in pv (existing behaviour so far) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… Patch: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 8a2f9f82d89..c51b4742081 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -322,6 +322,7 @@ static int_str setid_avp; static str write_sdp_pvar_str = {NULL, 0}; static pv_spec_t *write_sdp_pvar = NULL; +static int write_sdp_pvar_mode = 0; static str read_sdp_pvar_str = {NULL, 0}; static pv_spec_t *read_sdp_pvar = NULL; @@ -504,6 +505,7 @@ static param_export_t params[] = { {"force_send_interface", PARAM_STRING, &force_send_ip_str}, {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param}, {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str}, + {"write_sdp_pv_mode", PARAM_INT, &write_sdp_pvar_mode}, {"read_sdp_pv", PARAM_STR, &read_sdp_pvar_str}, {"hash_table_tout", INT_PARAM, &hash_table_tout}, {"hash_table_size", INT_PARAM, &hash_table_size}, @@ -4708,9 +4710,11 @@ static int rtpengine_offer_answer( goto error_free; } - pkg_free(newbody.s); - - } else { + if(write_sdp_pvar_mode == 0) { + pkg_free(newbody.s); + } + } + if(write_sdp_pvar == NULL || write_sdp_pvar_mode != 0) { if(cl_field.len) { anchor = del_lump(msg, cl_field.s - msg->buf, cl_field.len, 0); cl_repl.s = pkg_malloc(10);

1 0

[kamailio/kamailio] app_python module still needs Python 2 (Issue #3805)
by waarmond 05 Apr '24

05 Apr '24

I'm trying to build current git sources on ArchLinux. `modules/app_python/Makefile` still asks for python2: ``` which: no python2 in ($PATH) which: no python2.7 in ($PATH) File "<string>", line 1 import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR') ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SyntaxError: Missing parentheses in call to 'print'. Did you mean print(...)? ``` Is this intended? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3805 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3805(a)github.com>

2 2

git:master:30f620ae: sdpops: use find_sdp_line_start() to find start of attribute line
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 30f620ae2254888c0d8d7edc375cb312e33de124 URL: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:23:29+02:00 sdpops: use find_sdp_line_start() to find start of attribute line --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Patch: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 30de5dfc543..f40062420a7 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2059,6 +2059,9 @@ int bind_sdpops(struct sdpops_binds *sob) return 0; } +/** + * + */ int sdpops_attr_val(str *payload, str *attr, str *val) { char *sline; @@ -2066,16 +2069,9 @@ int sdpops_attr_val(str *payload, str *attr, str *val) val->s = NULL; val->len = 0; - sline = find_sdp_line(payload->s, payload->s + payload->len, attr->s[0]); + sline = find_sdp_line_start( + payload->s, payload->s + payload->len, attr->s[0], 0); while(sline != NULL) { - /* check start of line */ - if(sline > payload->s) { - if(eline[-1] != '\n' && eline[-1] != '\r') { - sline = find_next_sdp_line( - sline, payload->s + payload->len, attr->s[0], NULL); - continue; - } - } /* find EoL or EoData */ eline = sline; while(eline < payload->s + payload->len) {

1 0

git:master:368661cc: core: parser/sdp - function to find sdp line with start EoL check option
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: 368661cc15251af4cbf295d1f5fad5a42d1b647b URL: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:10:11+02:00 core: parser/sdp - function to find sdp line with start EoL check option --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Patch: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index d5cb359b40f..a5dffd9c398 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -733,9 +733,10 @@ int extract_sess_version(str *oline, str *sess_version) /* * Auxiliary for some functions. + * - smode: if 1, pstart is pointing inside msg body * Returns pointer to first character of found line, or NULL if no such line. */ -char *find_sdp_line(char *pstart, char *plimit, char linechar) +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode) { static char linehead[3] = "x="; char *cp, *cp1; @@ -749,11 +750,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) if(cp1 == NULL) return NULL; /* - * As it is body, we assume it has previous line and we can - * lookup previous character. + * smode==1 means it is msg body, thus it has previous line and it can + * lookup previous character even when cp1==pstart. */ - if(cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; + if(cp1 > pstart || smode == 1) { + if(cp1[-1] == '\n' || cp1[-1] == '\r') { + return cp1; + } + } /* * Having such data, but not at line beginning. * Skip them and reiterate. ser_memmem() will find next @@ -765,6 +769,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) } } +/* + * Auxiliary for some functions - expect pstart to point inside SIP message body. + * Returns pointer to first character of found line, or NULL if no such line. + */ +char *find_sdp_line(char *pstart, char *plimit, char linechar) +{ + return find_sdp_line_start(pstart, plimit, linechar, 1); +} /* This function assumes pstart points to a line of requested type. */ char *find_next_sdp_line( diff --git a/src/core/parser/sdp/sdp_helpr_funcs.h b/src/core/parser/sdp/sdp_helpr_funcs.h index e8ce6f7e60a..20d3ebd882d 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.h +++ b/src/core/parser/sdp/sdp_helpr_funcs.h @@ -65,6 +65,7 @@ int extract_accept_wrapped_types(str *body, str *accept_wrapped_types); int extract_max_size(str *body, str *max_size); int extract_path(str *body, str *path); +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode); char *find_sdp_line(char *p, char *plimit, char linechar); char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr);

1 0

git:master:b03ec735: core: parser/sdp - rename parameter to suggest better its role
by Daniel-Constantin Mierla 05 Apr '24

05 Apr '24

Module: kamailio Branch: master Commit: b03ec73589c12e566b11ce2c653401daa915c805 URL: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T07:54:12+02:00 core: parser/sdp - rename parameter to suggest better its role --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… Patch: https://github.com/kamailio/kamailio/commit/b03ec73589c12e566b11ce2c653401d… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index b15ddeaa4bd..d5cb359b40f 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -735,14 +735,13 @@ int extract_sess_version(str *oline, str *sess_version) * Auxiliary for some functions. * Returns pointer to first character of found line, or NULL if no such line. */ - -char *find_sdp_line(char *p, char *plimit, char linechar) +char *find_sdp_line(char *pstart, char *plimit, char linechar) { static char linehead[3] = "x="; char *cp, *cp1; linehead[0] = linechar; /* Iterate through body */ - cp = p; + cp = pstart; for(;;) { if(cp >= plimit) return NULL; @@ -767,13 +766,14 @@ char *find_sdp_line(char *p, char *plimit, char linechar) } -/* This function assumes p points to a line of requested type. */ -char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr) +/* This function assumes pstart points to a line of requested type. */ +char *find_next_sdp_line( + char *pstart, char *plimit, char linechar, char *defptr) { char *t; - if(p >= plimit || plimit - p < 3) + if(pstart >= plimit || plimit - pstart < 3) return defptr; - t = find_sdp_line(p + 2, plimit, linechar); + t = find_sdp_line(pstart + 2, plimit, linechar); return t ? t : defptr; }

1 0

git:master:57dd65c2: xhttp_prom: use proper prefix for pkg stats
by Ovidiu Sas 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 57dd65c2c6abd520c0db876aca6bd2238229e187 URL: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-04T16:22:39Z xhttp_prom: use proper prefix for pkg stats --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… Patch: https://github.com/kamailio/kamailio/commit/57dd65c2c6abd520c0db876aca6bd22… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index 1ea7edb1c5e..786a2c3e40a 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -221,8 +221,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, - "kamailio_pkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " + "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " "%d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) == -1) { @@ -230,8 +231,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_available{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) == -1) { @@ -239,8 +241,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_real_used{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) == -1) { @@ -248,8 +251,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_total_frags{pid=\"%u\", rank=\"%d\", " + "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) == -1) { @@ -257,8 +261,9 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) goto error; } if(prom_body_printf(ctx, - "kamailio_pkgmem_total_size{pid=\"%u\", rank=\"%d\" " + "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " "desc=\"%s\"} %d %" PRIu64 "\n", + xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts) == -1) {

1 0

git:master:c4b81393: sdpops: function to parse path for sdp content
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: c4b81393fed9a333af9349850e70ee377f3f3491 URL: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T16:29:05+02:00 sdpops: function to parse path for sdp content --- Added: src/modules/sdpops/sdpops_path.c Added: src/modules/sdpops/sdpops_path.h --- Diff: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3… Patch: https://github.com/kamailio/kamailio/commit/c4b81393fed9a333af9349850e70ee3…

1 0

git:master:359a442e: sdpops: reformat the codecs map
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 359a442e14a156b0bcf60dc5b2580cbc57924e34 URL: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T16:29:05+02:00 sdpops: reformat the codecs map --- Modified: src/modules/sdpops/sdpops_data.c --- Diff: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… Patch: https://github.com/kamailio/kamailio/commit/359a442e14a156b0bcf60dc5b2580cb… --- diff --git a/src/modules/sdpops/sdpops_data.c b/src/modules/sdpops/sdpops_data.c index 25d7de178ed..c158511b60e 100644 --- a/src/modules/sdpops/sdpops_data.c +++ b/src/modules/sdpops/sdpops_data.c @@ -91,19 +91,29 @@ Registration Procedures: Standards Action Process or expert approval */ -typedef struct _codecsmap -{ +/* clang-format off */ +typedef struct _codecsmap { str name; str ids; } codecsmap_t; -codecsmap_t sdpops_codecsmap_table[] = {{{"PCMU", 4}, {"0", 1}}, - {{"GSM", 3}, {"3", 1}}, {{"G723", 4}, {"4", 1}}, - {{"DVI4", 4}, {"5,6,16,17", 9}}, {{"LPC", 3}, {"7", 1}}, - {{"PCMA", 4}, {"8", 1}}, {{"G722", 4}, {"9", 1}}, - {{"L16", 3}, {"10,11", 5}}, {{"QCELP", 5}, {"12", 2}}, - {{"CN", 2}, {"13", 5}}, {{"MPA", 3}, {"14", 2}}, - {{"G728", 4}, {"15", 2}}, {{"G729", 4}, {"18", 2}}, {{0, 0}, {0, 0}}}; +codecsmap_t sdpops_codecsmap_table[] = { + {{"PCMU", 4}, {"0", 1}}, + {{"GSM", 3}, {"3", 1}}, + {{"G723", 4}, {"4", 1}}, + {{"DVI4", 4}, {"5,6,16,17", 9}}, + {{"LPC", 3}, {"7", 1}}, + {{"PCMA", 4}, {"8", 1}}, + {{"G722", 4}, {"9", 1}}, + {{"L16", 3}, {"10,11", 5}}, + {{"QCELP", 5}, {"12", 2}}, + {{"CN", 2}, {"13", 5}}, + {{"MPA", 3}, {"14", 2}}, + {{"G728", 4}, {"15", 2}}, + {{"G729", 4}, {"18", 2}}, + {{0, 0}, {0, 0}} +}; +/* clang-format on */ /** * set the string with the IDs mapped to codec name

1 0

git:master:d0d4f589: modules: readme files regenerated - xhttp_prom ... [skip ci]
by Kamailio Dev 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: d0d4f58920669f280d80c6cd66578a4b68db9e43 URL: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-04T16:16:11+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4… Patch: https://github.com/kamailio/kamailio/commit/d0d4f58920669f280d80c6cd66578a4…

1 0

git:master:a55967c0: xhttp_prom: update documentation
by Ovidiu Sas 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: a55967c0e8cee184f1cc8cc0c5df4635041b88d1 URL: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2024-04-04T10:10:15-04:00 xhttp_prom: update documentation --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… Patch: https://github.com/kamailio/kamailio/commit/a55967c0e8cee184f1cc8cc0c5df463… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index e1f2709dd21..83cede92633 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -178,6 +178,29 @@ modparam("xhttp_prom", "xhttp_prom_stats", "200_replies") # Do not display internal &kamailio; statistics. This is the default option. modparam("xhttp_prom", "xhttp_prom_stats", "") +... + </programlisting> + </example> + </section> + <section id="xhttp_prom.p.xhttp_prom_pkg_stats"> + <title><varname>xhttp_prom_pkg_stats</varname> (str)</title> + <para> + Enable or disable internal &kamailio; pkg memory statistics. + </para> + <para> + <emphasis>If not 0</emphasis>, pkg memory statistics will be displayed. + </para> + <para> + <emphasis> + Default value is 0 (no pkg memory statistics). + </emphasis> + </para> + <example> + <title>Set <varname>xhttp_prom_pkg_stats</varname> parameter</title> + <programlisting format="linespecific"> +... +# enable pkg stats +modparam("xhttp_prom", "xhttp_prom_pkg_stats", 1) ... </programlisting> </example>

1 0

[kamailio/kamailio] core: dprint - include time in stderr json log (PR #3795)
by Alexander Bakker 04 Apr '24

04 Apr '24

#### 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 This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. I know this comes a little out of the blue, so any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3795 -- Commit Summary -- * core: dprint - include time in stderr json log -- File Changes -- M src/core/dprint.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3795.patch https://github.com/kamailio/kamailio/pull/3795.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3795 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3795(a)github.com>

2 2

git:master:c3e8860f: core: dprint - include time in stderr json log
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: c3e8860f00ca1d4618b8d2ce986b5d5c3eb9a9d3 URL: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:21:54+02:00 core: dprint - include time in stderr json log This patch introduces a new "time" field for JSON logging to stderr. The CEE format already includes this field, but the Kamailio-specific format doesn't. If you need timestamps in your structured logs, but don't want to use the CEE format due to its limitations, this patch'd give you the best of both worlds. --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… Patch: https://github.com/kamailio/kamailio/commit/c3e8860f00ca1d4618b8d2ce986b5d5… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 724d3445370..83d1e30f3ca 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -573,31 +573,31 @@ static int _ksr_slog_json_flags = 0; ".callid\": \"%.*s\"%s%s%.*s%s," \ " \"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_FMT \ - "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ - " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\"%.*s%s%s%.*s%s, \"%smessage\": " \ +#define KSR_SLOG_STDERR_JSON_FMT \ + "{ \"time\": \"%s.%09luZ\", \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\"%.*s%s%s%.*s%s, \"%smessage\": " \ "%s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_CFMT \ - "{ \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ - " \"module\": \"%s\", \"file\": \"%s\"," \ - " \"line\": %d, \"function\": \"%s\", \"callid\": \"%.*s\"%s%s%.*s%s, " \ +#define KSR_SLOG_STDERR_JSON_CFMT \ + "{ \"time\": \"%s.%09luZ\", \"idx\": %d, \"pid\": %d, \"level\": \"%s\"," \ + " \"module\": \"%s\", \"file\": \"%s\"," \ + " \"line\": %d, \"function\": \"%s\", \"callid\": \"%.*s\"%s%s%.*s%s, " \ "\"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_PFMT \ - "{ \"" NAME ".idx\": %d, \"" NAME ".pid\": %d, \"" NAME \ - ".level\": \"%s\"," \ - " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ - " \"" NAME ".line\": %d, \"" NAME \ +#define KSR_SLOG_STDERR_JSON_PFMT \ + "{ \"" NAME ".time\": \"%s.%09luZ\", \"" NAME ".idx\": %d, \"" NAME \ + ".pid\": %d, \"" NAME ".level\": \"%s\"," \ + " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ + " \"" NAME ".line\": %d, \"" NAME \ ".function\": \"%s\"%.*s\"%s%s%.*s%s, \"%smessage\": %s%.*s%s }%s" -#define KSR_SLOG_STDERR_JSON_CPFMT \ - "{ \"" NAME ".idx\": %d, \"" NAME ".pid\": %d, \"" NAME \ - ".level\": \"%s\"," \ - " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ - " \"" NAME ".line\": %d, \"" NAME ".function\": \"%s\", \"" NAME \ - ".callid\": \"%.*s\"%s%s%.*s%s," \ +#define KSR_SLOG_STDERR_JSON_CPFMT \ + "{ \"" NAME ".time\": \"%s.%09luZ\", \"" NAME ".idx\": %d, \"" NAME \ + ".pid\": %d, \"" NAME ".level\": \"%s\"," \ + " \"" NAME ".module\": \"%s\", \"" NAME ".file\": \"%s\"," \ + " \"" NAME ".line\": %d, \"" NAME ".function\": \"%s\", \"" NAME \ + ".callid\": \"%.*s\"%s%s%.*s%s," \ " \"%smessage\": %s%.*s%s }%s" #ifdef HAVE_PTHREAD @@ -735,9 +735,9 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) } else { if(unlikely(log_color)) dprint_color(kld->v_level); - fprintf(stderr, efmt, process_no, my_pid(), kld->v_lname, - kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, - LOGV_CALLID_LEN, LOGV_CALLID_STR, prname, pmb, + fprintf(stderr, efmt, iso8601buf, _tp.tv_nsec, process_no, my_pid(), + kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, + kld->v_func, LOGV_CALLID_LEN, LOGV_CALLID_STR, prname, pmb, LOGV_PREFIX_LEN, LOGV_PREFIX_STR, pme, prefmsg, smb, s_out.len, s_out.s, sme, (_ksr_slog_json_flags & KSR_SLOGJSON_FL_NOLOGNL) ? ""

1 0

git:master:3c16c13a: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 3c16c13acdf95924636c4d938abe13dcb3707b73 URL: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-04T13:01:21+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… Patch: https://github.com/kamailio/kamailio/commit/3c16c13acdf95924636c4d938abe13d… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index d2baa50e72d..4cfdcaa5b4f 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -39,7 +39,7 @@ Joel Centelles Martin 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -75,7 +75,7 @@ Chapter 1. Admin Guide 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -203,7 +203,7 @@ allid,time_hires&cid:callid 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 4.1. schema_path (string) @@ -247,6 +247,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. + If TLS is enabled, the module will validate the Redis server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the Redis server must therefore be turned + off. + Default value: 0. Example 1.4. Enabling TLS connection @@ -265,9 +271,10 @@ modparam("db_redis", "opt_tls", 1) modparam("db_redis", "db_pass", "r3d1sPass") ... -4.6. ac_path (string) +4.6. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server + certificate are stored. Default value: "" (empty). diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 1cdfc842db3..90071f5e3f0 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -55,7 +55,7 @@ Joel Centelles Martin 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -149,7 +149,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 3.1. server (str) @@ -168,6 +168,12 @@ Chapter 1. Admin Guide many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. + If tls is enabled, the module will validate the REDIS server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the REDIS server must therefore be turned + off. + Default value is NULL. Example 1.1. Set server parameter @@ -346,9 +352,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "debug", 1) ... -3.11. ac_path (string) +3.11. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server + certificate are stored. Default value: "" (empty).

1 0

[kamailio/kamailio] xhttp_prom: export pkg mem statistics (PR #3793)
by Ovidiu Sas 04 Apr '24

04 Apr '24

#### 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 Enhance xhttp_prom module to export pkgmem stats. The new stats can be enabled via a new module parameter: `xhttp_prom_pkgmem_stats_enabled`. Default value for the new module parameter: 0 (no pkg mem stats are generated). Any value different then 0 will export the pkg mem statistics. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3793 -- Commit Summary -- * kex: expose access to pkg mem stats * xhttp_prom: export pkg mem stats -- File Changes -- A src/modules/kex/api.c (54) A src/modules/kex/api.h (69) M src/modules/kex/kex_mod.c (2) M src/modules/kex/pkg_stats.c (24) M src/modules/kex/pkg_stats.h (17) M src/modules/xhttp_prom/prom.c (66) M src/modules/xhttp_prom/xhttp_prom.c (44) M src/modules/xhttp_prom/xhttp_prom.h (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3793.patch https://github.com/kamailio/kamailio/pull/3793.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3793 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3793(a)github.com>

3 10

git:master:24d77c23: xhttp_prom: export pkg stats
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 24d77c23e1c0a528289d611c16916caeb9992008 URL: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:00:14+02:00 xhttp_prom: export pkg stats --- Modified: src/modules/xhttp_prom/prom.c Modified: src/modules/xhttp_prom/xhttp_prom.c Modified: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca… Patch: https://github.com/kamailio/kamailio/commit/24d77c23e1c0a528289d611c16916ca…

1 0

git:master:b0d16caf: kex: expose access to pkg stats
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: b0d16cafcfee44a8564e251c7a725324b25a1ff4 URL: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T13:00:14+02:00 kex: expose access to pkg stats --- Added: src/modules/kex/api.c Added: src/modules/kex/api.h Modified: src/modules/kex/kex_mod.c Modified: src/modules/kex/pkg_stats.c Modified: src/modules/kex/pkg_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532… Patch: https://github.com/kamailio/kamailio/commit/b0d16cafcfee44a8564e251c7a72532…

1 0

[kamailio/kamailio] ndb_redis: docs - refine docs regarding client certificates (PR #3804)
by Jannik 04 Apr '24

04 Apr '24

#### 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 The created ssl context in the `db_redis` and `ndb_redis` modules does not use client certificates [1], [2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. Without setting this configuration in Redis, no TLS connection to the Redis server can be established, since Redis will not accept unsigned/not-validated client certificates. There is also a small typo in "ac_path" in both docs which was fixed to "ca_path", added with some more specification to _which_ certificate is validated. [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3804 -- Commit Summary -- * db_redis: docs - refine docs regarding client certificates [skip ci] * ndb_redis: docs - refine docs regarding client certificates [skip ci] -- File Changes -- M src/modules/db_redis/doc/db_redis_admin.xml (10) M src/modules/ndb_redis/doc/ndb_redis_admin.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3804.patch https://github.com/kamailio/kamailio/pull/3804.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3804 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3804(a)github.com>

2 2

git:master:6faa1806: ndb_redis: docs - refine docs regarding client certificates [skip ci]
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 6faa180661e799187eff3a498f8b13e96719fa92 URL: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… Author: Jannik Volkland <volkland(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:55:38+02:00 ndb_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… Patch: https://github.com/kamailio/kamailio/commit/6faa180661e799187eff3a498f8b13e… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index 74d35c75cc9..024b01315ac 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -75,6 +75,12 @@ many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. </para> + <para> + If tls is enabled, the module will validate the REDIS server certificate against the + ca_path. There is currently no way to connect with a specified client certificate, the + <ulink url="https://redis.io/docs/management/security/encryption/#client-certificate-au…">corresponding configuration</ulink> + to check client certificates in the REDIS server must therefore be turned off. + </para> <para> <emphasis> Default value is NULL. @@ -330,9 +336,9 @@ modparam("ndb_redis", "debug", 1) </example> </section> <section id="ndb_redis.p.ca_path"> - <title><varname>ac_path</varname> (string)</title> + <title><varname>ca_path</varname> (string)</title> <para> - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server certificate are stored. </para> <para> Default value: "" (empty).

1 0

git:master:40a50243: db_redis: docs - refine docs regarding client certificates [skip ci]
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: 40a50243f0bae782b7acd97cf0a9b1138185068b URL: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… Author: Jannik Volkland <volkland(a)sipgate.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:55:38+02:00 db_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… Patch: https://github.com/kamailio/kamailio/commit/40a50243f0bae782b7acd97cf0a9b11… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index a7e7c3bb3a9..15ed0ca61e2 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -224,6 +224,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. </para> + <para> + If TLS is enabled, the module will validate the Redis server certificate against the + ca_path. There is currently no way to connect with a specified client certificate, the + <ulink url="https://redis.io/docs/management/security/encryption/#client-certificate-au…">corresponding configuration</ulink> + to check client certificates in the Redis server must therefore be turned off. + </para> <para> Default value: 0. </para> @@ -256,9 +262,9 @@ modparam("db_redis", "db_pass", "r3d1sPass") </section> <section id="db_redis.p.ca_path"> - <title><varname>ac_path</varname> (string)</title> + <title><varname>ca_path</varname> (string)</title> <para> - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server certificate are stored. </para> <para> Default value: "" (empty).

1 0

git:master:eb8027f9: sdpops: added $sdp(m0:b:AS), $sdp(m0:b:RR) and $sdp(m0:b:RS)
by Daniel-Constantin Mierla 04 Apr '24

04 Apr '24

Module: kamailio Branch: master Commit: eb8027f9292d46d70583168b76589fa55ccccb07 URL: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-04T12:16:24+02:00 sdpops: added $sdp(m0:b:AS), $sdp(m0:b:RR) and $sdp(m0:b:RS) - return string values for b=AS:.., b=RR:.., b=RS:.. --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa… Patch: https://github.com/kamailio/kamailio/commit/eb8027f9292d46d70583168b76589fa…

1 0

git:master:8047c958: sdpops: aliased $sdp(raw) to $sdp(body)
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 8047c958b42ea5af2e8f9ede0152f892ac0eea3a URL: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T20:16:21+02:00 sdpops: aliased $sdp(raw) to $sdp(body) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… Patch: https://github.com/kamailio/kamailio/commit/8047c958b42ea5af2e8f9ede0152f89… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index b443d1f84ac..96d0bd202b8 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2259,6 +2259,12 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) return -1; switch(in->len) { + case 3: + if(strncmp(in->s, "raw", 3) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; case 4: if(strncmp(in->s, "body", 4) == 0) sp->pvp.pvn.u.isname.name.n = 0;

1 0

git:master:3e73dbc6: sdpops: added $sdp(m0:raw) - get all lines of the first m= stream
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 3e73dbc6b69c8e26f276690bb6aa1e6db380510e URL: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T19:19:27+02:00 sdpops: added $sdp(m0:raw) - get all lines of the first m= stream --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… Patch: https://github.com/kamailio/kamailio/commit/3e73dbc6b69c8e26f276690bb6aa1e6… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index b7ee2482616..b443d1f84ac 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2201,6 +2201,21 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } } + case 7: + /* m0:raw - all (raw) lines for m0 stream */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams->raw_stream.s != NULL + && sdp->sessions->streams->raw_stream.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->streams->raw_stream); + } + return pv_get_null(msg, param, res); + break; default: return pv_get_null(msg, param, res); @@ -2256,6 +2271,12 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) else goto error; break; + case 6: + if(strncmp(in->s, "m0:raw", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 7; + else + goto error; + break; case 11: if(strncmp(in->s, "m0:rtp:port", 11) == 0) sp->pvp.pvn.u.isname.name.n = 4;

1 0

git:master:ed60be16: pv: transformation to escape/unescape cr lf
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: ed60be162918fc1791ee6425f664eb2f76b9475e URL: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T18:52:58+02:00 pv: transformation to escape/unescape cr lf - {s.escape.crlf}, {s.unescape.crlf} --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… Patch: https://github.com/kamailio/kamailio/commit/ed60be162918fc1791ee6425f664eb2… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 0cc6f8f2e2c..a3ce0f0ace3 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -566,6 +566,32 @@ int tr_eval_string( val->rs.s = _tr_buffer; val->rs.len = i; break; + case TR_S_ESCAPECRLF: + if(!(val->flags & PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > TR_BUFFER_SIZE / 2 - 1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if(escape_crlf(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; + case TR_S_UNESCAPECRLF: + if(!(val->flags & PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > TR_BUFFER_SIZE - 1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if(unescape_crlf(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; case TR_S_ESCAPEUSER: if(!(val->flags & PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2768,6 +2794,12 @@ char *tr_parse_string(str *in, trans_t *t) && strncasecmp(name.s, "unescape.common", 15) == 0) { t->subtype = TR_S_UNESCAPECOMMON; goto done; + } else if(name.len == 11 && strncasecmp(name.s, "escape.crlf", 11) == 0) { + t->subtype = TR_S_ESCAPECRLF; + goto done; + } else if(name.len == 13 && strncasecmp(name.s, "unescape.crlf", 13) == 0) { + t->subtype = TR_S_UNESCAPECRLF; + goto done; } else if(name.len == 11 && strncasecmp(name.s, "escape.user", 11) == 0) { t->subtype = TR_S_ESCAPEUSER; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 827f74feb49..662d5a2b578 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -60,6 +60,8 @@ enum _tr_s_subtype TR_S_DECODEBASE64, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, + TR_S_ESCAPECRLF, + TR_S_UNESCAPECRLF, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM,

1 0

git:master:6992c9ee: core: helper functions to escape/unescape cr lf
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 6992c9eedeabd931fc255e5c1e992b0cfb01dbca URL: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T18:48:29+02:00 core: helper functions to escape/unescape cr lf --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… Patch: https://github.com/kamailio/kamailio/commit/6992c9eedeabd931fc255e5c1e992b0… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 73e713cb451..475150dc0f7 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -109,6 +109,68 @@ int unescape_common(char *dst, char *src, int src_len) return j; } +/*! \brief + * add backslashes for CR LF + */ +int escape_crlf(str *sin, str *sout) +{ + int i, j; + + if(sout == 0 || sin == 0 || sin->len <= 0) + return -1; + j = 0; + for(i = 0; i < sin->len; i++) { + switch(sin->s[i]) { + case '\n': + sout->s[j++] = '\\'; + sout->s[j++] = 'n'; + break; + case '\r': + sout->s[j++] = '\\'; + sout->s[j++] = 'r'; + break; + default: + sout->s[j++] = sin->s[i]; + } + } + sout->len = j; + return 0; +} + +/*! \brief + * remove backslashes for CR LF + */ +int unescape_crlf(str *sin, str *sout) +{ + int i, j; + + if(sout == 0 || sin == 0 || sin->len <= 0) + return -1; + j = 0; + i = 0; + while(i < sin->len) { + if(sin->s[i] == '\\' && i + 1 < sin->len) { + switch(sin->s[i + 1]) { + case 'n': + sout->s[j++] = '\n'; + i++; + break; + case 'r': + sout->s[j++] = '\r'; + i++; + break; + default: + sout->s[j++] = sin->s[i]; + } + } else { + sout->s[j++] = sin->s[i]; + } + i++; + } + sout->len = j; + return 0; +} + /*! \brief Unscape all printable ASCII characters */ int unescape_user(str *sin, str *sout) { diff --git a/src/core/strutils.h b/src/core/strutils.h index b32e610512c..5781943dacb 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -56,6 +56,8 @@ int escape_common(char *dst, char *src, int src_len); /* remove backslashes to special characters */ int unescape_common(char *dst, char *src, int src_len); +int escape_crlf(str *sin, str *sout); +int unescape_crlf(str *sin, str *sout); int escape_user(str *sin, str *sout); int unescape_user(str *sin, str *sout); int escape_param(str *sin, str *sout);

1 0

git:master:ec7f3a21: sdops: typo fixed for $sdp(m0:rtcp:port)
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: ec7f3a2173c1de220afd5b4776d92c98bb901630 URL: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T17:02:14+02:00 sdops: typo fixed for $sdp(m0:rtcp:port) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… Patch: https://github.com/kamailio/kamailio/commit/ec7f3a2173c1de220afd5b4776d92c9… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 644ded5b064..b7ee2482616 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2265,7 +2265,7 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) case 12: if(strncmp(in->s, "sess_version", 12) == 0) sp->pvp.pvn.u.isname.name.n = 1; - else if(strncmp(in->s, "m0:rctp:port", 12) == 0) + else if(strncmp(in->s, "m0:rtcp:port", 12) == 0) sp->pvp.pvn.u.isname.name.n = 5; else goto error;

1 0

Kamailio v5.8.1 Released
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Hello, Kamailio SIP Server v5.8.1 stable release is out. This is a maintenance release of the latest stable branch, 5.8, that includes fixes since the release of v5.8.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.8.x. Deployments running previous v5.8.x versions are strongly recommended to be upgraded to v5.8.1. For more details about version 5.8.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2024/04/kamailio-v5-8-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

git:5.8:384843ce: ChangeLog: content updated for v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 384843ceb6705996c0c6da6359868bd6e370a0b7 URL: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:26:52+02:00 ChangeLog: content updated for v5.8.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd… Patch: https://github.com/kamailio/kamailio/commit/384843ceb6705996c0c6da6359868bd…

1 0

git:5.8:e8aa9871: Makefile.defs: version set to 5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: e8aa98718d91d0e5af7d757176a180e0f2940417 URL: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:23:42+02:00 Makefile.defs: version set to 5.8.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… Patch: https://github.com/kamailio/kamailio/commit/e8aa98718d91d0e5af7d757176a180e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f5e8b0da653..0f960b4478e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 8 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.8:69f667fe: core: msg translator - duplicate reply via xavp params and handle errors
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 69f667fe9b95d09a642cb7edd7f16ce09bbac3f1 URL: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:21:37+02:00 core: msg translator - duplicate reply via xavp params and handle errors (cherry picked from commit 5f83d4f9c447f5a7e3de8336dc0e076b10e43833) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… Patch: https://github.com/kamailio/kamailio/commit/69f667fe9b95d09a642cb7edd7f16ce… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index b54eded3f89..acd5911867a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2362,6 +2362,7 @@ char *generate_res_buf_from_sip_res( char *buf; unsigned int len; str xparams; + str sdup; sr_lump_t *anchor; buf = msg->buf; @@ -2393,11 +2394,18 @@ char *generate_res_buf_from_sip_res( anchor = anchor_lump(msg, msg->via2->params.s + msg->via2->params.len - msg->buf, 0, 0); - if(anchor != NULL) { - if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) - == 0) { - LM_ERR("unable to add via reply xavp params\n"); - } + if(anchor == NULL) { + LM_ERR("unable to get the anchor\n"); + goto error; + } + if(pkg_str_dup(&sdup, &xparams) < 0) { + PKG_MEM_ERROR; + goto error; + } + if(insert_new_lump_after(anchor, sdup.s, sdup.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + pkg_free(sdup.s); + goto error; } } }

1 0

git:5.8:1caec71a: core: xavp - added missing closing parenthesis in log messages
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 1caec71aeddb7f65afb93bf05cb9e0aae2a2c0cd URL: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:21:26+02:00 core: xavp - added missing closing parenthesis in log messages (cherry picked from commit 3b09fd343575c56d9658a61efebd4851662de338) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… Patch: https://github.com/kamailio/kamailio/commit/1caec71aeddb7f65afb93bf05cb9e0a… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 128ea631013..21a8197080b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1151,7 +1151,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long)avp->val.v.l, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long int value (%d/%d\n", + LM_ERR("failed to serialize long int value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1162,7 +1162,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long long)avp->val.v.ll, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long long value (%d/%d\n", + LM_ERR("failed to serialize long long value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1178,7 +1178,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, + LM_ERR("failed to serialize str value (%d/%d)\n", ostr.len, olen - rlen); return -1; }

1 0

git:master:5f83d4f9: core: msg translator - duplicate reply via xavp params and handle errors
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 5f83d4f9c447f5a7e3de8336dc0e076b10e43833 URL: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:18:47+02:00 core: msg translator - duplicate reply via xavp params and handle errors --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… Patch: https://github.com/kamailio/kamailio/commit/5f83d4f9c447f5a7e3de8336dc0e076… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index b54eded3f89..acd5911867a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2362,6 +2362,7 @@ char *generate_res_buf_from_sip_res( char *buf; unsigned int len; str xparams; + str sdup; sr_lump_t *anchor; buf = msg->buf; @@ -2393,11 +2394,18 @@ char *generate_res_buf_from_sip_res( anchor = anchor_lump(msg, msg->via2->params.s + msg->via2->params.len - msg->buf, 0, 0); - if(anchor != NULL) { - if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) - == 0) { - LM_ERR("unable to add via reply xavp params\n"); - } + if(anchor == NULL) { + LM_ERR("unable to get the anchor\n"); + goto error; + } + if(pkg_str_dup(&sdup, &xparams) < 0) { + PKG_MEM_ERROR; + goto error; + } + if(insert_new_lump_after(anchor, sdup.s, sdup.len, 0) == 0) { + LM_ERR("unable to add via reply xavp params\n"); + pkg_free(sdup.s); + goto error; } } }

1 0

git:master:3b09fd34: core: xavp - added missing closing parenthesis in log messages
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: master Commit: 3b09fd343575c56d9658a61efebd4851662de338 URL: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T12:16:18+02:00 core: xavp - added missing closing parenthesis in log messages --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… Patch: https://github.com/kamailio/kamailio/commit/3b09fd343575c56d9658a61efebd485… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 128ea631013..21a8197080b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1151,7 +1151,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long)avp->val.v.l, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long int value (%d/%d\n", + LM_ERR("failed to serialize long int value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1162,7 +1162,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) avp->name.len, avp->name.s, (unsigned long long)avp->val.v.ll, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize long long value (%d/%d\n", + LM_ERR("failed to serialize long long value (%d/%d)\n", ostr.len, olen - rlen); return -1; } @@ -1178,7 +1178,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) qs, avp->val.v.s.len, avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { - LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, + LM_ERR("failed to serialize str value (%d/%d)\n", ostr.len, olen - rlen); return -1; }

1 0

git:5.8:4708758f: pkg: deb specs updated for v5.8.1
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 4708758f1c428cc94d1abdf9bb706c7c509efebe URL: https://github.com/kamailio/kamailio/commit/4708758f1c428cc94d1abdf9bb706c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:22:44+02:00 pkg: deb specs updated for v5.8.1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/4708758f1c428cc94d1abdf9bb706c7… Patch: https://github.com/kamailio/kamailio/commit/4708758f1c428cc94d1abdf9bb706c7…

1 0

git:5.8:3b00630c: pkg/kamailio: version set 5.8.1 for rpms and alpine
by Daniel-Constantin Mierla 03 Apr '24

03 Apr '24

Module: kamailio Branch: 5.8 Commit: 3b00630c8a20cc0f2b2f458742d885ea7e28e05f URL: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-03T08:20:49+02:00 pkg/kamailio: version set 5.8.1 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… Patch: https://github.com/kamailio/kamailio/commit/3b00630c8a20cc0f2b2f458742d885e… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index eaa70ccd5ff..4b56df12b49 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.8.0 +pkgver=5.8.1 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d8811a2d1f9..ee339c02d99 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.0 +%define ver 5.8.1 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev