sr-dev

sr-dev@lists.kamailio.org

16 participants
45400 discussions

git:master:abc0ce47: core: print path in debug before releasing when load module option skips duplicates
by Daniel-Constantin Mierla 10 Apr '25

10 Apr '25

Module: kamailio Branch: master Commit: abc0ce47896f3cd3d5d1ca4def0a79978256d733 URL: https://github.com/kamailio/kamailio/commit/abc0ce47896f3cd3d5d1ca4def0a799… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-10T19:17:04+02:00 core: print path in debug before releasing when load module option skips duplicates --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:7a289357: pv: new transformation {uri.rmparam,name}
by Daniel-Constantin Mierla 10 Apr '25

10 Apr '25

Module: kamailio Branch: master Commit: 7a289357a38ac088ec17ccbcc56d7aff00964d4c URL: https://github.com/kamailio/kamailio/commit/7a289357a38ac088ec17ccbcc56d7af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-10T09:32:28+02:00 pv: new transformation {uri.rmparam,name} - remove the parameter from the uri --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://… [View More]github.com/kamailio/kamailio/commit/7a289357a38ac088ec17ccbcc56d7af… Patch: https://github.com/kamailio/kamailio/commit/7a289357a38ac088ec17ccbcc56d7af… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f3432b13eaa..870a644081b 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1764,6 +1764,30 @@ int tr_eval_uri( } val->rs = _tr_empty; break; + case TR_URI_RMPARAM: + if(tp == NULL) { + LM_ERR("param invalid parameters\n"); + return -1; + } + if(tp->type == TR_PARAM_STRING) { + sv = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v) != 0 + || (!(v.flags & PV_VAL_STR)) || v.rs.len <= 0) { + LM_ERR("param cannot get p1\n"); + return -1; + } + sv = v.rs; + } + tr_set_crt_buffer(); + val->rs.s = _tr_buffer; + val->rs.len = TR_BUFFER_SIZE; + val->flags = PV_VAL_STR; + val->ri = 0; + if(ksr_uri_remove_param(&_tr_uri, &sv, &val->rs) < 0) { + val->rs = _tr_empty; + } + break; case TR_URI_HEADERS: val->rs = (_tr_parsed_uri.headers.s) ? _tr_parsed_uri.headers : _tr_empty; @@ -3371,6 +3395,23 @@ char *tr_parse_uri(str *in, trans_t *t) goto error; } goto done; + } else if(name.len == 7 && strncasecmp(name.s, "rmparam", 7) == 0) { + t->subtype = TR_URI_RMPARAM; + if(*p != TR_PARAM_MARKER) { + LM_ERR("invalid param transformation: %.*s\n", in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + while(*p && (*p == ' ' || *p == '\t' || *p == '\n')) + p++; + if(*p != TR_RBRACKET) { + LM_ERR("invalid param transformation: %.*s!\n", in->len, in->s); + goto error; + } + goto done; } else if(name.len == 9 && strncasecmp(name.s, "transport", 9) == 0) { t->subtype = TR_URI_TRANSPORT; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 7db512f0949..ff7979b5163 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -128,7 +128,8 @@ enum _tr_uri_subtype TR_URI_TOSOCKET, TR_URI_SAOR, TR_URI_DURI, - TR_URI_SURI + TR_URI_SURI, + TR_URI_RMPARAM }; enum _tr_param_subtype { [View Less]

1 0

git:master:bfe69eda: core: helper function to remove param from uri
by Daniel-Constantin Mierla 10 Apr '25

10 Apr '25

Module: kamailio Branch: master Commit: bfe69eda32ee23ebd532f673f76d335ff51f13cd URL: https://github.com/kamailio/kamailio/commit/bfe69eda32ee23ebd532f673f76d335… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-10T08:56:37+02:00 core: helper function to remove param from uri --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]bfe69eda32ee23ebd532f673f76d335… Patch: https://github.com/kamailio/kamailio/commit/bfe69eda32ee23ebd532f673f76d335… --- diff --git a/src/core/dset.c b/src/core/dset.c index e30277eb7ea..d449f33e325 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -33,6 +33,7 @@ #include "config.h" #include "parser/parser_f.h" #include "parser/parse_uri.h" +#include "parser/parse_param.h" #include "parser/msg_parser.h" #include "globals.h" #include "ut.h" @@ -1317,6 +1318,85 @@ int ksr_uri_alias_decode(str *ualias, str *ouri) return -1; } +/** + * remove param from ouri, storing in nuri + * - nuri->len has to be set to the size of nuri->s buffer + */ +int ksr_uri_remove_param(str *ouri, str *pname, str *nuri) +{ + str t; + str pstart; + sip_uri_t puri; + param_hooks_t hooks; + param_t *params, *pit; + + if(nuri->len < ouri->len + 1) { + LM_ERR("output buffer too small (%d / %d)\n", nuri->len, ouri->len); + return -1; + } + if(parse_uri(ouri->s, ouri->len, &puri) < 0) { + LM_ERR("failed to parse uri [%.*s]\n", ouri->len, ouri->s); + return -1; + } + if(puri.sip_params.len > 0) { + t = puri.sip_params; + } else if(puri.params.len > 0) { + t = puri.params; + } else { + LM_DBG("no uri params [%.*s]\n", ouri->len, ouri->s); + memcpy(nuri->s, ouri->s, ouri->len); + nuri->len = ouri->len; + nuri->s[nuri->len] = 0; + return 0; + } + + if(parse_params(&t, CLASS_ANY, &hooks, &params) < 0) { + LM_ERR("ruri parameter parsing failed\n"); + return -1; + } + + for(pit = params; pit; pit = pit->next) { + if((pit->name.len == pname->len) + && (strncasecmp(pit->name.s, pname->s, pname->len) == 0)) { + break; + } + } + if(pit == NULL) { + LM_DBG("uri param [%.*s] not found\n", pname->len, pname->s); + free_params(params); + memcpy(nuri->s, ouri->s, ouri->len); + nuri->len = ouri->len; + nuri->s[nuri->len] = 0; + return 0; + } + + pstart.s = pit->name.s; + while(pstart.s > ouri->s && *pstart.s != ';') { + pstart.s--; + } + memcpy(nuri->s, ouri->s, pstart.s - ouri->s); + nuri->len = pstart.s - ouri->s; + + if(pit->body.len > 0) { + if(pit->body.s + pit->body.len < ouri->s + ouri->len) { + memcpy(nuri->s + nuri->len, pit->body.s + pit->body.len, + ouri->s + ouri->len - pit->body.s - pit->body.len); + nuri->len += ouri->s + ouri->len - pit->body.s - pit->body.len; + } + } else { + if(pit->name.s + pit->name.len < ouri->s + ouri->len) { + memcpy(nuri->s + nuri->len, pit->name.s + pit->name.len, + ouri->s + ouri->len - pit->name.s - pit->name.len); + nuri->len += ouri->s + ouri->len - pit->name.s - pit->name.len; + } + } + nuri->s[nuri->len] = 0; + + free_params(params); + + return 0; +} + /* address of record (aor) management */ /* address of record considered case sensitive diff --git a/src/core/dset.h b/src/core/dset.h index d735f49d9f4..a46639a1adb 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -291,6 +291,7 @@ int uri_restore_rcv_alias(str *uri, str *nuri, str *suri); int uri_trim_rcv_alias(str *uri, str *nuri); int ksr_uri_alias_encode(str *iuri, str *ualias); int ksr_uri_alias_decode(str *ualias, str *ouri); +int ksr_uri_remove_param(str *ouri, str *pname, str *nuri); int init_dst_set(void); [View Less]

1 0

git: new commits in branch 5.7
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

- URL: https://github.com/kamailio/kamailio/commit/ae3734307499c5ca48089dc060dba84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:02:04+02:00 stun: check message len for response (cherry picked from commit 87e1a4a7f5d565a59a362f22e9372697f2f2f2af) (cherry picked from commit e11c132cbf57ea1ae6289e734f601104ba83fc25) - URL: https://github.com/kamailio/kamailio/commit/6cd797906c82927037e5a89a638c315… Author: Daniel-Constantin Mierla <miconda(a)gmail.… [View More]

1 0

git:5.8:9e4f2cc0: tm: debug message instead of error log
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 9e4f2cc054d04de2aaeceadac5ab876bb94911ff URL: https://github.com/kamailio/kamailio/commit/9e4f2cc054d04de2aaeceadac5ab876… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:42:34+02:00 tm: debug message instead of error log (cherry picked from commit d5cbcfad6e4227b198c90a57ed9a9d7883e7d911) (cherry picked from commit 91cc4a6af20911e96ccc8d88edd1c43c636b3ee2) --… [View More]

1 0

git:5.8:9f92a974: tm: mode details in log message
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 9f92a97457b13d2a3ce27b86e59b2687371c8b26 URL: https://github.com/kamailio/kamailio/commit/9f92a97457b13d2a3ce27b86e59b268… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:42:27+02:00 tm: mode details in log message (cherry picked from commit 9788fe9d2241fb85e6d78578689d6694161bc5a1) (cherry picked from commit bc5e32c9ba1a4da6cd9dd85098f3576d2c0dc4bc) --- … [View More]

1 0

git:5.8:44cb112e: parser/sdp: check if value is exceeded when looking for o= version field
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 44cb112ea155eccf2788400b65f85e8b1c77f589 URL: https://github.com/kamailio/kamailio/commit/44cb112ea155eccf2788400b65f85e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:40:16+02:00 parser/sdp: check if value is exceeded when looking for o= version field (cherry picked from commit c532a67db654efb21f81e058b7e3a86229766a40) (cherry picked from commit … [View More]

1 0

git:5.8:7335ac5b: core: allow route(...) usage inside onsend_route block
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 5.8 Commit: 7335ac5b8d174a14a4481215cc787e7cb5cd4542 URL: https://github.com/kamailio/kamailio/commit/7335ac5b8d174a14a4481215cc787e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:39:39+02:00 core: allow route(...) usage inside onsend_route block - GH #4130 (cherry picked from commit 6343713bcc91a499c772fc6f548597693f220c35) (cherry picked from commit … [View More]

1 0

git:6.0:91cc4a6a: tm: debug message instead of error log
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: 91cc4a6af20911e96ccc8d88edd1c43c636b3ee2 URL: https://github.com/kamailio/kamailio/commit/91cc4a6af20911e96ccc8d88edd1c43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:32:37+02:00 tm: debug message instead of error log (cherry picked from commit d5cbcfad6e4227b198c90a57ed9a9d7883e7d911) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.… [View More]

1 0

git:6.0:bc5e32c9: tm: mode details in log message
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: bc5e32c9ba1a4da6cd9dd85098f3576d2c0dc4bc URL: https://github.com/kamailio/kamailio/commit/bc5e32c9ba1a4da6cd9dd85098f3576… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:32:05+02:00 tm: mode details in log message (cherry picked from commit 9788fe9d2241fb85e6d78578689d6694161bc5a1) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/… [View More]

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