sr-dev April 2025

sr-dev@lists.kamailio.org

14 participants
194 discussions

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/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);

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.com> Date: 2025-04-09T10:03:38+02:00 core: init res inside select_cfg_var() (cherry picked from commit a471d34d6162387a1427f5d0c5b3c6079a2b0bdc) (cherry picked from commit 92a3cc4549073d70b1b229149b29017e3a9cf06f) - URL: https://github.com/kamailio/kamailio/commit/8eee8bcf1ba579d012a0f583525ec32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:05:41+02:00 core: set digit 0 in the md5 buffer in case of error inside char_msg_val() (cherry picked from commit 15b2a5467f11e009ae4efad1ee29af860326095f) (cherry picked from commit d69e65fa4e9448701729ac8f41b069dad294a51e) - URL: https://github.com/kamailio/kamailio/commit/6e1940120cee766a7d90ae0b581e9d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:07:59+02:00 tls: remove uselss pv format parsing in pv_parse_alt_name() (cherry picked from commit 7c06997a1b6e77ae0642d369f532219dc35ef8e0) (cherry picked from commit 4732a4a88df9f4cbd2260564b94269157b3c0647) - URL: https://github.com/kamailio/kamailio/commit/f32863addeb3a927b80db65c56a258b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:08:06+02:00 tls: check lenght when parsing pv alt name (cherry picked from commit 79a668b8bdb0e085adb3581d718e5fd5ae73e2e4) (cherry picked from commit dd4d5e44a60a658772e8288d94193596f7a982a7) - URL: https://github.com/kamailio/kamailio/commit/d7766ffceb98fbc0ceaf58d2f271cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:08:51+02:00 utils: jump to error on pkg allocation failure (cherry picked from commit 34749ab13b31504358761c964f794b283931394c) (cherry picked from commit e016d1ada08edca0adacd42ffa67ffd3c8c2c384) - URL: https://github.com/kamailio/kamailio/commit/61e3e21f42d4b18c69ad9b1c2378dab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:09:18+02:00 erlang: init xavps for safety destroy on error (cherry picked from commit 29510872607deb3238411b358c422d004fb307b7) (cherry picked from commit f57accd1820b26b40f14d420465402188cb13df1) - URL: https://github.com/kamailio/kamailio/commit/1d561bc70e30cae3ba94aacd51c33e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:09:28+02:00 jsonrpcc: free allocated pkg buffer on error (cherry picked from commit 796bcc038d7885e01dbad34abc68bf612062c533) (cherry picked from commit c447bf60d528d8fdc1f5aee52a796ed5f77b2f5a) - URL: https://github.com/kamailio/kamailio/commit/a71d34d64b6539592b8d7532abc3714… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:09:37+02:00 jsonrpcc: declare variables are the beginning of function (cherry picked from commit 7ba313f6f96ffa6042c163027c0c7bb65106fef7) (cherry picked from commit 5baf49a179194ba0eaa5e7f4caba613c72859b0c) - URL: https://github.com/kamailio/kamailio/commit/f75b968d428f23241bde329622f1e2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:09:52+02:00 core: cfg select - check res before initializing (cherry picked from commit a6c415713bb209b03ff110d4ae891173d04ac471) (cherry picked from commit 61eb4fe44e66a952ba14e39e1c664878ef52919d) - URL: https://github.com/kamailio/kamailio/commit/17fe6cc64140e2d302e678a34534804… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:10:30+02:00 janssonrpcc: free new servers list on error (cherry picked from commit b4efe7725728392d0c8921c006d6fbc6455e9b8f) (cherry picked from commit f8201e6d4848081a2dd564e0d5b216fca47ef3f0) - URL: https://github.com/kamailio/kamailio/commit/06a86869b9157783bdd185aa3b43e35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:10:52+02:00 core: cfg select - check res when getting the variable (cherry picked from commit 3333611a3ef9078cbcb9867db88921f0c48fce1b) (cherry picked from commit dfc2531cf7db70e315613b3242d1b5b41ac20857) - URL: https://github.com/kamailio/kamailio/commit/9a8f9f13c4b98c14bc260680dae15e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:12:13+02:00 db_berkeley: buffer size set to the argument of strftime() (cherry picked from commit e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b) (cherry picked from commit 1eb7db2f18724b91d18c6b30b529b51117d176b0) - URL: https://github.com/kamailio/kamailio/commit/bfc6a9c0e5cad418ca892d33709636b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:12:49+02:00 core: tcp - use long long constants for operations (cherry picked from commit fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52) (cherry picked from commit bc8ea1022718c94fbdf9bb93c35759e1a6ce3cde) - URL: https://github.com/kamailio/kamailio/commit/dc009570a7d79de99ce0156c8a163c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:15:52+02:00 corex: small formatting of iflag list (cherry picked from commit 70606e3ea575228b3ccc662d6f9048aa0eb899ce) (cherry picked from commit e14522cab01eba9c5fa636a7c0f6ed40200c6871) - URL: https://github.com/kamailio/kamailio/commit/5a5fbdf6d5bb8ea3cc15063bdf66cd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:16:05+02:00 corex: proper check for iflag lookup return code (cherry picked from commit fdb0ef987ca2b013104b06ece006f67bf8ae07d3) (cherry picked from commit d102f40856512d2c51707bf5ec5a6c949c550890) - URL: https://github.com/kamailio/kamailio/commit/0f56bad610ee3397ce82fcc10626651… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:16:13+02:00 corex: switch to unsigned long long for iflag lookup (cherry picked from commit 072c44330297c653675b5078fb0facdc399a5ab4) (cherry picked from commit a024fb3c028b8df18a9b855fff99bcddc3a61ef2) - URL: https://github.com/kamailio/kamailio/commit/e65cf6e5393c5dd430a7e5e421f566c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:18:15+02:00 auth_xkey: use memcpy() instead of strncpy() (cherry picked from commit 29686758e1ce51abb8d8dd5bebb0d7fa1a019dc6) (cherry picked from commit 6c88ef7c6abc45f72571aaa713f1d0dfb2d626e6) - URL: https://github.com/kamailio/kamailio/commit/aceb2a89ed79c4bc28b21d70eedfe85… Author: Thomas <1258170+ThomasSevestre(a)users.noreply.github.com> Date: 2025-04-09T10:19:32+02:00 topos_redis : show redis error for post mortem analysis (cherry picked from commit 72889e945041b6475a43c371aa4e20e99f5d1240) (cherry picked from commit 8331cb1f87b31f66f87a90e7fbaa2553ea3f2728) - URL: https://github.com/kamailio/kamailio/commit/8b830220984d2604c1a89ce3ae7bfa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:22:12+02:00 core: parser sdp - check for length of sendrecv attribute (cherry picked from commit fc4817064f81ef9a82b1b1468b1b8a4ae352c1f2) (cherry picked from commit 0ba1666fec15ed292e7fe1764bfa985ef282d84e) - URL: https://github.com/kamailio/kamailio/commit/1413ce8512d8a0c00c39243fe1d9d9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:22:20+02:00 core: parse sdp - check for body limit on mixed content (cherry picked from commit d4bbde619bbf808edebb31e131b3783ba2a4b34d) (cherry picked from commit eb058dba967bb772c8413356163ec6c13533ab6b) - URL: https://github.com/kamailio/kamailio/commit/778ee6deab8376a61e5ec6aff205367… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:22:31+02:00 core: parser sdp - check field length when extracting the value (cherry picked from commit e802f9187383feb7fdd96c4ded44fda403da4535) (cherry picked from commit e650ace5948c76ea2d8eb7eaeebb5c349970447d) - URL: https://github.com/kamailio/kamailio/commit/bec9f1cc738f35d7a74556bf5a89188… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:22:52+02:00 core: parser sdp - check if body is enough for rtpmap (cherry picked from commit c7f89e81504c425a83f3423bc4b4d9d1a8a48909) (cherry picked from commit a688b24ac777cb93306a1a777e687de625d6e4d0) - URL: https://github.com/kamailio/kamailio/commit/3a5db8000dcea0a16c491ee54eb3532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:23:29+02:00 core: parser sdp - check length for rtpmap extract (cherry picked from commit c823f41350ab9186a323707e9be32e31922bec17) (cherry picked from commit 0408c2cb412f0df0a17b70aa4d15026a9ef3a9a7) - URL: https://github.com/kamailio/kamailio/commit/ad292d121d0fe41a712385b5f28c83e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:24:07+02:00 core: parser sdp - check len gor extracting fmtp (cherry picked from commit d10257fbfdbb3e3e73c0fe60a224585822bdd7b3) (cherry picked from commit 18dad74a091e693a0bf939dddf144348409e6402) - URL: https://github.com/kamailio/kamailio/commit/1cddf420cbd557a1c756105eb2bf933… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:24:34+02:00 core: parser sdp - check body end for extract_ice_option() (cherry picked from commit 79d7fae0f26f577356f017cfff5e00c348cf259c) (cherry picked from commit 351157cad257986a014dc659231ae0ee48a8d538) - URL: https://github.com/kamailio/kamailio/commit/601e86bcd5f95138a9ad03de2db7faa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:29:08+02:00 corez: set sndinfo attributes for corex_sip_reply_out() (cherry picked from commit b003a7184a02da5fd6dfe27def8d928d363e36ce) (cherry picked from commit b512a9e809a658dc9ac731a359afce8fa8acd049) - URL: https://github.com/kamailio/kamailio/commit/641541066953e8b52a4e433c01c8d62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:30:52+02:00 xlog: use crit level with prefix for kemi xcrit() and xlog() - GH #4048 (cherry picked from commit a493e2e0006f89d2f8b5e903134407109ef587da) (cherry picked from commit 98f20996606a200f025dd78f96fbb50cd426f756) - URL: https://github.com/kamailio/kamailio/commit/458abc7692f2f700735af6c37856da9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:31:02+02:00 xlog: evaluate prefix for kemi functions (cherry picked from commit 76e18d0d13a41e93094f9084ac44e0809f91b109) (cherry picked from commit 68e3447e04c06059d47e1f001ae0b34e7f88b2f5) - URL: https://github.com/kamailio/kamailio/commit/b01dcd5b4d48b36aa2c3fe4e46a43df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:33:21+02:00 sanity: log as debug when Content-Length is missing for datagram protocols - the header is optional for datagram protocols (RFC3261, 20.14) (cherry picked from commit e38c7f8bac1aef9890d266fa466cea1561346732) (cherry picked from commit 50e69e9a269e5d5dba0251f893abc34907a12970) - URL: https://github.com/kamailio/kamailio/commit/b85e5fb31813cbbcae350262e52394b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:34:35+02:00 core: parser/sdp - check if still before end of the value (cherry picked from commit b96bc11a54f11ec688429c057bf5a90c40c147b3) (cherry picked from commit 76ffc6d3d4053bc43b81c3363e837c10360b0089) - URL: https://github.com/kamailio/kamailio/commit/63fd213aab064df3ec669047ee3b0ab… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-04-09T10:36:54+02:00 janssonrpcc: fixed warning var may be used uninitialized (cherry picked from commit 3039c02404e05da05a031f6ccf68913a8c1c80eb) (cherry picked from commit ddd98b09c80dc0d15af080e37961b59ecde17689) (cherry picked from commit f4aed91f5ab78cddbe782e94306c3cf4c49b09c6) - URL: https://github.com/kamailio/kamailio/commit/aa81e83c5fa7b916148c274be9cb0c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:37:09+02:00 msrp: variable for extra headers used in local replies (cherry picked from commit 7a73e08b0e5b4c3fbeb4f097c1f891d06c74651d) (cherry picked from commit c29d9d661b3954906cdee7e98a4f9b6502673490) (cherry picked from commit 724a58813d50dcfe965e69914fbdc93291811a85) - URL: https://github.com/kamailio/kamailio/commit/e5c2f3ff4eded8f6d9537fdc6e2ccff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:37:25+02:00 msrp: send failure response after referening the buffer (cherry picked from commit 5f8adb625b6bae81ef44613d774106bf3a943bb0) (cherry picked from commit 4ff58bb3e02b76e2489144867c8b0dc5041dc621) (cherry picked from commit 0f8b36091a64de012377bd2460e299529886a45c) - URL: https://github.com/kamailio/kamailio/commit/3c3c7107980fa23c892e5fe85b524d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:38:24+02:00 core: pass fd - check for unexpected read size overflow (cherry picked from commit 6c12477f1dad2279431d703d1a4f63fcfc6543b8) (cherry picked from commit ac0a4a5052e9aaf6531130675c8140fdd5c11e97) (cherry picked from commit 42260f34079ddad7662742a64696d2550ee1cce9) - URL: https://github.com/kamailio/kamailio/commit/7876e1ec4785d0199f817cf3cc59c8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:38:36+02:00 core: check for unexpected long value return by pathconf() (cherry picked from commit 2ba6d4ff2727031e7bca5d3d1da016bfe508b8df) (cherry picked from commit 718692c6d402b6942e0b1e8ebd8e64b306813495) (cherry picked from commit f123ebae553624525ca04d34ddd4c9453eac855a) - URL: https://github.com/kamailio/kamailio/commit/dffd625bf7953d7314287fe67b17c8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:38:45+02:00 ctl: free rpc struct in case of error (cherry picked from commit 4a71d3c9e6a4f92ef33ce8e62372b2c4dba62a56) (cherry picked from commit 5024235f876df4b3239ef746de700ade362cc7b2) (cherry picked from commit 5e836af2ff198481bde0485a315bbfdf39043f9d) - URL: https://github.com/kamailio/kamailio/commit/c51cc44b7380847d7d1bc04bb6a0d1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:38:57+02:00 xmlrpc: clean allocated buffer (cherry picked from commit ff712539566c903312ebba2f8e2585f9c80ffdcf) (cherry picked from commit e1398e53e9825db6c20590e1576d960ac0c3c429) (cherry picked from commit 1f6dc4df8572c07280478858087182f273c25fe3) - URL: https://github.com/kamailio/kamailio/commit/6b4fb8ddea8d4674a9e74c261cf5c16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:39:13+02:00 ctl: fifo - clean intermediary buffer (cherry picked from commit 4c4d7f7967a99d4dd4acdc5e198bce493bf15d67) (cherry picked from commit c68522f5c3c59cb915feb873bd3351e57a8db579) (cherry picked from commit 90122e3a46169e9f10dc7d8e01638d5f89cfaae5) - URL: https://github.com/kamailio/kamailio/commit/c827311923457119d15b2a375e2e454… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:39:35+02:00 pv: free next field on error when parsing xav* names (cherry picked from commit b875e7368dcc8e221007caafa3599c3e354404f7) (cherry picked from commit 8b7637140c5362bf90046ccb3b34ea74ef658c0a) (cherry picked from commit ce55c093d490fd19f10c50e11d12e188b64c1686) - URL: https://github.com/kamailio/kamailio/commit/84035480eaf6d8624faa0859f2ec8bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:39:50+02:00 xmlrpc: removed unnecessary code (cherry picked from commit e65b03cdd946d735a3ef33ae3582bcfad464d2c7) (cherry picked from commit 6d06293f3fe1c5897a3e01272fdc9ac409925f3d) (cherry picked from commit eaa0d1af8a46fe9a74d0eb1bbb2fbf2089f4e3fb) - URL: https://github.com/kamailio/kamailio/commit/efec4195cb2905434a7674c7886a52b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:40:03+02:00 ctl: refactored error handling and removed unnecessary code (cherry picked from commit edbb5b11e9453be3519e6e9a945937307c95709e) (cherry picked from commit 691eb2600c1fcf24d0d1f9b2648e7257499537a8) (cherry picked from commit 83a4165fc62710027ddf006058c66f082d01b51f) - URL: https://github.com/kamailio/kamailio/commit/0fc84abd5710ff982d4867ea36560f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:40:33+02:00 http_client: free dumplicated name in case of errors (cherry picked from commit 39ba53a2499dd1f0e080bb011d7438a60ea5faec) (cherry picked from commit 7274e353d7c05f5387c64aaf90197c9a8e8d1dd4) (cherry picked from commit 99852d486bd4180c4f571864bfccda526f3e259d) - URL: https://github.com/kamailio/kamailio/commit/42d33d7526fc64c34dce0d51a72f474… Author: Alessio Garzi <agarzi(a)sipwise.com> Date: 2025-04-09T10:41:56+02:00 fix typo on sanity checks module (cherry picked from commit 3b48fff143b49f16b328475a7b26017209e98666) (cherry picked from commit ecb00946bf684b4c8405d71fe9306d35aba21359) (cherry picked from commit 52772bf03ad07758e92eea4a71d22f5df8e976f4) - URL: https://github.com/kamailio/kamailio/commit/ee8c50f6033eeb1c3035ac3e1aa72e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:42:16+02:00 core: allow route(...) usage inside onsend_route block - GH #4130 (cherry picked from commit 6343713bcc91a499c772fc6f548597693f220c35) (cherry picked from commit 0b48c889623a19ed223c252ada049cabebee45f2) (cherry picked from commit 7335ac5b8d174a14a4481215cc787e7cb5cd4542) - URL: https://github.com/kamailio/kamailio/commit/1796009f5ebf77c32014a669a21c1d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T10:42:26+02:00 parser/sdp: check if value is exceeded when looking for o= version field (cherry picked from commit c532a67db654efb21f81e058b7e3a86229766a40) (cherry picked from commit d3d62bde97a86faa7dd1189bf10b697f28d84a63) (cherry picked from commit 44cb112ea155eccf2788400b65f85e8b1c77f589)

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) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/9e4f2cc054d04de2aaeceadac5ab876… Patch: https://github.com/kamailio/kamailio/commit/9e4f2cc054d04de2aaeceadac5ab876… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 371988c4412..9253ef32391 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -548,9 +548,15 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" - " buf: %.*s ...]\n", - code, trans->flags, (len > 128) ? 128 : len, buf); + if(unlikely(is_local(trans))) { + LM_DBG("local transaction reply [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } else { + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

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) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/9f92a97457b13d2a3ce27b86e59b268… Patch: https://github.com/kamailio/kamailio/commit/9f92a97457b13d2a3ce27b86e59b268… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index a6c7579cdbf..371988c4412 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -548,7 +548,9 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to\n"); + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 128) ? 128 : len, buf); } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

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 d3d62bde97a86faa7dd1189bf10b697f28d84a63) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/44cb112ea155eccf2788400b65f85e8… Patch: https://github.com/kamailio/kamailio/commit/44cb112ea155eccf2788400b65f85e8… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 26a975a96eb..a22e64cb1e6 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -735,7 +735,12 @@ int extract_sess_version(str *oline, str *sess_version) } i++; - } while(len < oline->len && i < 3); + } while((cp < oline->s + oline->len) && i < 3); + + if(cp >= oline->s + oline->len) { + LM_ERR("broken o= line - version field not found\n"); + return -1; + } len = cp - cp0 - 1; LM_DBG("end %d: >%.*s<\n", len, len, cp0);

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 0b48c889623a19ed223c252ada049cabebee45f2) --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/7335ac5b8d174a14a4481215cc787e7… Patch: https://github.com/kamailio/kamailio/commit/7335ac5b8d174a14a4481215cc787e7… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 21a6bcf83c2..d7274e944d4 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2856,6 +2856,7 @@ fcmd: case MODULE5_T: case MODULE6_T: case MODULEX_T: + case ROUTE_T: case SET_FWD_NO_CONNECT_T: case SET_RPL_NO_CONNECT_T: case SET_FWD_CLOSE_T:

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.com/kamailio/kamailio/commit/91cc4a6af20911e96ccc8d88edd1c43… Patch: https://github.com/kamailio/kamailio/commit/91cc4a6af20911e96ccc8d88edd1c43… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index c9b3ebab40a..fba235fcbfd 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -550,9 +550,15 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" - " buf: %.*s ...]\n", - code, trans->flags, (len > 128) ? 128 : len, buf); + if(unlikely(is_local(trans))) { + LM_DBG("local transaction reply [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } else { + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 256) ? 256 : len, buf); + } } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

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/kamailio/kamailio/commit/bc5e32c9ba1a4da6cd9dd85098f3576… Patch: https://github.com/kamailio/kamailio/commit/bc5e32c9ba1a4da6cd9dd85098f3576… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index aa899f9acc0..c9b3ebab40a 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -550,7 +550,9 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * the chances for this increase a lot. */ if(unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to\n"); + LM_ERR("no resolved dst to send reply to [code: %u, t-flags: %x" + " buf: %.*s ...]\n", + code, trans->flags, (len > 128) ? 128 : len, buf); } else { if(likely(SEND_PR_BUFFER(rb, buf, len) >= 0)) { if(unlikely(code >= 200 && !is_local(trans)

1 0

git:6.0:d3d62bde: 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: 6.0 Commit: d3d62bde97a86faa7dd1189bf10b697f28d84a63 URL: https://github.com/kamailio/kamailio/commit/d3d62bde97a86faa7dd1189bf10b697… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:28:14+02:00 parser/sdp: check if value is exceeded when looking for o= version field (cherry picked from commit c532a67db654efb21f81e058b7e3a86229766a40) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/d3d62bde97a86faa7dd1189bf10b697… Patch: https://github.com/kamailio/kamailio/commit/d3d62bde97a86faa7dd1189bf10b697… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 893ef0e58a4..5e9b3f121ab 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -735,7 +735,12 @@ int extract_sess_version(str *oline, str *sess_version) } i++; - } while(len < oline->len && i < 3); + } while((cp < oline->s + oline->len) && i < 3); + + if(cp >= oline->s + oline->len) { + LM_ERR("broken o= line - version field not found\n"); + return -1; + } len = cp - cp0 - 1; LM_DBG("end %d: >%.*s<\n", len, len, cp0);

1 0

git:6.0:0b48c889: core: allow route(...) usage inside onsend_route block
by Daniel-Constantin Mierla 09 Apr '25

09 Apr '25

Module: kamailio Branch: 6.0 Commit: 0b48c889623a19ed223c252ada049cabebee45f2 URL: https://github.com/kamailio/kamailio/commit/0b48c889623a19ed223c252ada049ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-04-09T09:26:56+02:00 core: allow route(...) usage inside onsend_route block - GH #4130 (cherry picked from commit 6343713bcc91a499c772fc6f548597693f220c35) --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/0b48c889623a19ed223c252ada049ca… Patch: https://github.com/kamailio/kamailio/commit/0b48c889623a19ed223c252ada049ca… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index d2a6d28a192..a5bb2004dd0 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2886,6 +2886,7 @@ fcmd: case MODULE5_T: case MODULE6_T: case MODULEX_T: + case ROUTE_T: case SET_FWD_NO_CONNECT_T: case SET_RPL_NO_CONNECT_T: case SET_FWD_CLOSE_T:

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2025