sr-dev

sr-dev@lists.kamailio.org

45448 discussions

git:master:c9bdfe3a: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 09 Jul '25

09 Jul '25

Module: kamailio Branch: master Commit: c9bdfe3a986bf0bed0706e15a21bf75d9591c386 URL: https://github.com/kamailio/kamailio/commit/c9bdfe3a986bf0bed0706e15a21bf75… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-09T09:46:10+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/c9bdfe3a986bf0bed0706e15a21bf75… Patch: https://github.com/kamailio/kamailio/commit/c9bdfe3a986bf0bed0706e15a21bf75…

1 0

git:master:c1fa6423: tm: docs for rpc commands with hexa-encoded body
by Daniel-Constantin Mierla 09 Jul '25

09 Jul '25

Module: kamailio Branch: master Commit: c1fa64233a41835b866e553986f30d7a0153e0da URL: https://github.com/kamailio/kamailio/commit/c1fa64233a41835b866e553986f30d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-09T09:34:28+02:00 tm: docs for rpc commands with hexa-encoded body --- Modified: src/modules/tm/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/c1fa64233a41835b866e553986f30d7… Patch: https://github.com/kamailio/kamailio/commit/c1fa64233a41835b866e553986f30d7… --- diff --git a/src/modules/tm/doc/rpc.xml b/src/modules/tm/doc/rpc.xml index 358b9eec683..00164bc5793 100644 --- a/src/modules/tm/doc/rpc.xml +++ b/src/modules/tm/doc/rpc.xml @@ -60,6 +60,16 @@ </itemizedlist> </section> + <section id="tm.rpc.t_uac_start_hex"> + <title> + <function moreinfo="none">tm.t_uac_start_hex</function> + </title> + <para> + Similar to tm.t_uac_start, but with hexa-encoded body. The whitespaces + are ignored when decoding the body. + </para> + </section> + <section id="tm.rpc.t_uac_wait"> <title> <function moreinfo="none">tm.t_uac_wait</function> @@ -70,6 +80,16 @@ </para> </section> + <section id="tm.rpc.t_uac_wait_hex"> + <title> + <function moreinfo="none">tm.t_uac_wait_hex</function> + </title> + <para> + Similar to tm.t_uac_wait, but with hexa-encoded body. The whitespaces + are ignored when decoding the body. + </para> + </section> + <section id="tm.rpc.t_uac_wait_block"> <title> <function moreinfo="none">tm.t_uac_wait_block</function> @@ -82,6 +102,16 @@ </para> </section> + <section id="tm.rpc.t_uac_wait_block_hex"> + <title> + <function moreinfo="none">tm.t_uac_wait_block_hex</function> + </title> + <para> + Similar to tm.t_uac_wait_block, but with hexa-encoded body. The whitespaces + are ignored when decoding the body. + </para> + </section> + <section id="tm.rpc.t_uac_start_noack"> <title> <function moreinfo="none">tm.t_uac_start_noack</function> @@ -92,16 +122,17 @@ </para> </section> - <section id="tm.rpc.t_uac_wait_block_noack"> + <section id="tm.rpc.t_uac_start_noack_hex"> <title> - <function moreinfo="none">tm.t_uac_wait_block_noack</function> + <function moreinfo="none">tm.t_uac_start_noack_hex</function> </title> <para> - Similar to tm.t_uac_wait_block, but do not automatically send ACK for - local INVITE requests. + Similar to tm.t_uac_start_noack, but with hexa-encoded body. The whitespaces + are ignored when decoding the body. </para> </section> + <section id="tm.rpc.t_uac_wait_noack"> <title> <function moreinfo="none">tm.t_uac_wait_noack</function> @@ -112,6 +143,36 @@ </para> </section> + <section id="tm.rpc.t_uac_wait_noack_hex"> + <title> + <function moreinfo="none">tm.t_uac_wait_noack_hex</function> + </title> + <para> + Similar to tm.t_uac_wait_noack, but with hexa-encoded body. The whitespaces + are ignored when decoding the body. + </para> + </section> + + <section id="tm.rpc.t_uac_wait_block_noack"> + <title> + <function moreinfo="none">tm.t_uac_wait_block_noack</function> + </title> + <para> + Similar to tm.t_uac_wait_block, but do not automatically send ACK for + local INVITE requests. + </para> + </section> + + <section id="tm.rpc.t_uac_wait_block_noack_hex"> + <title> + <function moreinfo="none">tm.t_uac_wait_block_noack_hex</function> + </title> + <para> + Similar to tm.t_uac_wait_block_noack, but with hexa-encoded body. + The whitespaces are ignored when decoding the body. + </para> + </section> + <section id="tm.rpc.cancel"> <title> <function moreinfo="none">tm.cancel</function>

1 0

git:master:c7e04ab7: tm: rpc commands with hexa-encoded body
by Daniel-Constantin Mierla 09 Jul '25

09 Jul '25

Module: kamailio Branch: master Commit: c7e04ab790a4df9f42f0a2a4e8326d545e86abe6 URL: https://github.com/kamailio/kamailio/commit/c7e04ab790a4df9f42f0a2a4e8326d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-09T09:34:28+02:00 tm: rpc commands with hexa-encoded body --- Modified: src/modules/tm/rpc_uac.c Modified: src/modules/tm/rpc_uac.h Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/c7e04ab790a4df9f42f0a2a4e8326d5… Patch: https://github.com/kamailio/kamailio/commit/c7e04ab790a4df9f42f0a2a4e8326d5…

1 0

git:master:361ff272: textops: docs for set_reply_body_hex()
by Daniel-Constantin Mierla 09 Jul '25

09 Jul '25

Module: kamailio Branch: master Commit: 361ff2726320fde0579966ea0214898eb1155644 URL: https://github.com/kamailio/kamailio/commit/361ff2726320fde0579966ea0214898… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-09T09:34:28+02:00 textops: docs for set_reply_body_hex() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/361ff2726320fde0579966ea0214898… Patch: https://github.com/kamailio/kamailio/commit/361ff2726320fde0579966ea0214898… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index ce61cccb4d8..c201f134a41 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -947,6 +947,24 @@ set_reply_body("test", "text/plain"); </example> </section> + <section id="textops.f.set_reply_body_hex"> + <title> + <function moreinfo="none">set_reply_body_hex(txt, content_type)</function> + </title> + <para> + Same as set_reply_body(), but with the body provided as hexa-encoded + value. The whitespaces are ignored when decoding the body parameter. + </para> + <example> + <title><function>set_reply_body_hex</function> usage</title> + <programlisting format="linespecific"> +... +set_reply_body_hex("4b 82 00 a2", "binary/data"); +... +</programlisting> + </example> + </section> + <section id="textops.f.filter_body"> <title> <function moreinfo="none">filter_body(content_type)</function>

1 0

git:master:926881e1: textops: added set_rpl_body_hex(...)
by Daniel-Constantin Mierla 09 Jul '25

09 Jul '25

Module: kamailio Branch: master Commit: 926881e1d75293395e8b5e5201f64308919ad13f URL: https://github.com/kamailio/kamailio/commit/926881e1d75293395e8b5e5201f6430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-09T09:34:28+02:00 textops: added set_rpl_body_hex(...) - sent body of the generated reply with a hexa-encoded value --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/926881e1d75293395e8b5e5201f6430… Patch: https://github.com/kamailio/kamailio/commit/926881e1d75293395e8b5e5201f6430… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 87de7877c24..8d685f804ac 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -117,6 +117,7 @@ static int append_time_request_f(struct sip_msg *msg, char *, char *); static int set_body_f(struct sip_msg *msg, char *, char *); static int set_body_hex_f(struct sip_msg *msg, char *, char *); static int set_rpl_body_f(struct sip_msg *msg, char *, char *); +static int set_rpl_body_hex_f(struct sip_msg *msg, char *, char *); static int set_multibody_0(struct sip_msg *msg, char *, char *, char *); static int set_multibody_1(struct sip_msg *msg, char *, char *, char *); static int set_multibody_2(struct sip_msg *msg, char *, char *, char *); @@ -270,6 +271,8 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"set_reply_body", (cmd_function)set_rpl_body_f, 2, fixup_spve_spve, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"set_reply_body_hex", (cmd_function)set_rpl_body_hex_f, 2, fixup_spve_spve, + 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, {"is_method", (cmd_function)is_method_f, 1, fixup_method, 0, ANY_ROUTE}, {"has_body", (cmd_function)has_body_f, 0, 0, 0, ANY_ROUTE}, {"has_body", (cmd_function)has_body_f, 1, fixup_body_type, 0, @@ -2739,6 +2742,44 @@ static int set_rpl_body_f(struct sip_msg *msg, char *p1, char *p2) return ki_set_rpl_body(msg, &nb, &nc); } +static int ki_set_rpl_body_hex(sip_msg_t *msg, str *htxt, str *ct) +{ + str sraw = STR_NULL; + + if(htxt == NULL || htxt->s == NULL || htxt->len == 0) { + LM_ERR("invalid body parameter\n"); + return -1; + } + if(ksr_hex_decode_ws(htxt, &sraw) < 0) { + return -1; + } + + return ki_set_rpl_body(msg, &sraw, ct); +} + +static int set_rpl_body_hex_f(struct sip_msg *msg, char *p1, char *p2) +{ + str nb = {0, 0}; + str nc = {0, 0}; + + if(p1 == 0 || p2 == 0) { + LM_ERR("invalid parameters\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)p1, &nb) != 0) { + LM_ERR("unable to get p1\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)p2, &nc) != 0) { + LM_ERR("unable to get p2\n"); + return -1; + } + + return ki_set_rpl_body_hex(msg, &nb, &nc); +} + static str *generate_boundary(str *txt, str *content_type, str *content_disposition, str *delimiter, unsigned int initial) { @@ -5476,6 +5517,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("set_reply_body_hex"), + SR_KEMIP_INT, ki_set_rpl_body_hex, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("has_body"), SR_KEMIP_INT, ki_has_body, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] Revert "rtpengine: fix method name rtpengine_subscribe_offer" (PR #4311)
by tsearle 09 Jul '25

09 Jul '25

Reverts kamailio/kamailio#4309 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4311 -- Commit Summary -- * Revert "rtpengine: fix method name rtpengine_subscribe_offer" -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4311.patch https://github.com/kamailio/kamailio/pull/4311.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4311 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4311(a)github.com>

1 1

[kamailio/kamailio] uac: Fix restore for replies on upstream in-dialog requests (PR #4303)
by Bastian Triller 08 Jul '25

08 Jul '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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:  - [x] PR should be backported to stable branches - [x] Tested changes locally #### Description  Add in-dialog request's direction to TM callback parameter, so correct URIs are restored for replies on upstream in-dialog requests. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4303 -- Commit Summary -- * uac: Fix restore for replies on upstream in-dialog requests -- File Changes -- M src/modules/uac/replace.c (82) M src/modules/uac/uac.c (3) M src/modules/uac/uac_reg.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4303.patch https://github.com/kamailio/kamailio/pull/4303.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4303 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4303(a)github.com>

2 5

git:master:0d4ffb74: uac: Fix From/To header restore with dialog store
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: 0d4ffb74a949ae6e390d334b30ec51cedb001226 URL: https://github.com/kamailio/kamailio/commit/0d4ffb74a949ae6e390d334b30ec51c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T17:13:58+02:00 uac: Fix From/To header restore with dialog store When replacing From/To header and using dialog module to store original URIs (modparam restore_dlg=1), restoring of headers does not work for replies to in-dialog requests sent upstream. Add in-dialog request's direction to TM callback parameter, so correct URIs are restored for replies to upstream in-dialog requests. --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/0d4ffb74a949ae6e390d334b30ec51c… Patch: https://github.com/kamailio/kamailio/commit/0d4ffb74a949ae6e390d334b30ec51c… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index f13a661ca95..b7a2b8b38dd 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -810,15 +810,22 @@ void restore_uris_reply(struct cell *t, int type, struct tmcb_params *p) struct sip_msg *req; struct sip_msg *rpl; int_str avp_value; + unsigned int direction = 0; if(!t || !t->uas.request || !p->rpl) return; + if(*p->param) { + direction = (unsigned int)(unsigned long)*p->param; + } + req = t->uas.request; rpl = p->rpl; - if(req->msg_flags & FL_USE_UAC_FROM) { - + if(((req->msg_flags & FL_USE_UAC_FROM) + && (!direction || direction == DLG_DIR_DOWNSTREAM)) + || ((req->msg_flags & FL_USE_UAC_TO) + && direction == DLG_DIR_UPSTREAM)) { /* parse FROM in reply */ if(parse_from_header(rpl) < 0) { LM_ERR("failed to find/parse FROM hdr\n"); @@ -835,8 +842,11 @@ void restore_uris_reply(struct cell *t, int type, struct tmcb_params *p) LM_ERR("failed to restore FROM\n"); } } - if(req->msg_flags & FL_USE_UAC_TO) { + if(((req->msg_flags & FL_USE_UAC_TO) + && (!direction || direction == DLG_DIR_DOWNSTREAM)) + || ((req->msg_flags & FL_USE_UAC_FROM) + && direction == DLG_DIR_UPSTREAM)) { /* parse TO in reply */ if(rpl->to == 0 && (parse_headers(rpl, HDR_TO_F, 0) != 0 || rpl->to == 0)) { @@ -997,8 +1007,9 @@ static void replace_callback( /* register tm callback to change replies, * but only if not registered earlier */ if(!(msg->msg_flags & (FL_USE_UAC_FROM | FL_USE_UAC_TO)) - && uac_tmb.register_tmcb( - msg, 0, TMCB_RESPONSE_IN, restore_uris_reply, 0, 0) + && uac_tmb.register_tmcb(msg, 0, TMCB_RESPONSE_IN, + restore_uris_reply, + (void *)(unsigned long)_params->direction, 0) != 1) { LM_ERR("failed to install TM callback\n"); return;

1 0

git:master:2048aac0: textops: use core function to decode hex string with whitespaces
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: 2048aac0a55f562436ce8fea53d748c2dd1bca42 URL: https://github.com/kamailio/kamailio/commit/2048aac0a55f562436ce8fea53d748c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T17:04:38+02:00 textops: use core function to decode hex string with whitespaces --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/2048aac0a55f562436ce8fea53d748c… Patch: https://github.com/kamailio/kamailio/commit/2048aac0a55f562436ce8fea53d748c…

1 0

git:master:5c83f2ea: core: ut - convenience function to decode hexa with whitespaces
by Daniel-Constantin Mierla 08 Jul '25

08 Jul '25

Module: kamailio Branch: master Commit: 5c83f2ea04cfc02dc53532b53888a33be295a997 URL: https://github.com/kamailio/kamailio/commit/5c83f2ea04cfc02dc53532b53888a33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-08T17:04:38+02:00 core: ut - convenience function to decode hexa with whitespaces --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/5c83f2ea04cfc02dc53532b53888a33… Patch: https://github.com/kamailio/kamailio/commit/5c83f2ea04cfc02dc53532b53888a33… --- diff --git a/src/core/ut.c b/src/core/ut.c index cac9fcaf00b..317a0384a12 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -498,3 +498,79 @@ void *ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2) return NULL; } + +/** + * decode hexa value in shex, storing in sraw + * - on success sraw->s is pkg-allocated and has to be pkg-freed + * - return 0 on success, -1 on failure + */ +int ksr_hex_decode_ws(str *shex, str *sraw) +{ + int i; + char v; + + if(shex == NULL || shex->s == NULL || shex->len == 0) { + LM_ERR("invalid body parameter\n"); + return -1; + } + + sraw->len = shex->len / 2 + 2; + sraw->s = pkg_malloc(sraw->len * sizeof(char)); + if(sraw->s == NULL) { + LM_ERR("no more pkg memory\n"); + sraw->len = 0; + return -1; + } + memset(sraw->s, 0, sraw->len * sizeof(char)); + + sraw->len = 0; + for(i = 0; i < shex->len; i++) { + if(shex->s[i] == ' ' || shex->s[i] == '\t') { + continue; + } + if(i + 1 == shex->len) { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", shex->len, + shex->s, shex->len, i); + goto error; + } + v = 0; + if(shex->s[i] >= '0' && shex->s[i] <= '9') { + v = (shex->s[i] - '0') << 4; + } else if(shex->s[i] >= 'A' && shex->s[i] <= 'F') { + v = (shex->s[i] - 'A' + 10) << 4; + } else if(shex->s[i] >= 'a' && shex->s[i] <= 'f') { + v = (shex->s[i] - 'a' + 10) << 4; + } else { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", shex->len, + shex->s, shex->len, i); + goto error; + } + i++; + if(shex->s[i] >= '0' && shex->s[i] <= '9') { + v += (shex->s[i] - '0'); + } else if(shex->s[i] >= 'A' && shex->s[i] <= 'F') { + v += (shex->s[i] - 'A' + 10); + } else if(shex->s[i] >= 'a' && shex->s[i] <= 'f') { + v += (shex->s[i] - 'a' + 10); + } else { + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", shex->len, + shex->s, shex->len, i); + goto error; + } + sraw->s[sraw->len++] = v; + } + if(sraw->len == 0) { + /* only white spaces */ + LM_ERR("invalid input hex data [%.*s] (%d/%d)\n", shex->len, shex->s, + shex->len, i); + goto error; + } + + return 0; + +error: + pkg_free(sraw->s); + sraw->s = NULL; + sraw->len = 0; + return -1; +} diff --git a/src/core/ut.h b/src/core/ut.h index 3a3d66202b6..a0b01e23dfb 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1294,4 +1294,6 @@ void *ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2); */ void *ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2); +int ksr_hex_decode_ws(str *shex, str *sraw); + #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev