sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
252 discussions

git:master:9b3b8ec9: corex: docs for dns_file parameter

by Daniel-Constantin Mierla

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> -

7 months, 3 weeks

git:master:c8cf642c: corex: added dns_file modparam

by Daniel-Constantin Mierla

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;

7 months, 3 weeks

git:master:92d3573b: ims_ipsec_pcscf: log error message made info

by Daniel-Constantin Mierla

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

7 months, 3 weeks

git:master:5b689721: modules: readme files regenerated - xhttp_prom ... [skip ci]

by Kamailio Dev

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…

7 months, 3 weeks

git:master:bae35e49: xhttp_prom: update documentation for uptime statistic

by Ovidiu Sas

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>

7 months, 3 weeks

git:master:6af0ae46: xhttp_prom: new uptime statistic

by Ovidiu Sas

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. */

7 months, 3 weeks

git:master:d1118064: siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri

by Daniel-Constantin Mierla

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;

7 months, 3 weeks

git:master:8523eb21: modules: readme files regenerated - textopsx ... [skip ci]

by Kamailio Dev

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…

7 months, 3 weeks

git:master:3208dd82: textopsx: docs for msg_changed_route(...)

by Daniel-Constantin Mierla

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>

7 months, 3 weeks

git:master:ac22a5c1: textopsx: added msg_changed_route(rname)

by Daniel-Constantin Mierla

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); +} + /** * */

7 months, 3 weeks

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024