- sr-dev - kamailio.org

git: new commits in branch 5.5
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

- URL: https://github.com/kamailio/kamailio/commit/5513825a246cff4e5144ed2e83bd010… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:07+02:00 topos: use context to load stored branch attributes only for requests (cherry picked from commit 5d661eaa92461f3b43c433ec32653c4f89bb818e) - URL: https://github.com/kamailio/kamailio/commit/0326fec293da66797fa13ae0a07e3e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:34+02:00 topos: reset context on msg received callback (cherry picked from commit fb777b0e9bf2f87ea8cb1b0134fbfcc625121ad4) - URL: https://github.com/kamailio/kamailio/commit/314436b2110396a5cb069ea093f8d82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:57:49+02:00 topos: uniform processing for requests during early dialog - requests that are handled during 1xx state, like PRACK, UPDATE, BYE (cherry picked from commit 72cc3d46c39791d50927508114bdd1faa4a83f4c) - URL: https://github.com/kamailio/kamailio/commit/b371e7f9be73368d2bb5b9a6deeeb17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:06+02:00 topos: safety handling of onsend data (cherry picked from commit 975a61c89b2440fba737758cce3ab08000811b02) - URL: https://github.com/kamailio/kamailio/commit/fc90e4c06c5df8c8a9d5cd615923c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:15+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments (cherry picked from commit 764d5be0c44036bb4b86f841588fb0df3b4bb834) - URL: https://github.com/kamailio/kamailio/commit/1e235b0b5981c309e663cee2ef6f452… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:34+02:00 topos: simplified tps_dlg_message_update() (cherry picked from commit 7e5c4c30d2f0bbed2b566d46e5141b6abba315e7) - URL: https://github.com/kamailio/kamailio/commit/d3575aa72d779e11fd8cfebc7060647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:58:49+02:00 topos: load associated early dialog transaction using also uuid (cherry picked from commit 94e8988769662a5ae68e30847eef133d50ec5431) - URL: https://github.com/kamailio/kamailio/commit/f201ea9f86561e9d07fa7ac07b356f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:02+02:00 topos: check if event field exists for NOTIFY (cherry picked from commit 317ddc9efa2f11f0fe3787e9ab462550724954ed) - URL: https://github.com/kamailio/kamailio/commit/d5e4e026cf6efc19f155f3adddb1429… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:13+02:00 topos: restore checks on uri and sip_params for tps_dlg_message_update() - use define for expected min len safety checks (cherry picked from commit 1d6736d16ab3a83b77d6c7be3f9689c7fbfccf28) - URL: https://github.com/kamailio/kamailio/commit/22e201fa57f7e2be7a9718b97b550a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:26+02:00 topos: increase the number of db keys for query when using uuid for branch - debug message to print a/b uuid (cherry picked from commit fb5ab20123a07afdfaf96197db25d76f8dda0683) - URL: https://github.com/kamailio/kamailio/commit/8c75a148451b9e2d1c60e67e9b3dfaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:59:40+02:00 topos: explicitely set the db match operator and value type for uuid (cherry picked from commit e279f2f464ab05e1a2821d6e2d9e673fe145fbf2) - URL: https://github.com/kamailio/kamailio/commit/bf57721508c810334c966bab79f2ac3… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-29T15:00:37+02:00 mohqueue: fixed compiler warning about array initialization (cherry picked from commit c7781edcb37a35193ccdb9414183919aaa614d3a) - URL: https://github.com/kamailio/kamailio/commit/9dc8f5170a22e4318e1b1ac3f3f0dba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:00:46+02:00 ims_ipsec_pcscf: initialize variable to fix warnings (cherry picked from commit afff18592998cb14561cf4fd95acd1b4866fd994) - URL: https://github.com/kamailio/kamailio/commit/884dc8babeb285d2c36239d2941dcb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:00:55+02:00 textops: check for msg headers field in case is used for non-sip traffic (cherry picked from commit 48200f3e9ca9f5e5a05de440eefc23f7265b5268) - URL: https://github.com/kamailio/kamailio/commit/3b2f5081df6450aac425c344e11ce4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:01:05+02:00 core: kemi - parse headers before insert operation (cherry picked from commit 7bf0081102a5755c3282e7f01a0f45e160fdda0f) - URL: https://github.com/kamailio/kamailio/commit/e55ecc6412997b55569f3b626a681ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:01:16+02:00 msrp: check return code for str explode (cherry picked from commit addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e) - URL: https://github.com/kamailio/kamailio/commit/1c7a8459f1a5b0f4d96f3908a301b59… Author: SPChan <shihping.chan(a)gmail.com> Date: 2021-04-29T15:01:25+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. (cherry picked from commit 27904530d1f8efd26e2b96fa5f18a3aad887919b) - URL: https://github.com/kamailio/kamailio/commit/126be686df87f1f89edbdf4e5691636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:06:45+02:00 dispatcher: safety to avoid division by 0 for latency operations (cherry picked from commit cf105d5af78963759825f5eaf9feb767c047a49c) - URL: https://github.com/kamailio/kamailio/commit/e7d46be2813531b88782004dd6ddbca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T15:15:32+02:00 Makefile.defs: version set to 5.5.0-rc1

1 0

git:5.4:9e7c22a2: dispatcher: safety to avoid division by 0 for latency operations
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: 5.4 Commit: 9e7c22a21d57230180fd7c135128a30f47ea427d URL: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:50:12+02:00 dispatcher: safety to avoid division by 0 for latency operations - manual backporting of cf105d5af78963759825f5eaf9feb767c047a49c --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… Patch: https://github.com/kamailio/kamailio/commit/9e7c22a21d57230180fd7c135128a30… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index aee5eb8ea6..8fd28c546c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2573,12 +2573,14 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } +#define _VOR1(v) ((v)?(v):1) + static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ if (latency_stats->count < 2097152) { latency_stats->count++; } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ - latency_stats->m2 -= latency_stats->m2/latency_stats->count; + latency_stats->m2 -= latency_stats->m2/_VOR1(latency_stats->count); } if (latency_stats->count == 1) { latency_stats->stdev = 0.0f; @@ -2601,10 +2603,10 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l float delta; float delta2; delta = latency - latency_stats->average; - latency_stats->average += delta/latency_stats->count; + latency_stats->average += delta/_VOR1(latency_stats->count); delta2 = latency - latency_stats->average; latency_stats->m2 += ((double)delta)*delta2; - latency_stats->stdev = sqrt(latency_stats->m2 / (latency_stats->count-1)); + latency_stats->stdev = sqrt(latency_stats->m2 / _VOR1(latency_stats->count-1)); } /* exponentialy weighted moving average */ if (latency_stats->count < 10) { @@ -2697,7 +2699,7 @@ int ds_update_latency(int group, str *address, int code) ds_latency_stats_t *latency_stats = &ds_dest->latency_stats; congestion_ms = latency_stats->estimate - latency_stats->average; /* We multiply by 2^4 to keep enough precision */ - active_weight = (total_congestion_ms << 4) / congestion_ms; + active_weight = (total_congestion_ms << 4) / _VOR1(congestion_ms); if (ds_dest->attrs.rweight != active_weight) { apply_rweights = 1; ds_dest->attrs.rweight = active_weight;

1 0

git:master:cf105d5a: dispatcher: safety to avoid division by 0 for latency operations
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: cf105d5af78963759825f5eaf9feb767c047a49c URL: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T14:47:36+02:00 dispatcher: safety to avoid division by 0 for latency operations --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… Patch: https://github.com/kamailio/kamailio/commit/cf105d5af78963759825f5eaf9feb76… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 80944e4b05..78ece3fffe 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2733,7 +2733,8 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } -void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count) { +void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count) +{ latency_stats->stdev = 0.0f; latency_stats->m2 = 0.0f; latency_stats->max = latency; @@ -2743,14 +2744,17 @@ void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int coun latency_stats->count = count; } -static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { +#define _VOR1(v) ((v)?(v):1) + +static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) +{ int training_count = 10000; /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ if (latency_stats->count < 2097152) { latency_stats->count++; } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ - latency_stats->m2 -= latency_stats->m2/latency_stats->count; + latency_stats->m2 -= latency_stats->m2/_VOR1(latency_stats->count); } if (latency_stats->count == 1) @@ -2771,10 +2775,10 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l float delta; float delta2; delta = latency - latency_stats->average; - latency_stats->average += delta/latency_stats->count; + latency_stats->average += delta/_VOR1(latency_stats->count); delta2 = latency - latency_stats->average; latency_stats->m2 += ((double)delta)*delta2; - latency_stats->stdev = sqrt(latency_stats->m2 / (latency_stats->count-1)); + latency_stats->stdev = sqrt(latency_stats->m2 / _VOR1(latency_stats->count-1)); } /* exponentialy weighted moving average */ if (latency_stats->count < 10) { @@ -2793,7 +2797,8 @@ typedef struct congestion_control_state { int apply_rweights; } congestion_control_state_t; -int ds_update_weighted_congestion_control(congestion_control_state_t *cc, int weight, ds_latency_stats_t *latency_stats) +int ds_update_weighted_congestion_control(congestion_control_state_t *cc, + int weight, ds_latency_stats_t *latency_stats) { int active_weight = 0; int congestion_ms = latency_stats->estimate - latency_stats->average; @@ -2894,7 +2899,7 @@ int ds_update_latency(int group, str *address, int code) ds_latency_stats_t *latency_stats = &ds_dest->latency_stats; congestion_ms = latency_stats->estimate - latency_stats->average; /* We multiply by 2^4 to keep enough precision */ - active_weight = (cc.total_congestion_ms << 4) / congestion_ms; + active_weight = (cc.total_congestion_ms << 4) / _VOR1(congestion_ms); if (ds_dest->attrs.rweight != active_weight) { cc.apply_rweights = 1; ds_dest->attrs.rweight = active_weight;

1 0

git:master:d139cf26: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: d139cf261147c96451454b27a4a3dbaa0a226636 URL: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-29T11:31:19+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… Patch: https://github.com/kamailio/kamailio/commit/d139cf261147c96451454b27a4a3dba… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index a699336f53..d7da3a8bf7 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -31,7 +31,8 @@ Daniel-Constantin Mierla 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 4. Functions @@ -55,9 +56,10 @@ Daniel-Constantin Mierla 1.4. Set rotate parameter 1.5. Set folder parameter 1.6. Set fprefix parameter - 1.7. Set event_callback parameter - 1.8. sipdump_send usage - 1.9. sipdump.enable usage + 1.7. Set fage parameter + 1.8. Set event_callback parameter + 1.9. sipdump_send usage + 1.10. sipdump.enable usage Chapter 1. Admin Guide @@ -77,7 +79,8 @@ Chapter 1. Admin Guide 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 4. Functions @@ -138,7 +141,8 @@ Chapter 1. Admin Guide 3.4. rotate (int) 3.5. folder (str) 3.6. fprefix (str) - 3.7. event_callback (str) + 3.7. fage (int) + 3.8. event_callback (str) 3.1. enable (int) @@ -215,13 +219,26 @@ modparam("sipdump", "folder", "/run/kamailio") modparam("sipdump", "fprefix", "ksipdump-") ... -3.7. event_callback (str) +3.7. fage (int) + + Age of created files (in seconds) to be removed if they become older. + Cleanup is done on a timer routine running every 600 seconds. + + Default value is 0 (no cleanup of created files). + + Example 1.7. Set fage parameter +... +# cleanup files older than two days +modparam("sipdump", "fage", 172800) +... + +3.8. event_callback (str) Name of the KEMI function to be executed instead of the event route. Default value is not set. - Example 1.7. Set event_callback parameter + Example 1.8. Set event_callback parameter ... modparam("sipdump", "event_callback", "ksr_sipdump_event") ... @@ -246,7 +263,7 @@ end This function can be used from ANY_ROUTE. - Example 1.8. sipdump_send usage + Example 1.9. sipdump_send usage ... sipdump_send("cfg"); ... @@ -264,7 +281,7 @@ sipdump_send("cfg"); This function can be used from ANY_ROUTE. - Example 1.9. sipdump.enable usage + Example 1.10. sipdump.enable usage ... kamcmd sipdump.enable kamcmd sipdump.enable 1

1 0

git:master:945b6455: sipdump: new param fage - set file age for clean up
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: 945b6455ed8ce9e3de528588cb45aa70728d4430 URL: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T11:17:10+02:00 sipdump: new param fage - set file age for clean up - older files than fage created by sipdump are deleted on a timer routine running every 600 seconds - default value is 0 (no cleanup) - value is in seconds --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… Patch: https://github.com/kamailio/kamailio/commit/945b6455ed8ce9e3de528588cb45aa7… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 54b5c47484..9b733dad66 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -26,6 +26,10 @@ #include <string.h> #include <time.h> #include <sys/time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <dirent.h> +#include <errno.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" @@ -49,9 +53,12 @@ static str sipdump_folder = str_init("/tmp"); static str sipdump_fprefix = str_init("kamailio-sipdump-"); int sipdump_mode = SIPDUMP_MODE_WTEXT; static str sipdump_event_callback = STR_NULL; +static int sipdump_fage = 0; static int sipdump_event_route_idx = -1; +static void sipdump_storage_clean(unsigned int ticks, void* param); + static int mod_init(void); static int child_init(int); static void mod_destroy(void); @@ -78,6 +85,7 @@ static param_export_t params[]={ {"rotate", PARAM_INT, &sipdump_rotate}, {"folder", PARAM_STR, &sipdump_folder}, {"fprefix", PARAM_STR, &sipdump_fprefix}, + {"fage", PARAM_INT, &sipdump_fage}, {"mode", PARAM_INT, &sipdump_mode}, {"event_callback", PARAM_STR, &sipdump_event_callback}, @@ -148,6 +156,12 @@ static int mod_init(void) register_basic_timers(1); } + if(sipdump_fage>0) { + if(sr_wtimer_add(sipdump_storage_clean, NULL, 600)<0) { + return -1; + } + } + sr_event_register_cb(SREV_NET_DATA_IN, sipdump_msg_received); sr_event_register_cb(SREV_NET_DATA_OUT, sipdump_msg_sent); @@ -430,6 +444,79 @@ int sipdump_msg_sent(sr_event_param_t *evp) return 0; } +/** + * + */ +static void sipdump_storage_clean(unsigned int ticks, void* param) +{ + DIR *dlist = NULL; + struct stat fstatbuf; + struct dirent *dentry = NULL; + str fname = STR_NULL; + char *cwd = NULL; + time_t tnow; + int fcount = 0; + + if(sipdump_folder.s==NULL || sipdump_folder.len<=0 + || sipdump_fprefix.s==NULL || sipdump_fprefix.len<=0) { + return; + } + cwd = getcwd(NULL, 0); + if(cwd==NULL) { + LM_ERR("getcwd failed\n"); + return; + } + if ((chdir(sipdump_folder.s)==-1)) { + LM_ERR("chdir to [%s] failed\n", sipdump_folder.s); + free(cwd); + return; + } + + dlist = opendir(sipdump_folder.s); + if (dlist==NULL) { + LM_ERR("unable to read directory [%s]\n", sipdump_folder.s); + goto done; + } + + tnow = time(NULL); + while ((dentry = readdir(dlist))) { + fname.s = dentry->d_name; + fname.len = strlen(fname.s); + + /* ignore '.' and '..' */ + if(fname.len==1 && strcmp(fname.s, ".")==0) { continue; } + if(fname.len==2 && strcmp(fname.s, "..")==0) { continue; } + + if(fname.len<=sipdump_fprefix.len + || strncmp(fname.s, sipdump_fprefix.s, sipdump_fprefix.len)!=0) { + continue; + } + if(lstat(fname.s, &fstatbuf) == -1) { + LM_ERR("stat failed on [%s]\n", fname.s); + continue; + } + if (S_ISREG(fstatbuf.st_mode)) { + /* check last modification time */ + if ((tnow - sipdump_fage) > fstatbuf.st_mtime) { + LM_DBG("deleting [%s]\n", fname.s); + unlink (fname.s); + fcount++; + } + } + } + closedir(dlist); + if(fcount>0) { + LM_DBG("deleted %d files\n", fcount); + } + +done: + if((chdir(cwd)==-1)) { + LM_ERR("chdir to [%s] failed\n", cwd); + goto done; + } + free(cwd); +} + /** * */

1 0

git:master:cf067586: sipdump: docs for fage parameter
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: cf067586bf5c147aa955d3ba7d3a875a2e376329 URL: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T11:23:39+02:00 sipdump: docs for fage parameter --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… Patch: https://github.com/kamailio/kamailio/commit/cf067586bf5c147aa955d3ba7d3a875… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 7e642f6010..301b667d80 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -195,6 +195,27 @@ modparam("sipdump", "folder", "/run/kamailio") ... modparam("sipdump", "fprefix", "ksipdump-") ... +</programlisting> + </example> + </section> + <section id="sipdump.p.fage"> + <title><varname>fage</varname> (int)</title> + <para> + Age of created files (in seconds) to be removed if they become older. + Cleanup is done on a timer routine running every 600 seconds. + </para> + <para> + <emphasis> + Default value is 0 (no cleanup of created files). + </emphasis> + </para> + <example> + <title>Set <varname>fage</varname> parameter</title> + <programlisting format="linespecific"> +... +# cleanup files older than two days +modparam("sipdump", "fage", 172800) +... </programlisting> </example> </section>

1 0

Default config and options for Kamailio 5.5.0
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Hello, I opened a tracker issue to discuss about default kamailio.cfg to be shipped with upcoming new major version 5.5.0: * https://github.com/kamailio/kamailio/issues/2719 Add your comments on the tracker, to have everyting in a single place -- this message is to notify about on mailing list, not intended to discuss here. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

[kamailio/kamailio] TLS Client Verification OpenSSL 1.1.1(P-256) to OpenSSL 1.0.2 (P-521) is failing (#2716)
by space88man 29 Apr '21

29 Apr '21

### Description I am connecting two kamailio (5.4.5) using TLS with client cert verification. When one side is OpenSSL 1.1.1 (CentOS 8) + P-256 cert and the other side is OpenSSL 1.0.2 (CentOS 7) + P-521 cert *and* `cipher_list` is set(e.g., `DEFAULT`), the ClientHello fails because the only supported curve sent is P-256 (server has P-521). ### Troubleshooting 1. If `cipher_list` is *not* set at all in `[client:defaut]`l, then the ClientHello sends 4 supported EC groups and the handshake succeeds. 2 . If `cipher_list` is set in `[client:defaut]` (e.g. `DEFAULT` or `ANY`) then the ClientHello sends only 1 supported EC group P-256 (I guess because the client is using a P-256 cert), then the handshake will fail. #### Reproduction 1. Connect two kamailos one on CentOS 8 sending SIP to one on CentOS 7, enable TLS, with client cert verification. Put a P-256 cert on CentOS 8 and a P-521 cert on CentOS 7. #### Debugging Data 1. `cipher_list` is not set: TLS ClientHello Supported Groups is 4 groups: secp256r1 secp521r1 secp384r1 secp256k1 2. `cipher_list` is set to `DEFAULT`: TLS ClientHello Supported Groups is 1 group: secp256r1. #### Log Messages ``` ERROR: tls [tls_util.h:42]: tls_err_ret(): TLS accept:error:1408A0C1:SSL routines:ssl3_get_client_hello:no shared cipher ``` #### SIP Traffic NA - couldn't complete TLS handshake so no SIP was transferred. ### Possible Solutions 1. Don't set cipher_list at all; the moment you set cipher_list to anything(`ANY`, `DEFAULT` etc), the ClientHello will narrow the supported groups to P-256 and the server will reject. I have a thought: does `setup_ecdh()` in `tls_domain.c` behave differently on OpenSSL 1.1.1? Maybe it is forcing the handshake to send only the curve of the client. ### Additional Information 1. kamailio version is 5.4.5 2. Must be OpenSSL 1.1.1 to OpenSSL 1.0.2. BTW in the reverse direction P-521 CentOS 7 to P-256 CentOS 8 doesn't encounter this issue. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2716

2 4

[kamailio/kamailio] [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ (#2717)
by space88man 29 Apr '21

29 Apr '21

Address GH #2716. Also see https://bugs.python.org/issue29697.   #### 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) - [ ] 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 - [ ] Related to issue #2716 #### Description For OpenSSL 1.1.x initialization of EC SSL contexts has changed — we should be using the < 1.0.2 technique on OpenSSL 1.1+. This addresses a corner case where TLS server with P-256 cert would not handshake with a TLS client presenting a P-521 cert. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2717 -- Commit Summary -- * [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ -- File Changes -- M src/modules/tls/tls_domain.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2717.patch https://github.com/kamailio/kamailio/pull/2717.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2717

2 2

git:master:27904530: [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: 27904530d1f8efd26e2b96fa5f18a3aad887919b URL: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T08:32:13+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… Patch: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index ab45fa7136..c2231b0db0 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -57,8 +57,12 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); * ECDHE is enabled only on OpenSSL 1.0.0e and later. * See http://www.openssl.org/news/secadv_20110906.txt * for details. + * Also, copied from _ssl.c of Python for correct initialization. + * Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use + * prime256v1 by default. This is Apache mod_ssl's initialization + * policy, so we should be safe. OpenSSL 1.1 has it enabled by default. */ -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; @@ -69,11 +73,15 @@ static void setup_ecdh(SSL_CTX *ctx) } #endif +#if defined(SSL_CTX_set_ecdh_auto) + SSL_CTX_set_ecdh_auto(ctx, 1); +#else ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); SSL_CTX_set_tmp_ecdh(ctx, ecdh); EC_KEY_free(ecdh); +#endif } #endif @@ -691,7 +699,7 @@ static int set_cipher_list(tls_domain_t* d) tls_domain_str(d), cipher_list); return -1; } -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) setup_ecdh(d->ctx[i]); #endif #ifndef OPENSSL_NO_DH

1 0

git:master:addb6a88: msrp: check return code for str explode
by Daniel-Constantin Mierla 29 Apr '21

29 Apr '21

Module: kamailio Branch: master Commit: addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e URL: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T08:25:49+02:00 msrp: check return code for str explode --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… Patch: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 4e5e67e130..7defaf9353 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -716,6 +716,11 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) s = hdr->body; trim(&s); arr->size = msrp_explode_strz(&arr->list, &s, " "); + if(arr->size<0) + { + LM_ERR("failed to explode\n"); + return -1; + } hdr->parsed.flags |= MSRP_DATA_SET; hdr->parsed.free_fn = msrp_str_array_destroy; hdr->parsed.data = arr;

1 0

git:master:a1bbe035: lost: fixed possible resource leak inside lost_get_response_issues()
by Wolfgang Kampichler 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: a1bbe035f1a1acc11f86d27fdc0adef1b1a3d010 URL: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-28T17:22:58+02:00 lost: fixed possible resource leak inside lost_get_response_issues() --- Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… Patch: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… --- diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index b3389448b8..6eb13e8260 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -573,39 +573,53 @@ p_lost_issue_t lost_get_response_issues(xmlNodePtr node) cur = node->children; while(cur) { if(cur->type == XML_ELEMENT_NODE) { - /* get a new response type element */ + /* get a new response type object */ issue = lost_new_response_type(); if(issue == NULL) { /* didn't get it ... return */ break; } - /* parse properties */ - issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + /* get issue type */ tmp.s = (char *)cur->name; tmp.len = strlen((char *)cur->name); + /* copy issue type to object */ + len = 0; if(tmp.len > 0 && tmp.s != NULL) { issue->type = lost_copy_string(tmp, &len); } - if(len > 0) { + if(len == 0) { + /* issue type not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parse source property */ + len = 0; + issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + if(len == 0) { + /* source property not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } - LM_DBG("###\t[%s]\n", issue->type); + LM_DBG("###\t[%s]\n", issue->type); - if(issue->info != NULL) { - issue->info->text = lost_get_property(cur, PROP_MSG, &len); - issue->info->lang = lost_get_property(cur, PROP_LANG, &len); - } - /* get a new list element */ - new = lost_new_response_issues(); - if(new == NULL) { - /* didn't get it, delete response type element ... return */ - lost_delete_response_type(&issue); /* clean up */ - break; - } - /* append to list */ - new->issue = issue; - new->next = list; - list = new; + /* type and source property found ... parse text and copy */ + if(issue->info != NULL) { + issue->info->text = lost_get_property(cur, PROP_MSG, &len); + issue->info->lang = lost_get_property(cur, PROP_LANG, &len); } + /* get a new list element */ + new = lost_new_response_issues(); + if(new == NULL) { + /* didn't get it, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parsing done, append object to list */ + new->issue = issue; + new->next = list; + list = new; + /* get next element */ cur = cur->next; }

1 0

git:master:48200f3e: textops: check for msg headers field in case is used for non-sip traffic
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: 48200f3e9ca9f5e5a05de440eefc23f7265b5268 URL: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T15:57:05+02:00 textops: check for msg headers field in case is used for non-sip traffic --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… Patch: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 3d90e97a90..2998906051 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3401,7 +3401,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, int len; str s0; - if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { LM_ERR("error while parsing message\n"); return -1; }

1 0

git:master:7bf00811: core: kemi - parse headers before insert operation
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: 7bf0081102a5755c3282e7f01a0f45e160fdda0f URL: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T16:06:50+02:00 core: kemi - parse headers before insert operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… Patch: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index ba0b435dce..0932339996 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2143,6 +2143,11 @@ static int sr_kemi_hdr_insert(sip_msg_t *msg, str *txt) if(txt==NULL || txt->s==NULL || msg==NULL) return -1; + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { + LM_ERR("error while parsing message\n"); + return -1; + } + LM_DBG("insert hf: %.*s\n", txt->len, txt->s); hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { @@ -2188,7 +2193,7 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) return -1; } - if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { LM_ERR("error while parsing message\n"); return -1; }

1 0

git:master:afff1859: ims_ipsec_pcscf: initialize variable to fix warnings
by Daniel-Constantin Mierla 28 Apr '21

28 Apr '21

Module: kamailio Branch: master Commit: afff18592998cb14561cf4fd95acd1b4866fd994 URL: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T13:28:05+02:00 ims_ipsec_pcscf: initialize variable to fix warnings --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… Patch: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 10841c74b2..45e82ddf3e 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -681,8 +681,8 @@ static int delete_unused_sa_cb(const struct nlmsghdr *nlh, void *data) void *cp; str received_host; ip_addr_t received_host_addr; - ipsec_t ipsec; - + ipsec_t ipsec = {0}; + cp = ((struct del_tunnels*)data)->contacts; while (1) { memcpy(&(received_host.len), cp, sizeof(received_host.len)); @@ -1080,4 +1080,4 @@ int delete_unused_tunnels() free(buf); return 0; -} \ No newline at end of file +}

1 0

[kamailio/kamailio] build warnings (#2710)
by sergey-safarov 27 Apr '21

27 Apr '21

**missing braces around initializer** *mohq_funcs.c:2163* ``` LD (gcc) [M matrix.so] matrix.so CC (gcc) [M mohqueue.so] mohq_locks.o CC (gcc) [M mohqueue.so] mohq_funcs.o mohq_funcs.c: In function 'send_rtp_answer': mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { } CC (gcc) [M mohqueue.so] mohq_db.o CC (gcc) [M mohqueue.so] mohqueue_mod.o make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M mohqueue.so] mohqueue.so CC (gcc) [M msilo.so] msfuncs.o CC (gcc) [M msilo.so] msilo.o ``` **"_POSIX_C_SOURCE" redefined** ``` CC (gcc) [M app_python.so] python_iface.o CC (gcc) [M app_python.so] apy_kemi_export.o In file included from /usr/include/python2.7/pyconfig.h:6, from /usr/include/python2.7/Python.h:8, from apy_kemi_export.c:30: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined 1232 | #define _POSIX_C_SOURCE 200112L | In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from apy_kemi_export.c:26: /usr/include/features.h:265: note: this is the location of the previous definition 265 | # define _POSIX_C_SOURCE 200809L | CC (gcc) [M app_python.so] mod_Core.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/pyconfig.h:6, from /usr/include/python2.7/Python.h:8, from apy_kemi.c:25: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined 1232 | #define _POSIX_C_SOURCE 200112L | In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from apy_kemi.c:21: /usr/include/features.h:265: note: this is the location of the previous definition 265 | # define _POSIX_C_SOURCE 200809L | CC (gcc) [M app_python.so] python_msgobj.o CC (gcc) [M app_python.so] mod_Router.o CC (gcc) [M app_python.so] app_python_mod. ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2710

3 14

git:master:c7781edc: mohqueue: fixed compiler warning about array initialization
by Sergey Safarov 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: c7781edcb37a35193ccdb9414183919aaa614d3a URL: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-27T13:00:35+03:00 mohqueue: fixed compiler warning about array initialization --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… Patch: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index dd9f105bfc..1f72c58c5a 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -2160,7 +2160,9 @@ int nsession; sdp_session_cell_t *psession; char pflagbuf [5]; strcpy (pflagbuf, "z20"); -fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; +fparam_t pzflag [1] = { + {"", FPARAM_STRING, {pflagbuf}, 0} +}; for (nsession = 0; (psession = get_sdp_session (pmsg, nsession)); nsession++) { int nstream;

1 0

git:5.5:6b9ecb08: dispatcher: docs - set xmlns for include tags
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: 5.5 Commit: 6b9ecb0856a881144546fea6d3cbd8a3dc668b81 URL: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T10:00:41+02:00 dispatcher: docs - set xmlns for include tags (cherry picked from commit 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47) --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… Patch: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 3888e5f281..af040e737d 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -6,12 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]> -<book xmlns:xi="http://www.w3.org/2001/XInclude"> +<book> <bookinfo> <title>DISPATCHER Module</title> <productname class="trade">&kamailioname;</productname> @@ -97,7 +94,7 @@ </bookinfo> <toc/> - <xi:include href="dispatcher_admin.xml"/> - <xi:include href="dispatcher_faq.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_admin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_faq.xml"/> </book> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 45f93a3121..0ac1a430e6 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - +  <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>  -<chapter xmlns:xi="http://www.w3.org/2001/XInclude"> +<chapter> <title>&adminguide;</title> @@ -2215,7 +2212,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>dispatcher list file</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.list" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.list" parse="text"/> ... </programlisting> </example> @@ -2231,7 +2228,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>&kamailio; config script - sample dispatcher usage</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.cfg" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.cfg" parse="text"/> ... </programlisting> </example>

1 0

git:5.5:f3cf66fa: dmq: docs - fix section id for dmq.remove rpc command
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: 5.5 Commit: f3cf66fafaba73b245b5e8179c290da936f6418e URL: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T10:00:28+02:00 dmq: docs - fix section id for dmq.remove rpc command (cherry picked from commit 2c473f7c2eccf4ef79f23f9cecd122e861395a00) --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… Patch: https://github.com/kamailio/kamailio/commit/f3cf66fafaba73b245b5e8179c290da… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index ebc6f44e1a..661fd4b847 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -522,7 +522,7 @@ modparam("dmq", "ping_interval", 90) </programlisting> </example> </section> - <section id="dmq.r.list_nodes"> + <section id="dmq.r.remove"> <title>dmq.remove</title> <para> Remove a DMQ node by address.

1 0

git:master:3f25ef01: dispatcher: docs - set xmlns for include tags
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47 URL: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T09:59:29+02:00 dispatcher: docs - set xmlns for include tags --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… Patch: https://github.com/kamailio/kamailio/commit/3f25ef01c5cc3adb02dd1bfecdfd4c3… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 3888e5f281..af040e737d 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -6,12 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]> -<book xmlns:xi="http://www.w3.org/2001/XInclude"> +<book> <bookinfo> <title>DISPATCHER Module</title> <productname class="trade">&kamailioname;</productname> @@ -97,7 +94,7 @@ </bookinfo> <toc/> - <xi:include href="dispatcher_admin.xml"/> - <xi:include href="dispatcher_faq.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_admin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_faq.xml"/> </book> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 45f93a3121..0ac1a430e6 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - +  <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>  -<chapter xmlns:xi="http://www.w3.org/2001/XInclude"> +<chapter> <title>&adminguide;</title> @@ -2215,7 +2212,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>dispatcher list file</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.list" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.list" parse="text"/> ... </programlisting> </example> @@ -2231,7 +2228,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>&kamailio; config script - sample dispatcher usage</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.cfg" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.cfg" parse="text"/> ... </programlisting> </example>

1 0

git:master:2c473f7c: dmq: docs - fix section id for dmq.remove rpc command
by Daniel-Constantin Mierla 27 Apr '21

27 Apr '21

Module: kamailio Branch: master Commit: 2c473f7c2eccf4ef79f23f9cecd122e861395a00 URL: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T09:51:30+02:00 dmq: docs - fix section id for dmq.remove rpc command --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… Patch: https://github.com/kamailio/kamailio/commit/2c473f7c2eccf4ef79f23f9cecd122e… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index ebc6f44e1a..661fd4b847 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -522,7 +522,7 @@ modparam("dmq", "ping_interval", 90) </programlisting> </example> </section> - <section id="dmq.r.list_nodes"> + <section id="dmq.r.remove"> <title>dmq.remove</title> <para> Remove a DMQ node by address.

1 0

git:master:764d5be0: core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 764d5be0c44036bb4b86f841588fb0df3b4bb834 URL: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T11:22:20+02:00 core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… Patch: https://github.com/kamailio/kamailio/commit/764d5be0c44036bb4b86f841588fb0d… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 94f972eae9..fb786ba635 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -509,7 +509,7 @@ void qm_free(void* qmp, void* p) #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f, file, line); - if (f->u.is_free){ + if (unlikely(f->u.is_free)){ if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { LM_CRIT("BUG: freeing already freed pointer (%p)," " called from %s: %s(%d), first free %s: %s(%ld) - aborting\n", @@ -524,12 +524,13 @@ void qm_free(void* qmp, void* p) } MDBG("freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line); -#endif +#else if (unlikely(f->u.is_free)){ LM_INFO("freeing a free fragment (%p/%p) - ignore\n", f, p); return; } +#endif size=f->size; qm->used-=size;

2 2

git:master:e279f2f4: topos: explicitely set the db match operator and value type for uuid
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: e279f2f464ab05e1a2821d6e2d9e673fe145fbf2 URL: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T14:58:39+02:00 topos: explicitely set the db match operator and value type for uuid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… Patch: https://github.com/kamailio/kamailio/commit/e279f2f464ab05e1a2821d6e2d9e673… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 2d611402c8..6e88b35af3 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1148,20 +1148,32 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if(md->a_uuid.len>0) { if(md->a_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); nr_keys++; } else if(md->a_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); nr_keys++; } } else if(md->b_uuid.len>0) { if(md->b_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); nr_keys++; } else if(md->b_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); nr_keys++; }

1 0

git:master:fb5ab201: topos: increase the number of db keys for query when using uuid for branch
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: fb5ab20123a07afdfaf96197db25d76f8dda0683 URL: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T14:51:55+02:00 topos: increase the number of db keys for query when using uuid for branch - debug message to print a/b uuid --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… Patch: https://github.com/kamailio/kamailio/commit/fb5ab20123a07afdfaf96197db25d76… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 852a19aaa2..854d2cdbc6 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -826,6 +826,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) } lkey = msg->callid->body; + LM_DBG("callid [%.*s] - a_uuid [%.*s] - b_uuid [%.*s]\n", lkey.len, lkey.s, + mtsd.a_uuid.len, ((mtsd.a_uuid.len>0)?mtsd.a_uuid.s:""), + mtsd.b_uuid.len, ((mtsd.b_uuid.len>0)?mtsd.b_uuid.s:"")); tps_storage_lock_get(&lkey); diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index caff16c5ee..2d611402c8 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1149,17 +1149,21 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if(md->a_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + nr_keys++; } else if(md->a_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + nr_keys++; } } else if(md->b_uuid.len>0) { if(md->b_uuid.s[0]=='a') { db_keys[nr_keys]=&tt_col_a_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + nr_keys++; } else if(md->b_uuid.s[0]=='b') { db_keys[nr_keys]=&tt_col_b_uuid; db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + nr_keys++; } } }

1 0

git:master:1d6736d1: topos: restore checks on uri and sip_params for tps_dlg_message_update()
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 1d6736d16ab3a83b77d6c7be3f9689c7fbfccf28 URL: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:49:42+02:00 topos: restore checks on uri and sip_params for tps_dlg_message_update() - use define for expected min len safety checks --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… Patch: https://github.com/kamailio/kamailio/commit/1d6736d16ab3a83b77d6c7be3f9689c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index cbf8b3c9f3..852a19aaa2 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -309,17 +309,18 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) str tuuid = STR_NULL; int ret; +#define TPS_TUUID_MIN_LEN 10 + if(parse_sip_msg_uri(msg)<0) { LM_ERR("failed to parse r-uri\n"); return -1; } - if(msg->parsed_uri.sip_params.len<10) { - LM_DBG("not an expected %s format\n", (ctmode==0)?"user":"param"); - return 1; - } - if (ctmode == 1 || ctmode == 2) { + if(msg->parsed_uri.sip_params.len<TPS_TUUID_MIN_LEN) { + LM_DBG("not an expected param format\n"); + return 1; + } /* find the r-uri parameter */ ret = tps_get_param_value(&msg->parsed_uri.params, &_tps_cparam_name, &tuuid); @@ -332,6 +333,10 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return 1; } } else { + if(msg->parsed_uri.user.len<TPS_TUUID_MIN_LEN) { + LM_DBG("not an expected user format\n"); + return 1; + } tuuid = msg->parsed_uri.user; }

1 0

git:master:317ddc9e: topos: check if event field exists for NOTIFY
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 317ddc9efa2f11f0fe3787e9ab462550724954ed URL: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:43:21+02:00 topos: check if event field exists for NOTIFY --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… Patch: https://github.com/kamailio/kamailio/commit/317ddc9efa2f11f0fe3787e9ab46255… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 21cb59c517..caff16c5ee 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1110,7 +1110,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, if((get_cseq(msg)->method_id == METHOD_SUBSCRIBE) || ((get_cseq(msg)->method_id == METHOD_NOTIFY) - && (msg->event->len > 0))) { + && (msg->event && msg->event->len > 0))) { bInviteDlg = 0; }

1 0

git:master:94e89887: topos: load associated early dialog transaction using also uuid
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 94e8988769662a5ae68e30847eef133d50ec5431 URL: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T13:02:11+02:00 topos: load associated early dialog transaction using also uuid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… Patch: https://github.com/kamailio/kamailio/commit/94e8988769662a5ae68e30847eef133… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 25275ab272..21cb59c517 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1144,6 +1144,24 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val = bInviteDlg ? sinv : ssub; nr_keys++; + + if(md->a_uuid.len>0) { + if(md->a_uuid.s[0]=='a') { + db_keys[nr_keys]=&tt_col_a_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + } else if(md->a_uuid.s[0]=='b') { + db_keys[nr_keys]=&tt_col_b_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + } + } else if(md->b_uuid.len>0) { + if(md->b_uuid.s[0]=='a') { + db_keys[nr_keys]=&tt_col_a_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + } else if(md->b_uuid.s[0]=='b') { + db_keys[nr_keys]=&tt_col_b_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + } + } } if(msg->first_line.type==SIP_REQUEST && md->x_context.len>0) {

1 0

git:master:7e5c4c30: topos: simplified tps_dlg_message_update()
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 7e5c4c30d2f0bbed2b566d46e5141b6abba315e7 URL: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T12:48:37+02:00 topos: simplified tps_dlg_message_update() --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… Patch: https://github.com/kamailio/kamailio/commit/7e5c4c30d2f0bbed2b566d46e5141b6… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index bf5815fa76..cbf8b3c9f3 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -306,7 +306,7 @@ int tps_dlg_detect_direction(sip_msg_t *msg, tps_data_t *ptsd, */ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) { - str tmp; + str tuuid = STR_NULL; int ret; if(parse_sip_msg_uri(msg)<0) { @@ -314,14 +314,15 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return -1; } + if(msg->parsed_uri.sip_params.len<10) { + LM_DBG("not an expected %s format\n", (ctmode==0)?"user":"param"); + return 1; + } + if (ctmode == 1 || ctmode == 2) { - if(msg->parsed_uri.sip_params.len<10) { - LM_DBG("not an expected param format\n"); - return 1; - } - // find parameter, there might be others + /* find the r-uri parameter */ ret = tps_get_param_value(&msg->parsed_uri.params, - &_tps_cparam_name, &tmp); + &_tps_cparam_name, &tuuid); if (ret < 0) { LM_ERR("failed to parse param\n"); return -1; @@ -330,31 +331,20 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) LM_DBG("prefix para not found\n"); return 1; } - if(memcmp(tmp.s, "atpsh-", 6)==0) { - ptsd->a_uuid = tmp; - return 0; - } - if(memcmp(tmp.s, "btpsh-", 6)==0) { - ptsd->a_uuid = tmp; - ptsd->b_uuid = tmp; - return 0; - } - } else { - if(msg->parsed_uri.user.len<10) { - LM_DBG("not an expected user format\n"); - return 1; - } - if(memcmp(msg->parsed_uri.user.s, "atpsh-", 6)==0) { - ptsd->a_uuid = msg->parsed_uri.user; - return 0; - } - if(memcmp(msg->parsed_uri.user.s, "btpsh-", 6)==0) { - ptsd->a_uuid = msg->parsed_uri.user; - ptsd->b_uuid = msg->parsed_uri.user; - return 0; - } + tuuid = msg->parsed_uri.user; + } + + if(memcmp(tuuid.s, "atpsh-", 6)==0) { + ptsd->a_uuid = tuuid; + return 0; + } + if(memcmp(tuuid.s, "btpsh-", 6)==0) { + ptsd->a_uuid = tuuid; + ptsd->b_uuid = tuuid; + return 0; } + LM_DBG("not an expected prefix\n"); return 1; @@ -840,7 +830,6 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(((get_cseq(msg)->method_id) & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - memset(&stsd, 0, sizeof(tps_data_t)); if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { @@ -850,6 +839,8 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_link_msg(msg, &mtsd, direction) < 0) { goto error; } + mtsd.direction = direction; + memset(&stsd, 0, sizeof(tps_data_t)); if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { goto error; } @@ -859,9 +850,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error; } + mtsd.direction = direction; } - mtsd.direction = direction; tps_storage_lock_release(&lkey);

1 0

git:master:975a61c8: topos: safety handling of onsend data
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 975a61c89b2440fba737758cce3ab08000811b02 URL: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T10:14:58+02:00 topos: safety handling of onsend data --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… Patch: https://github.com/kamailio/kamailio/commit/975a61c89b2440fba737758cce3ab08… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 24cb77c208..ba58920a6c 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -602,12 +602,15 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, struct run_act_ctx ctx; int rtb; sr_kemi_eng_t *keng = NULL; - struct onsend_info onsnd_info = {0}; + onsend_info_t onsnd_info = {0}; + onsend_info_t *p_onsend_bak; if(!(_tps_eventrt_mode & evtype)) { return 0; } + p_onsend_bak = p_onsend; + if(evidx<0) { if(_tps_eventrt_callback.s!=NULL || _tps_eventrt_callback.len>0) { keng = sr_kemi_eng_get(); @@ -627,8 +630,10 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, evidx); fmsg = faked_msg_next(); - onsnd_info.to = &evp->dst->to; - onsnd_info.send_sock = evp->dst->send_sock; + if(evp->dst) { + onsnd_info.to = &evp->dst->to; + onsnd_info.send_sock = evp->dst->send_sock; + } if(msg!=NULL) { onsnd_info.buf = msg->buf; onsnd_info.len = msg->len; @@ -650,7 +655,7 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, evname)<0) { LM_ERR("error running event route kemi callback\n"); - p_onsend=NULL; + p_onsend=p_onsend_bak; return -1; } } @@ -658,12 +663,12 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, set_route_type(rtb); if(ctx.run_flags&DROP_R_F) { LM_DBG("exit due to 'drop' in event route\n"); - p_onsend=NULL; + p_onsend=p_onsend_bak; return 1; } done: - p_onsend=NULL; + p_onsend=p_onsend_bak; return 0; }

1 0

git:master:72cc3d46: topos: uniform processing for requests during early dialog
by Daniel-Constantin Mierla 26 Apr '21

26 Apr '21

Module: kamailio Branch: master Commit: 72cc3d46c39791d50927508114bdd1faa4a83f4c URL: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-26T10:14:58+02:00 topos: uniform processing for requests during early dialog - requests that are handled during 1xx state, like PRACK, UPDATE, BYE --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… Patch: https://github.com/kamailio/kamailio/commit/72cc3d46c39791d50927508114bdd1f… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 2389026d14..bf5815fa76 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -834,35 +834,31 @@ int tps_request_received(sip_msg_t *msg, int dialog) tps_storage_lock_get(&lkey); - if((get_cseq(msg)->method_id)&(METHOD_PRACK)) { - if(tps_storage_link_msg(msg, &mtsd, TPS_DIR_DOWNSTREAM)<0) { + if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { + goto error; + } + if(((get_cseq(msg)->method_id) & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) + && stsd.b_contact.len <= 0) { + /* no B-side contact, look for INVITE transaction record */ + memset(&stsd, 0, sizeof(tps_data_t)); + if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { + goto error; + } + } + if(tps_storage_link_msg(msg, &mtsd, direction) < 0) { goto error; } - if(tps_storage_load_branch(msg, &mtsd, &stsd, 1)<0) { + if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { goto error; } use_branch = 1; } else { - if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error; } - if(((get_cseq(msg)->method_id) & (METHOD_BYE)) - && stsd.b_contact.len <= 0) { - /* BYE but not B-side contact, look for INVITE transaction record */ - memset(&stsd, 0, sizeof(tps_data_t)); - if(tps_storage_link_msg(msg, &mtsd, TPS_DIR_DOWNSTREAM) < 0) { - goto error; - } - if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { - goto error; - } - use_branch = 1; - } else { - /* detect direction - via from-tag */ - if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { - goto error; - } - } } mtsd.direction = direction;

1 0

git:master:32800023: lost: Coverity Scan fixes
by Wolfgang Kampichler 25 Apr '21

25 Apr '21

Module: kamailio Branch: master Commit: 328000233928fa08095889fdca7d66acba5e5825 URL: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-25T22:44:01+02:00 lost: Coverity Scan fixes --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a… Patch: https://github.com/kamailio/kamailio/commit/328000233928fa08095889fdca7d66a…

1 0

git:master:5d661eaa: topos: use context to load stored branch attributes only for requests
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: 5d661eaa92461f3b43c433ec32653c4f89bb818e URL: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-23T12:36:20+02:00 topos: use context to load stored branch attributes only for requests --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… Patch: https://github.com/kamailio/kamailio/commit/5d661eaa92461f3b43c433ec32653c4… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 408d84d8cc..25275ab272 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1146,7 +1146,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, nr_keys++; } - if(md->x_context.len>0) { + if(msg->first_line.type==SIP_REQUEST && md->x_context.len>0) { db_keys[nr_keys]=&tt_col_x_context; db_ops[nr_keys]=OP_EQ; db_vals[nr_keys].type = DB1_STR;

1 0

git:master:fb777b0e: topos: reset context on msg received callback
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: fb777b0e9bf2f87ea8cb1b0134fbfcc625121ad4 URL: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-23T12:36:20+02:00 topos: reset context on msg received callback --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… Patch: https://github.com/kamailio/kamailio/commit/fb777b0e9bf2f87ea8cb1b0134fbfcc… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 4975af9493..24cb77c208 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -432,6 +432,8 @@ int tps_msg_received(sr_event_param_t *evp) int dialog; int ret; + ki_tps_set_context(NULL, NULL); + obuf = (str*)evp->data; if(tps_execute_event_route(NULL, evp, TPS_EVENTRT_INCOMING,

1 0

git:master:55095abd: pkg/kamailio/deb: version set 5.6.0~dev0
by Victor Seva 23 Apr '21

23 Apr '21

Module: kamailio Branch: master Commit: 55095abdb65ddf1d332d294c1acefc61935f240e URL: https://github.com/kamailio/kamailio/commit/55095abdb65ddf1d332d294c1acefc6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-23T11:28:44+02:00 pkg/kamailio/deb: version set 5.6.0~dev0 --- Modified: pkg/kamailio/deb/bionic/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/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/55095abdb65ddf1d332d294c1acefc6… Patch: https://github.com/kamailio/kamailio/commit/55095abdb65ddf1d332d294c1acefc6…

1 0

Branch 5.5 has been created
by Daniel-Constantin Mierla 23 Apr '21

23 Apr '21

Hello, the branch 5.5 has been created, to be used for releasing v5.5.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.5 cd kamailio-5.5 git checkout -b 5.5 origin/5.5 Pushing commits in this branch: git push origin 5.5:5.5 Note that 5.5 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.5 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 5.5 will be out, respectively Kamailio v5.5.0. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

[CRON] Failed: dbank888/kamailio#133 (master - 491e19e)
by Travis CI 22 Apr '21

22 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #133 Status: Failed Duration: 5 mins and 15 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/768045521?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Development is open for future release of v5.6.x series
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Hello, the branch 5.5 was created, therefore the master branch is open for adding new features, to be part of future release series v5.6.x (or whatever version is decided for next series). Any bug fix committed to master that applies to 5.5.x or older stable branches should be backported as usual with "git cherry-pick -x ..." to appropriate branches like 5.5 or 5.4. Expect that v5.5.0 will be released in a few weeks from now. Based on the workflow used during the past years, the next future release v5.6.0 should be out after another 6-10 months of development, plus 1-2 months of testing, so sometime by end of 2021 or in the first part of 2022. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.5:677bf448: Makefile.defs: version set to 5.5.0-rc0
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: 5.5 Commit: 677bf4480a14ea1c93eb92000cad19299d2d098e URL: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:54:33+02:00 Makefile.defs: version set to 5.5.0-rc0 - branch 5.5 was created to host 5.5.x series - vesion type set to release candidate mode --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… Patch: https://github.com/kamailio/kamailio/commit/677bf4480a14ea1c93eb92000cad192… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2247a05385..a7791acb28 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:0c1211b0: Makefile.defs: version set to 5.6.0-dev0
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 0c1211b02b48bf7776bd490454d0ad9ae785032e URL: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:51:26+02:00 Makefile.defs: version set to 5.6.0-dev0 - master branch is open for new features to be part of future release series 5.6.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… Patch: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2247a05385..027c985798 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 5 +PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:a8217183: Makefile.defs: version set to 5.5.0-pre1
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: a82171835767f65aa7365d303e53c097bf59e21a URL: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:48:20+02:00 Makefile.defs: version set to 5.5.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… Patch: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 1d8e131e12..2247a05385 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:54fe6aa0: topos_redis: set attributes always for provisional replies
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 54fe6aa05a266bfbf0cffedde89134ba534c8d1b URL: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:46:29+02:00 topos_redis: set attributes always for provisional replies --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… Patch: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 93f02da0fd..5f0fda701e 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1171,15 +1171,14 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &tt_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &tt_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &tt_key_b_contact, argv, argvlen); } if((mode & TPS_DBU_RPLATTRS) && msg->first_line.type==SIP_REPLY) { - if(sd->b_tag.len<=0 - && msg->first_line.u.reply.statuscode>=180 + if(msg->first_line.u.reply.statuscode>=180 && msg->first_line.u.reply.statuscode<200) { TPS_REDIS_SET_ARGS(&md->b_rr, argc, &tt_key_y_rr, argv, argvlen);

1 0

git:master:86b05ed4: ims_charging: fixed compiler warnings for kemi exports
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 86b05ed47d2ec44535b3615dbebac59e4c2c99ca URL: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T09:29:26+02:00 ims_charging: fixed compiler warnings for kemi exports --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… Patch: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index a8883dc548..a01a08b566 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -409,7 +409,7 @@ static int ki_ro_ccr_stop(sip_msg_t *msg, str* p_direction, int p_code, str* p_r struct ro_session* ro_session; struct ro_session_entry *ro_session_entry; unsigned int h_entry; - str s_code, s_reason; + str s_reason; unsigned int code; int dir = 0; /*any side*/ char *c_direction; @@ -527,7 +527,7 @@ static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int re return RO_RETURN_ERROR; } - dir = get_direction_as_int(&s_direction); + dir = get_direction_as_int(s_direction); if (dir == RO_ORIG_DIRECTION) { //get caller IMPU from asserted identity @@ -610,7 +610,7 @@ static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int re goto done; } - ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, &s_incoming_trunk_id, &s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel); + ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, s_incoming_trunk_id, s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel); if(ret < 0){ LM_ERR("Failed to send CCR\n"); @@ -669,6 +669,7 @@ static int ki_ro_set_session_id_avp(sip_msg_t *msg) { res = create_response_avp_string("ro_session_id", &ro_session->ro_session_id); dlgb.release_dlg(dlg); unref_ro_session(ro_session, 1, 1); + return res; } static int ro_fixup_stop(void **param, int param_no) { @@ -702,4 +703,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(ims_charging_kemi_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:06e265b3: ims_diameter_server: removed goto label used in single place
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 06e265b38a857789b64ca1370db039eeca5a0e50 URL: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T09:36:31+02:00 ims_diameter_server: removed goto label used in single place --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… Patch: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index 2270a62560..3ee51601ec 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -286,7 +286,10 @@ int ki_diameter_request(struct sip_msg * msg, str* s_peer, int i_appid, int i_co session = 0; } - if (!req) goto error1; + if (!req) { + LM_ERR("Error occurred trying to send request\n"); + return -1; + } if (!addAVPsfromJSON(req, s_message)) { LM_ERR("Failed to parse JSON Request\n"); @@ -325,12 +328,6 @@ int ki_diameter_request(struct sip_msg * msg, str* s_peer, int i_appid, int i_co } } } -error1: - //Only free UAR IFF it has not been passed to CDP - if (req) cdpb.AAAFreeMessage(&req); - LM_ERR("Error occurred trying to send request\n"); - return -1; - } int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* commandcode, char* message, int async) {

1 0

git:master:94068d2e: dmq: skip removing local node via rpc command
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 94068d2e40eb867a5d6da44868d5edb52949f817 URL: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T08:36:11+02:00 dmq: skip removing local node via rpc command --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Patch: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 631dce11d5..4300f80b54 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -328,9 +328,12 @@ void pkg_free_node(dmq_node_t *node) } /** - * @brief delete dmq node + * @brief delete dmq node with filter rules + * - list - the list of nodes + * - node - the structure with characteristics of the node to be deleted + * - filter - if 0: delete node always; if 1: delete node if not local */ -int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +int dmq_node_del_filter(dmq_node_list_t *list, dmq_node_t *node, int filter) { dmq_node_t *cur, **prev; lock_get(&list->lock); @@ -338,8 +341,10 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) prev = &list->nodes; while(cur) { if(cmp_dmq_node(cur, node)) { - *prev = cur->next; - destroy_dmq_node(cur, 1); + if(filter==0 || cur->local==0) { + *prev = cur->next; + destroy_dmq_node(cur, 1); + } lock_release(&list->lock); return 1; } @@ -350,6 +355,14 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node + */ +int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +{ + return dmq_node_del_filter(list, node, 0); +} + /** * @brief delete dmq node by uri */ @@ -363,7 +376,7 @@ int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) return -1; } - return del_dmq_node(list, &dnode); + return dmq_node_del_filter(list, &dnode, 1); } /**

1 0

git:master:0fa5455d: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 0fa5455d9bc1d603c142cd9a767df5b248eba64a URL: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T19:31:12+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Patch: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 78196f8ce1..1e7d6ff375 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -56,6 +56,7 @@ Charles Chance 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 2. Developer Guide @@ -87,6 +88,7 @@ Charles Chance 1.14. dmq_t_replicate usage 1.15. dmq_is_from_node usage 1.16. dmq.list_nodes usage + 1.17. dmq.remove usage 2.1. dmq_api_t structure 2.2. register_dmq_peer usage 2.3. bcast_message usage @@ -125,6 +127,7 @@ Chapter 1. Admin Guide 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 1. Overview @@ -464,6 +467,7 @@ ext/plain"); 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 5.1. dmq.list_nodes @@ -474,6 +478,18 @@ ext/plain"); kamcmd dmq.list_nodes ... +5.2. dmq.remove + + Remove a DMQ node by address. + + Parameters: + * address - the SIP address of the DMQ node to remove. + + Example 1.17. dmq.remove usage +... +kamctl rpc dmq.remove sip:1.2.3.4:5060 +... + Chapter 2. Developer Guide Table of Contents

1 0

Branching 5.5 on git repo for 5.5.x releases
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Hello, since freezing the development for 5.5 series, I did quite a lot of code analyzing with a bunch of tools as well as run various tests, no major issue being in my list at this moment, therefore I think we can plan branching 5.5 on git repo in the near future. If there is no other suggestion or argument against it, I propose to create the branch 5.5 on Thursday next week (April 22, 2021). After that, master branch will be open for new features (to become part of 5.6 or what ever version will be decided to be next), testing will continue for branch 5.5 for another 1-2 weeks, then we will release 5.5.0 as first stable version in the 5.5.x series. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:955152db: dmq: added dmq.remove rpc command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 955152dbe5d1f05bf24d6ba23b091fe91a202cc3 URL: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:09:21+02:00 dmq: added dmq.remove rpc command - make it possible to remove a node that still is reachable by old address without having to shut dowm all nodes --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h --- Diff: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Patch: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index fea60e0cc4..1db7cdd1f4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -430,8 +430,29 @@ static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) static const char *dmq_rpc_list_nodes_doc[2] = {"Print all nodes", 0}; +void rpc_dmq_remove(rpc_t* rpc, void* ctx) +{ + str taddr = STR_NULL; + + if (rpc->scan(ctx, ".S", &taddr) < 1) { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(dmq_node_del_by_uri(dmq_node_list, &taddr)<0) { + rpc->fault(ctx, 500, "Failure"); + return; + } +} + +static const char* rpc_dmq_remove_doc[3] = { + "Remove a DMQ node", + "address - the DMQ node address", + 0 +}; + static rpc_export_t rpc_methods[] = { {"dmq.list_nodes", dmq_rpc_list_nodes, dmq_rpc_list_nodes_doc, RET_ARRAY}, + {"dmq.remove", rpc_dmq_remove, rpc_dmq_remove_doc, 0}, {0, 0, 0, 0} }; diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 7e6ef93bdf..631dce11d5 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -350,6 +350,22 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node by uri + */ +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) +{ + dmq_node_t dnode; + + memset(&dnode, 0, sizeof(dmq_node_t)); + if(parse_uri(suri->s, suri->len, &dnode.uri) < 0) { + LM_ERR("error parsing uri [%.*s]\n", suri->len, suri->s); + return -1; + } + + return del_dmq_node(list, &dnode); +} + /** * @brief add dmq node */ diff --git a/src/modules/dmq/dmqnode.h b/src/modules/dmq/dmqnode.h index 45cac604a4..22c5c6fb1d 100644 --- a/src/modules/dmq/dmqnode.h +++ b/src/modules/dmq/dmqnode.h @@ -69,6 +69,7 @@ dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node); dmq_node_t *find_dmq_node_uri(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node_uri2(str *uri); int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node); +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri); int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode); int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status); dmq_node_t *shm_dup_node(dmq_node_t *node);

1 0

git:master:adf8919f: dmq: docs for rpc dmq.remove command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: adf8919f52841800f0cd4528c33679c7ef80f2c5 URL: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:16:21+02:00 dmq: docs for rpc dmq.remove command --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Patch: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0e749e901e..ebc6f44e1a 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -518,6 +518,30 @@ modparam("dmq", "ping_interval", 90) <programlisting format="linespecific"> ... &kamcmd; dmq.list_nodes +... + </programlisting> + </example> + </section> + <section id="dmq.r.list_nodes"> + <title>dmq.remove</title> + <para> + Remove a DMQ node by address. + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>address</emphasis> - the SIP address + of the DMQ node to remove. + </para> + </listitem> + </itemizedlist> + + <example> + <title>dmq.remove usage</title> + <programlisting format="linespecific"> +... +&kamctl; rpc dmq.remove sip:1.2.3.4:5060 ... </programlisting> </example>

1 0

Crashes because of mixed shm and pkg in kamailio
by Rick Barenthin 21 Apr '21

21 Apr '21

Hi everyone, We have seen some crashes in kamailio version 5.3 which happens in some modules who are getting the request for a reply from the transaction by the tm module export and try to parse extra header in this request by the parser functions. This seems to create a mix of shm with pkg which lead to a crash in retransmission. My question is, is there a way to make sure that there is no mix of shm and pkg or is the parsing on the message from the transaction not a planned way of usage? Best regards Rick

3 2

git:master:1b956d74: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 1b956d74b25c9f80f01a6aa0bc7a6ff8f3d0f712 URL: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T11:31:26+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Patch: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff…

1 0

git:master:17e757c9: dmq: docs for server_socket address
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 17e757c91e6e96f6711d9251979d81a792aaef08 URL: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T10:55:18+02:00 dmq: docs for server_socket address --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… Patch: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 20a2e647b3..0e749e901e 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -121,7 +121,12 @@ sip:192.168.40.17:5060;status=active <section id="dmq.p.server_address"> <title><varname>server_address</varname>(str)</title> <para> - The local server address. This is the interface over which the DMQ engine will send/receive messages. + The local server address. This is the addres with which the local DMQ + node joins the servers group to send/receive messages. + </para> + <para> + Note: if server_socket is not set, then this address has to match a + local socket, which will be used to send/receive messages. </para> <para> <emphasis>Default value is <quote>NULL</quote>.</emphasis> @@ -134,6 +139,28 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") ... +</programlisting> + </example> + </section> + <section id="dmq.p.server_socket"> + <title><varname>server_socket</varname>(str)</title> + <para> + The local listen address. This is the interface over which the DMQ + engine will send/receive messages. + </para> + <para> + Note: if this parameter is not set, the socket to send/receice + messages is built from server_address parameter. + </para> + <para> + <emphasis>Default value is <quote>NULL</quote>.</emphasis> + </para> + <example> + <title>Set <varname>server_socket</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq", "server_socket", "udp:10.0.0.20:5060") +... </programlisting> </example> </section>

1 0

git:master:a9a8bb31: dmq: exposed the server socket to modparam list
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: a9a8bb31ed8f3d08579fc1d8b4e3b598c77c93be URL: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T10:49:39+02:00 dmq: exposed the server socket to modparam list --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… Patch: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 27e950e472..fea60e0cc4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -118,6 +118,7 @@ static param_export_t params[] = { {"num_workers", INT_PARAM, &dmq_num_workers}, {"ping_interval", INT_PARAM, &dmq_ping_interval}, {"server_address", PARAM_STR, &dmq_server_address}, + {"server_socket", PARAM_STR, &dmq_server_socket}, {"notification_address", PARAM_STR|USE_FUNC_PARAM, dmq_add_notification_address}, {"notification_channel", PARAM_STR, &dmq_notification_channel}, {"multi_notify", INT_PARAM, &dmq_multi_notify}, @@ -229,10 +230,12 @@ static int mod_init(void) return -1; } - /* create socket string out of the server_uri */ - if(make_socket_str_from_uri(&dmq_server_uri, &dmq_server_socket) < 0) { - LM_ERR("failed to create socket out of server_uri\n"); - return -1; + if(dmq_server_socket.s==NULL || dmq_server_socket.len<=0) { + /* create socket string out of the server_uri */ + if(make_socket_str_from_uri(&dmq_server_uri, &dmq_server_socket) < 0) { + LM_ERR("failed to create socket out of server_uri\n"); + return -1; + } } if(lookup_local_socket(&dmq_server_socket) == NULL) { LM_ERR("server_uri is not a socket the proxy is listening on\n"); @@ -354,9 +357,6 @@ static void destroy(void) dmq_self_node->status = DMQ_NODE_DISABLED; request_nodelist(dmq_notification_node, 1); } - if(dmq_server_socket.s) { - pkg_free(dmq_server_socket.s); - } if(dmq_init_callback_done) { shm_free(dmq_init_callback_done); }

1 0

[kamailio/kamailio] export functions of ims_charging and ims_diameter_server to kemi (#2704)
by Riccardo-78 20 Apr '21

20 Apr '21

#### 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 - [ ] 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  export functions of ims_charging and ims_diameter_server to kemi You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2704 -- Commit Summary -- * Merge pull request #1 from kamailio/master * ims_charging: export functions to kemi * ims_diameter_server: export functions to kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (27) M src/modules/ims_diameter_server/ims_diameter_server.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2704.patch https://github.com/kamailio/kamailio/pull/2704.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2704

2 5

git:master:4436fb7d: ims_charging: export functions to kemi
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 4436fb7dc6bf868f30e9c7bcfd1ad57e49d6be0d URL: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:44:15+02:00 ims_charging: export functions to kemi --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57… Patch: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57…

1 0

git:master:1ddc27f1: ims_diameter_server: export functions to kemi
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 1ddc27f199061025a6a43da3e8a1388fcaddfe19 URL: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:44:15+02:00 ims_diameter_server: export functions to kemi --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388… Patch: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388…

1 0

[kamailio/kamailio] smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() (#2702)
by alexyosifov 20 Apr '21

20 Apr '21

- Added new sms pdu data: originating & destination address flags; SCTS(DELIVER)/VP(SUBMIT) absolute time format. - decode_3gpp_sms(): added support for DELIVER type; Added VP-AbsoluteTimeFormat for SUBMIT type. - pv_sms_body(): added support for ucs2 coding. - Extends of pv_get_sms() and pv_set_sms(): added support for originating & destination address flags.   #### 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) - [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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2702 -- Commit Summary -- * smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() -- File Changes -- M src/modules/smsops/smsops_impl.c (343) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2702.patch https://github.com/kamailio/kamailio/pull/2702.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2702

2 3

git:master:e2b8bdda: smsops: Imrovements in decode_3gpp_sms() and pv_sms_body()
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: e2b8bddad08f12f7eb48db199fad6ed184c58bac URL: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:38:51+02:00 smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() - Added new sms pdu data: originating & destination address flags; SCTS(DELIVER)/VP(SUBMIT) absolute time format. - decode_3gpp_sms(): added support for DELIVER type; Added VP-AbsoluteTimeFormat for SUBMIT type. - pv_sms_body(): added support for ucs2 coding. - Extends of pv_get_sms() and pv_set_sms(): added support for originating & destination address flags. --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed… Patch: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed…

1 0

[kamailio/kamailio] pkg/kamailio/obs: used more recent gcc for RHEL and CentOS dists (#2711)
by sergey-safarov 20 Apr '21

20 Apr '21

#### Pre-Submission Checklist - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] 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 - [*] 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 PR upgraded GCC for RPM packaging. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2711 -- Commit Summary -- * pkg/kamailio/obs: used more recent gcc for RHEL and CentOS dists -- File Changes -- M pkg/kamailio/obs/kamailio.spec (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2711.patch https://github.com/kamailio/kamailio/pull/2711.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2711

3 9

[kamailio/kamailio] rtpengine: session refresh, do not try use other rtpengine node on rtpengine node failure (#2713)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description I want to use Session timers to refresh SDP on RTPengine node failure. If call RTP streams established via first RTPengine node, and then this RTPengine node is stopped, then rtpengine Kamailio module do not try to use other RTPengine nodes. ### Troubleshooting #### Reproduction Update /etc/kamailio/kamailio.cfg using patch like ```diff diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index be71dbb54a..1a6788f79f 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,4 +1,7 @@ #!KAMAILIO +#!define WITH_DEBUG +#!define WITH_NAT +#!define WITH_RTPENGINE # # Kamailio SIP Server v5.5 - default configuration script # - web: https://www.kamailio.org @@ -195,6 +198,8 @@ children=8 * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ # listen=udp:10.0.0.10:5060 +listen=tcp:3.236.25.6:5060 +listen=tcp:[2600:1f18:578:5700::6]:5060 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ @@ -456,7 +461,7 @@ modparam("presence_xml", "force_active", 1) #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- -modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") +modparam("rtpengine", "rtpengine_sock", "udp6:rtp-us-east-1a-6.nga911.com:2223 udp6:rtp-us-east-1a-7.nga911.com:2223") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") @@ -528,6 +533,11 @@ request_route { # handle requests within SIP dialogs route(WITHINDLG); + if (loose_route()) { + route(NATMANAGE); + record_route(); + route(RELAY); + } ### only initial requests (no To tag) # authentication @@ -850,10 +860,11 @@ route[NATMANAGE] { if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE - if(nat_uac_test("8")) { - rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); + if($avp(rtpengine_offer) == "done") { + rtpengine_answer("ICE=remove address-family=IP4 SDES=off"); } else { - rtpengine_manage("replace-origin replace-session-connection"); + rtpengine_offer("ICE=remove address-family=IP6 SDES=off"); + $avp(rtpengine_offer) = "done"; } #!else if(nat_uac_test("8")) { ``` Establish call via this Kamailio. In my case used `Route` header in initial INVITE. When a call is established, then need stop RTPengine daemon on node used for media proxing. Wait when the caller sends a session refresh. According to Kamailio logs not attempt to reach another RTPengine node if the first node not available more. #### Log Messages In [kam.log](https://github.com/kamailio/kamailio/files/6330914/kam.log) please check messages related to ``` Call-ID: 6aac81b6-a028-11eb-8bf8-870daa274dfe CSeq: 34815260 INVITE ``` In log you will find at string 3437 ``` 11(31837) exec: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} *** cfgtrace:dbg_cfg_trace(): branch_route=[NATMANAGE] c=[/root/kamailio/etc/kamailio.cfg] l=866 a=25 n=rtpengine_offer 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine_funcs.c:144]: check_content_type(): type <application/sdp> found valid 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:1834]: build_rtpp_socks(): same rtpengines list version: 1 (1618738091) 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3266]: select_rtpp_node_old(): rtpengine hash table lookup find node=udp6:rtp-us-east-1a-7.nga911.com:2223 for calllen=36 callid=6aac81b6-a028-11eb-8bf8-870daa274dfe viabranch= 11(31837) ERROR: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3027]: send_rtpp_command(): can't send command "offer" to RTPEngine <udp6:rtp-us-east-1a-7.nga911.com:2223> 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:1834]: build_rtpp_socks(): same rtpengines list version: 1 (1618738091) 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3266]: select_rtpp_node_old(): rtpengine hash table lookup find node=udp6:rtp-us-east-1a-7.nga911.com:2223 for calllen=36 callid=6aac81b6-a028-11eb-8bf8-870daa274dfe viabranch= 11(31837) ERROR: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:2664]: rtpp_function_call(): no available proxies ``` At this moment one other RTPengine node is available, but rtpengine Kamailio module does not try to reach this node. #### SIP Traffic [no-rtpengine-swithover.pcap.gz](https://github.com/kamailio/kamailio/files/… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [centos@sbc-a2 ~]$ kamailio -v version: kamailio 5.5.0-pre0 (x86_64/linux) 9413fc flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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: 9413fc compiled on 04:03:33 Apr 3 2021 with gcc 8.3.1 ``` * **Operating System**: ``` [centos@sbc-a2 ~]$ cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2713

2 4

git:master:14019c67: topos: set downstream rr set for replies
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 14019c67d7fcf8f4d027fa1552ae15cb42d31bdb URL: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:16:31+02:00 topos: set downstream rr set for replies --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… Patch: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 384ae1750e..2389026d14 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -548,6 +548,14 @@ int tps_pack_message(sip_msg_t *msg, tps_data_t *ptsd) ptsd->as_contact.len, ZSW(ptsd->as_contact.s), ptsd->as_contact.len, ptsd->bs_contact.len, ZSW(ptsd->bs_contact.s), ptsd->bs_contact.len); ptsd->x_rr = ptsd->a_rr; + if(isreq==0) { + if(msg->first_line.u.reply.statuscode >= 180 + && msg->first_line.u.reply.statuscode < 199) { + /* provisional replies that create early dialogs + * - skip 199 Early Dialog Terminated */ + ptsd->y_rr = ptsd->b_rr; + } + } ptsd->s_method_id = get_cseq(msg)->method_id; if(_tps_context_value.len>0) { ptsd->x_context = _tps_context_value;

1 0

[kamailio/kamailio] absolute dns names trigger error (#2706)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description To avoid extra DNS requests I want to use absolute DNS names instead of relative. To do this I configured ``` modparam("siptrace", "duplicate_uri", "sip:sip-trace6.example.com.:9060" ``` And now I can see errors ``` CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri ``` I am expecting "sip-trace6.example.com." DNS name resolution without errors in Kamailio log. used current master. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2706

2 8

[kamailio/kamailio] rtpengine_manage: send SDP two times (#2715)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description When used `rtpengine_manage` function then `RTPengine` node returns the correct response but in the outbound SIP message, SDP is duplicated. ### Troubleshooting #### Reproduction Updated /etc/kamailio/kamailio.cfg like in this patch. ```diff diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index be71dbb54a..89960b38d8 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,4 +1,7 @@ #!KAMAILIO +#!define WITH_DEBUG +#!define WITH_NAT +#!define WITH_RTPENGINE # # Kamailio SIP Server v5.5 - default configuration script # - web: https://www.kamailio.org @@ -195,6 +198,8 @@ children=8 * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ # listen=udp:10.0.0.10:5060 +listen=tcp:3.236.25.6:5060 +listen=tcp:[2600:1f18:578:5700::6]:5060 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ @@ -456,7 +461,7 @@ modparam("presence_xml", "force_active", 1) #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- -modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") +modparam("rtpengine", "rtpengine_sock", "udp6:rtp-us-east-1a-6.nga911.com:2223 udp6:rtp-us-east-1a-7.nga911.com:2223") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") @@ -528,6 +533,11 @@ request_route { # handle requests within SIP dialogs route(WITHINDLG); + if (loose_route()) { + route(NATMANAGE); + record_route(); + route(RELAY); + } ### only initial requests (no To tag) # authentication @@ -850,10 +860,11 @@ route[NATMANAGE] { if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE - if(nat_uac_test("8")) { - rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); + if($avp(rtpengine_offer) == "done") { + rtpengine_manage("ICE=remove address-family=IP4 SDES=off"); } else { - rtpengine_manage("replace-origin replace-session-connection"); + rtpengine_manage("ICE=remove address-family=IP6 SDES=off"); + $avp(rtpengine_offer) = "done"; } #!else if(nat_uac_test("8")) { ``` Make a call via Kamailio node. In my case used a call with "Route" headers. #### Log Messages In Kamailio [rtpengine_manage.log](https://github.com/kamailio/kamailio/files/6331086/rt…, you will find the correct RTPengine response, like: ``` 9(32302) DEBUG: {1 34817407 INVITE 6b2a7c4c-a032-11eb-8c29-870daa274dfe} rtpengine [rtpengine.c:2677]: rtpp_function_call(): proxy reply: d3:sdp599:v=0^M o=2600hz 1618708279 1618708280 IN IP4 192.168.2.10^M s=2600hz^M c=IN IP6 2600:1f18:578:5700::1:e^M t=0 0^M m=audio 16476 RTP/AVP 0 8 102 9 3 103 101 13 104 105^M a=rtpmap:0 PCMU/8000^M a=rtpmap:8 PCMA/8000^M a=rtpmap:102 opus/48000/2^M a=fmtp:102 useinbandfec=1; maxaveragebitrate=30000; maxplaybackrate=48000; ptime=20; minptime=10; maxptime=40^M a=rtpmap:9 G722/8000^M a=rtpmap:3 GSM/8000^M a=rtpmap:103 SPEEX/8000^M a=rtpmap:101 telephone-event/8000^M a=fmtp:101 0-16^M a=rtpmap:13 CN/8000^M a=rtpmap:104 telephone-event/48000^M a=fmtp:104 0-16^M a=rtpmap:105 CN/48000^M a=sendrecv^M a=rtcp:16477^M a=ptime:20^M ``` But SIP message will have duplicated SDP. #### SIP Traffic [rtpengine_manage.pcap.gz](https://github.com/kamailio/kamailio/files/633108… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [centos@sbc-a2 ~]$ kamailio -v version: kamailio 5.5.0-pre0 (x86_64/linux) 9413fc flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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: 9413fc compiled on 04:03:33 Apr 3 2021 with gcc 8.3.1 ``` * **Operating System**: ``` [centos@sbc-a2 ~]$ cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2715

2 2

git:master:6d05333a: secsipid: propagate return code from lib functions
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 6d05333adee28da347e56d71a8e309698ec9c6a3 URL: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T10:35:50+02:00 secsipid: propagate return code from lib functions --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… Patch: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 4390e73fae..7553e8ede7 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -223,7 +223,7 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) } LM_DBG("identity check: failed\n"); - return -1; + return ret; } /** @@ -281,7 +281,7 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) } LM_DBG("identity check: failed\n"); - return -1; + return ret; } /** @@ -466,7 +466,7 @@ static sr_kemi_xval_t* ki_secsipid_get_url(sip_msg_t *msg, str *surl) */ static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *povar) { - int r; + int ret; pv_spec_t *ovar; pv_value_t val; str surl = {NULL, 0}; @@ -484,10 +484,10 @@ static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *povar) _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, secsipid_cache_expire); } - r = _secsipid_papi.SecSIPIDGetURLContent(surl.s, secsipid_timeout, + ret = _secsipid_papi.SecSIPIDGetURLContent(surl.s, secsipid_timeout, &_secsipid_get_url_val.s, &_secsipid_get_url_val.len); - if(r!=0) { - return -1; + if(ret!=0) { + return ret; } ovar = (pv_spec_t *)povar;

1 0

git:master:d80abf80: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: d80abf806a1643a704057ea383d47004cdb2ba9b URL: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-20T08:46:21+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… Patch: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… --- diff --git a/src/modules/lcr/README b/src/modules/lcr/README index 2ac22a3f4a..56a9ee4658 100644 --- a/src/modules/lcr/README +++ b/src/modules/lcr/README @@ -725,7 +725,7 @@ modparam("lcr", "lcr_count", 10) Example 1.29. Setting gw_uri_avp module parameter ... -modparam("lcr", "gw_uri_avp", "$avp(i:709)") +modparam("lcr", "gw_uri_avp", "$avp(lcr_gwuri)") ... 3.30. ruri_user_avp (AVP string) @@ -738,7 +738,7 @@ modparam("lcr", "gw_uri_avp", "$avp(i:709)") Example 1.30. Setting ruri_user_avp module parameter ... -modparam("lcr", "ruri_user_avp", "$avp(i:500)") +modparam("lcr", "ruri_user_avp", "$avp(lcr_ruri_user)") ... 3.31. tag_avp (AVP string) @@ -764,7 +764,7 @@ modparam("lcr", "tag_avp", "$avp(lcr_tag)") Example 1.32. Setting flags_avp module parameter ... -modparam("lcr", "flags_avp", "$avp(i:712)") +modparam("lcr", "flags_avp", "$avp(lcr_flags)") ... 3.33. rule_id_avp (AVP string) @@ -776,9 +776,9 @@ modparam("lcr", "flags_avp", "$avp(i:712)") not stored anywhere. Example 1.33. Setting rule_id_avp module parameter - ... - modparam("lcr", "rule_id_avp", "$avp(i:712)") - ... +... +modparam("lcr", "rule_id_avp", "$avp(lcr_ruleid)") +... 3.34. mt_pv_values (AVP string) @@ -792,7 +792,7 @@ modparam("lcr", "flags_avp", "$avp(i:712)") Example 1.34. Setting tag_avp module parameter ... -modparam("lcr", "mt_pv_values", "$avp(mt_values)") +modparam("lcr", "mt_pv_values", "$avp(lcr_mt_values)") ... 3.35. mtree (string) @@ -828,7 +828,7 @@ modparam("lcr", "defunct_capability", 1) Example 1.37. Setting lcr_id_avp module parameter ... -modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") +modparam("lcr", "lcr_id_avp", "$avp(lcr_id)") ... 3.38. defunct_gw_avp (AVP string) @@ -841,7 +841,7 @@ modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") Example 1.38. Setting defunct_gw_avp module parameter ... -modparam("lcr", "defunct_gw_avp", "$avp(s:defunct_gw_avp)") +modparam("lcr", "defunct_gw_avp", "$avp(lcr_defunct_gw)") ... 3.39. lcr_rule_hash_size (integer) @@ -1122,7 +1122,7 @@ defunct_gw(60); Example 1.54. from_gw usage ... -if (from_gw(1, $avp(s:real_source_addr), 2) { +if (from_gw(1, $avp(real_source_addr), 2) { ... }; ...

1 0

git:master:053a727a: lcr: docs - use string avps in examples
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 053a727aa5d41cfbb0800b8ab532aa3f3f7689ec URL: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T08:35:13+02:00 lcr: docs - use string avps in examples - more coherent examples, one example was also conflicting by using same id - removed trailing white spaces and aligned examples --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3… Patch: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3…

1 0

DMQ design issues and incurring problems
by Daniel-Constantin Mierla 19 Apr '21

19 Apr '21

Hello, as I added support for other transports (tcp, tls, ...) to DMQ inter-nodes communications and trying to configure it for a few testing scenarios, I ended up in some design issues/limitations. Two of them seem to prevent usual operations, therefore I want to get more opinions and see what would be the best way to go further. 1) there is no decoupling between server_address and server socket. The server socket is kept internally, but it is built from server_address parameter. The actual problem appears when trying to use FQDN as notification_address, because it ends up to have duplicate peer addresses for the same node. For example: - server1 with ip 1.2.3.4 and domain server1.sip.com - server2 with ip 5.6.7.8 and domain server2.sip.com On server1: modparam("dmq", "server_address", "sip:1.2.3.4:5060") modparam("dmq", "notification_address", "sip:server2.sip.com:5060") On server2: modparam("dmq", "server_address", "sip:5.6.7.8:5060") modparam("dmq", "notification_address", "sip:server1.sip.com:5060") Then each node end ups with 4 peer nodes. On server1: - sip:1.2.3.4:5060 (local=1) - sip:server1.sip.com:5060 (local=0) - sip:5.6.7.8:5060 (local=0) - sip:server2.sip.com:5060 (local=0) On server2: - sip:1.2.3.4:5060 (local=0) - sip:server1.sip.com:5060 (local=0) - sip:5.6.7.8:5060 (local=1) - sip:server2.sip.com:5060 (local=0) Practically each server considers the local FQDN being a remote peer. There are KDMQ requests sent to itself, but a real problematic issue is that presence replication (as I tested, could be for the other modules as well) is broken, because instead of an update it happens a replace. The case was a PUBLISH with body having state open, then in 30sec there is an PUBLISH to refresh using same ETag and empty body (as per spec), but instead of just updating the expires value, it also updates the body to empty string. If notification_address is using IP address instead of FQDN of the other server, everything works as expected, with body being kept on refresh and only expires being updated. The looping/spiralling is overwriting the purpose of the KDMQ replication action. Use of FQDN is needed for TLS transport in order to be able to validate the domain against the attributes in certificate. Currently it does not work to have server_address with FQDN (maybe it would work with advertise address to listen, but that will force to use for SIP headers, which is not wanted). To solve it I would introduce server_socket modparam, which if it is not set, then it is computed from server_address like for now. This keeps backward compatibility. 2) The second issue is a bit related. As there was a need to remove the FQDN and change the notification_address to be with the IP of the other node, I restarted each node, but the FQDNs stayed there, because after the restart of the server 1, it got the list with FQDNs from the server 2. Then restarting the server 2, ended up by sync'ing with server 1 and receiving again all the addresses. Practically the solution was to shut down all the nodes, which is something one is likely not wanting to do, because the entire platform is down with no active node, and even if it is for short time, for cases when data is only in memory (e.g., htable items, or in-memory only presence) everything is lost. In other words, there is no way to remove a peer address that still points to an active node but it is no longer wanted, because it persists in the other running nodes. Could be also the case of changing the domain to be used for notification address. This issue leads to the 1), because one node then appears many times (old FQDN and new FQDN), leading to loops/spirals with unwanted/broken side effects. I haven't thought much of it, but one solution could be an RPC command to be able to remove unwanted addresses from list of peers. It still can be a race of sync'ing immediately after removing via rpc, before being able to remove from the other node, but then one can check with rpc dmq.list_nodes and re-run the rpc command if it is the case. Given that Kamailio is in testing phase for 5.5, I want to see if anyone thinks of other solutions to fix this issues without introducing a new parameter (again, with backward compatibility) and a new rpc command (which does not have effect in breaking existing behaviour). Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:38692da8: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: 38692da8abff093b45f5a50994b7a95e5aa515f9 URL: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-19T10:16:20+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… Patch: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index e92e50ada6..14cf3b36a6 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -239,7 +239,7 @@ Chapter 1. Admin Guide findService contains only one location, which is selected via this parameter as follows: * 0 - takes the first location of any type - * 1 - takes the last last of any type + * 1 - takes the last location of any type * 2 - takes the first geodetic location * 3 - takes the first civic location

1 0

git:master:b0ee86a7: lost: doc - typo removed
by Wolfgang Kampichler 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: b0ee86a7b8ab6866b40320c1141bf95aec5d2071 URL: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-19T10:13:13+02:00 lost: doc - typo removed --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… Patch: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 1df4aefd21..7f4597632b 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -211,7 +211,7 @@ <emphasis>0</emphasis> - takes the first location of any type </para></listitem> <listitem><para> - <emphasis>1</emphasis> - takes the last last of any type + <emphasis>1</emphasis> - takes the last location of any type </para></listitem> <listitem><para> <emphasis>2</emphasis> - takes the first geodetic location

1 0

[kamailio/kamailio] domain: fix use after free on domain reload (#2712)
by Mancaș George 19 Apr '21

19 Apr '21

#### Pre-Submission Checklist - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] Each component has a single commit (if not, squash them into one commit) - [*] 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 - [*] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I observed this when glancing over commit https://github.com/kamailio/kamailio/commit/f50177003c21f53564be6349c0bb493… The invalid access is pretty clear, and so is the fix. Cheers! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2712 -- Commit Summary -- * domain: fix use after free on domain reload -- File Changes -- M src/modules/domain/hash.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2712.patch https://github.com/kamailio/kamailio/pull/2712.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2712

2 2

git:master:62d981da: Merge pull request #2712 from mancasg/patch-1
by GitHub 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: 62d981daa5d8d61f3f4f72996a613b8ad8e88f26 URL: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: GitHub <noreply(a)github.com> Date: 2021-04-19T08:20:20+02:00 Merge pull request #2712 from mancasg/patch-1 domain: fix use after free on domain reload --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… Patch: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 4cb968e458..b085d8f9cb 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,8 +204,9 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + next = np->next; shm_free(np); - np = np->next; + np = next; } hash_table[DOM_HASH_SIZE] = NULL;

1 0

git:master:207d7ada: domain: fix use after free on domain reload
by GitHub 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: 207d7adae4ca5d9a197c38ae333ff98124c01b47 URL: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… Author: MancaÈ George <mancasg(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-04-16T19:26:35+03:00 domain: fix use after free on domain reload --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… Patch: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 4cb968e458..b085d8f9cb 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,8 +204,9 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + next = np->next; shm_free(np); - np = np->next; + np = next; } hash_table[DOM_HASH_SIZE] = NULL;

1 0

git:master:d02c0422: lost: fixing a memory leak and minor code refactoring and improvements
by Wolfgang Kampichler 18 Apr '21

18 Apr '21

Module: kamailio Branch: master Commit: d02c042259a5a0e7bdcc359f5de20c68af6b4211 URL: https://github.com/kamailio/kamailio/commit/d02c042259a5a0e7bdcc359f5de20c6… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-18T18:08:13+02:00 lost: fixing a memory leak and minor code refactoring and improvements --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/lost.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/d02c042259a5a0e7bdcc359f5de20c6… Patch: https://github.com/kamailio/kamailio/commit/d02c042259a5a0e7bdcc359f5de20c6…

1 0

Info: regression for AVP with integer ID on v5.4.5
by Daniel-Constantin Mierla 16 Apr '21

16 Apr '21

Hello, a notification to inform about a regression to the AVPs with the integer IDs that was introduced in the v5.4.5 release when trying to fix an issue reported from a static code analyzer/fuzzer. The workaround is to use string names for AVPs, so if you have AVPs like $avp(i:123), they can be changed to $avp(s:123) in the kamailio.cfg (ie., replace i: with s: ). Regression is already fixed in the git branch 5.4, so if you install it from there, all should be ok. For Debian packages, you can wait till tomorrow and use the nightly builds of 5.4.x series from the repos listed at: * http://deb.kamailio.org/#dev54 Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

RHEL 6 and CentOS 6 deprecated
by Sergey Safarov 16 Apr '21

16 Apr '21

I try to refresh the build image for CentOS 6 and can't do it now. This directory (and version of CentOS) is deprecated. Please see this FAQ concerning the CentOS release scheme: https://wiki.centos.org/FAQ/General Please keep in mind that 6.0, 6.1, 6.2, 6.3, 6.4 , 6.5, 6.6, 6.7, 6.8 , 6.9 and 6.10 no longer get any updates, nor any security fix's. The whole CentOS 6 is *dead* and *shouldn't* be used anywhere at *all* http://mirror.centos.org/centos/6/readme What our plans about Kamailio releases for RHEL 6 and Cent 6 dists?

2 1

git:master:2df6f9d6: pkg/kamailio/obs: added lwsc module packaging
by Sergey Safarov 16 Apr '21

16 Apr '21

Module: kamailio Branch: master Commit: 2df6f9d6cb74bc115206e8b200af7234267f74d5 URL: https://github.com/kamailio/kamailio/commit/2df6f9d6cb74bc115206e8b200af723… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-16T15:28:43+03:00 pkg/kamailio/obs: added lwsc module packaging --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2df6f9d6cb74bc115206e8b200af723… Patch: https://github.com/kamailio/kamailio/commit/2df6f9d6cb74bc115206e8b200af723… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 29d074cac4..4f5a833a57 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -661,6 +661,16 @@ Lua extensions for Kamailio. %endif +%package lwsc +Summary: Websocket client implementation to interact with external systems, similar to http client +Group: %{PKGGROUP} +Requires: libwebsockets, kamailio = %ver +BuildRequires: libwebsockets-devel + +%description lwsc +Websocket client implementation to interact with external systems, similar to http client. + + %if %{with memcached} %package memcached Summary: Memcached configuration file support for Kamailio @@ -1178,6 +1188,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with lua} klua \ %endif + klwsc \ %if %{with memcached} kmemcached \ %endif @@ -1270,6 +1281,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with lua} klua \ %endif + klwsc \ %if %{with memcached} kmemcached \ %endif @@ -1932,6 +1944,11 @@ fi %endif +%files lwsc +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.lwsc +%{_libdir}/kamailio/modules/lwsc.so + %if %{with memcached} %files memcached %defattr(-,root,root)

1 0

[kamailio/kamailio] kamailio 5.4.5: "0 ID or NULL NAME AVP!" in lcr module (#2709)
by mdyrna 16 Apr '21

16 Apr '21

### Description  After upgrading kamailio from 5.4.4 to 5.4.5, the lcr module logs an error for outgoing calls. load_gws returns success (1), but does not populate the avps. Consequently, next_gw fails. ### Troubleshooting #### Reproduction  kamailio.cfg: ``` loadmodule "lcr.so" ... modparam("lcr", "db_url", "cluster://cls1") modparam("lcr", "gw_uri_avp", "$avp(i:709)") modparam("lcr", "ruri_user_avp", "$avp(i:500)") modparam("lcr", "tag_avp", "$avp(lcr_tag)") modparam("lcr", "flags_avp", "$avp(i:712)") modparam("lcr", "defunct_capability", 1) modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") modparam("lcr", "defunct_gw_avp", "$avp(s:defunct_gw_avp)") modparam("lcr", "ping_interval", 60) ... route[LCR] { if(!($rU=~"^[+0-9]")) return; if(is_method("INVITE")) { if (!($fU=~"^[+0-9]+$")) { append_hf("P-Asserted-Identity: <sip:+49xxxxxxxxxxx@xxxxx.de>\n"); append_hf("Privacy: id\n"); $fn = "Anonymous"; $fu = "sip:+49xxxxxxxxxxx@xxxxx.de"; } if(load_gws(1, $rU, $var(caller_uri)) != 1) { xlog("L_ERROR", "Couldn't load gateways\n"); sl_send_reply("500", "Server Internal Error - Cannot load gateways"); exit; } else { xlog("L_INFO", "GW Selected '$avp(i:709)'\n"); xlog("L_INFO", "Domain of destination: $dd\n"); xlog("L_INFO", "To URI: $tu\n"); } if(!next_gw()) { xlog("L_WARN", "No gateway configured for $rU\n"); sl_send_reply("503", "Service not available, no gateways found"); exit; } else { xlog("L_INFO", "Calling the first matched gateway\n"); xlog("L_INFO", "ruri_user_avp: '$avp(i:500)'\n"); xlog("L_INFO", "To URI after next_gw: $tu\n"); xlog("L_INFO", "Request URI: $ru\n"); } t_on_failure("MANAGE_FAILURE_LCR"); route(RELAY); exit; } } ``` #### Debugging Data  #### Log Messages  ``` Apr 15 20:59:27 x /usr/sbin/kamailio[879]: ERROR: <core> [core/usr_avp.c:152]: create_avp(): 0 ID or NULL NAME AVP! Apr 15 20:59:27 x /usr/sbin/kamailio[879]: ERROR: <core> [core/usr_avp.c:152]: create_avp(): 0 ID or NULL NAME AVP! Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: GW Selected '<null>' Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: Domain of destination: <null> Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: To URI: sip:+49177xxxxxxx@xx.xxx.x.xxx:5060 Apr 15 20:59:27 x /usr/sbin/kamailio[879]: WARNING: <script>: No gateway configured for +49177xxxxxxx ``` #### SIP Traffic  SIP request: ``` INVITE sip:+49177xxxxxxx@xx.xx.xx.xxx:5060 SIP/2.0 Via: SIP/2.0/UDP xxx.xx.xx.xxx:xxxxx;branch=z9hG4bK5d833a50 Max-Forwards: 70 From: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx>;tag=as18ff0d47 To: <sip:+49177xxxxxxx@xx.xx.xx.xxx:5060> Contact: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx> Call-ID: 7489c50703b43b2f03980574181a2f81@xxx.xx.xx.xxx:xxxxx CSeq: 102 INVITE User-Agent: Asterisk PBX 13.18.3~dfsg-1ubuntu4 Date: Thu, 15 Apr 2021 21:52:42 GMT Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer Content-Type: application/sdp Content-Length: 952 ... ``` SIP reply: ``` SIP/2.0 503 Service not available, no gateways found Via: SIP/2.0/UDP xxx.xx.xx.xxx:xxxxx;branch=z9hG4bK5d833a50;rport=50060;received=xx.xx.xx.xxx From: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx>;tag=as18ff0d47 To: <sip:+49177xxxxxxx@xx.xx.xx.xxx:5060>;tag=6a823999ce344a0b461cf8d85d526103.51611a36 Call-ID: 7489c50703b43b2f03980574181a2f81@xxx.xx.xx.xxx:xxxxx CSeq: 102 INVITE Server: kamailio (5.4.5 (x86_64/linux)) Content-Length: 0 ``` ### Possible Solutions  As a workaround, I downgraded to kamailio 5.3.8 because the previous Ubuntu release 5.4.4 is not available anymore at http://deb.kamailio.org/kamailio54/pool/main/k/kamailio/ (why actually?) ### Additional Information * **Kamailio Version** 5.4.5 * **Operating System**: Ubuntu 18.04  ### Root Cause Assumption https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… might be involved in the issue. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2709

2 5

fresh GCC
by Sergey Safarov 16 Apr '21

16 Apr '21

I have created a pull request that allows the use of fresh GCC for the FreeSwitch project. https://github.com/signalwire/freeswitch/pull/1161 Think we can use the same approach to use fresh GCC for the Kamailio project. For RHEL based dist and old Debian dest. Is it a useful approach to use fresh GCC to build a master branch? Sergey

2 2

git:5.4:967dd294: core: usr avp - fix detection of invalid name and ids
by Daniel-Constantin Mierla 16 Apr '21

16 Apr '21

Module: kamailio Branch: 5.4 Commit: 967dd294ba424bf66e27bebe4d6261e0c8a66471 URL: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-16T09:58:16+02:00 core: usr avp - fix detection of invalid name and ids - use the fields designated for str name or int id, code analyzers can follow properly the execution path - regression introduced in ca1821837dfe7dd6630f628d968ed4d1178c7040 (cherry picked from commit e4506385ca5a56d4861f36e85c1049599cba398f) --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… Patch: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index e80e52d79d..8d8fa34603 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,16 +148,11 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == NULL || name.s.len == 0) { - LM_ERR("0 ID or NULL NAME AVP!"); - goto error; - } - /* compute the required mem size */ len = sizeof(struct usr_avp); if (flags&AVP_NAME_STR) { if ( name.s.s==0 || name.s.len==0) { - LM_ERR("EMPTY NAME AVP!"); + LM_ERR("NULL or EMPTY NAME AVP!"); goto error; } if (flags&AVP_VAL_STR) { @@ -168,8 +163,14 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) len += sizeof(struct str_int_data)-sizeof(union usr_avp_data) + name.s.len + 1; /* Terminating zero for regex search */ } - } else if (flags&AVP_VAL_STR) { - len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } else { + if(name.n==0) { + LM_ERR("0 ID AVP!"); + goto error; + } + if (flags&AVP_VAL_STR) { + len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } } avp = (struct usr_avp*)shm_malloc( len );

1 0

git:master:e4506385: core: usr avp - fix detection of invalid name and ids
by Daniel-Constantin Mierla 16 Apr '21

16 Apr '21

Module: kamailio Branch: master Commit: e4506385ca5a56d4861f36e85c1049599cba398f URL: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-16T09:56:11+02:00 core: usr avp - fix detection of invalid name and ids - use the fields designated for str name or int id, code analyzers can follow properly the execution path - regression introduced in ca1821837dfe7dd6630f628d968ed4d1178c7040 --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… Patch: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index e80e52d79d..8d8fa34603 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,16 +148,11 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == NULL || name.s.len == 0) { - LM_ERR("0 ID or NULL NAME AVP!"); - goto error; - } - /* compute the required mem size */ len = sizeof(struct usr_avp); if (flags&AVP_NAME_STR) { if ( name.s.s==0 || name.s.len==0) { - LM_ERR("EMPTY NAME AVP!"); + LM_ERR("NULL or EMPTY NAME AVP!"); goto error; } if (flags&AVP_VAL_STR) { @@ -168,8 +163,14 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) len += sizeof(struct str_int_data)-sizeof(union usr_avp_data) + name.s.len + 1; /* Terminating zero for regex search */ } - } else if (flags&AVP_VAL_STR) { - len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } else { + if(name.n==0) { + LM_ERR("0 ID AVP!"); + goto error; + } + if (flags&AVP_VAL_STR) { + len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } } avp = (struct usr_avp*)shm_malloc( len );

1 0

git:master:e016cb1b: pkg/kamailio/deb: add lwcs module
by Victor Seva 16 Apr '21

16 Apr '21

Module: kamailio Branch: master Commit: e016cb1bdb2837437663a4c24b104b40e9191eba URL: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T13:46:50+02:00 pkg/kamailio/deb: add lwcs module * enable only the ones with libwebsockets >= 3.1 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4… Patch: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4…

1 0

[CRON] Errored: dbank888/kamailio#132 (master - 491e19e)
by Travis CI 15 Apr '21

15 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #132 Status: Errored Duration: 5 mins and 20 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/767207396?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Kamailio v5.4.5 Released
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Hello, Kamailio SIP Server v5.4.5 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.5. For more details about version 5.4.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/04/kamailio-v5-4-5-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.4:c4634265: ChangeLog: content updated for v5.4.5
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: c46342653c6a1c614d43ce31e791bffe30237be8 URL: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T12:23:40+02:00 ChangeLog: content updated for v5.4.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff… Patch: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff…

1 0

git:5.4:30a0d84d: Makefile.defs: version set to 5.4.5
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 30a0d84d1aae953bca79d38a5bda3523e896c59a URL: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T11:57:50+02:00 Makefile.defs: version set to 5.4.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… Patch: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c51796568d..621f646b23 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:master:80689e22: pv_headers: safety check for xavi key count
by Victor Seva 15 Apr '21

15 Apr '21

Module: kamailio Branch: master Commit: 80689e22bc83aff78d8fd53d4a33bcb68c913c19 URL: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T11:41:20+02:00 pv_headers: safety check for xavi key count * check that we have keys to put into the hash before allocating anything * check table field instead of size just to make analyzer happy --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… Patch: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 90feddeefd..7afc39d1a8 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -174,6 +174,10 @@ int pvh_apply_headers(struct sip_msg *msg) return -1; } keys_count = pvh_xavi_keys_count(&sub); + if(keys_count <= 0) { + LM_ERR("no keys found: %.*s\n", xavi_name.len, xavi_name.s); + return -1; + } if(str_hash_alloc(&rm_hdrs, keys_count) < 0) { PKG_MEM_ERROR; return -1; @@ -294,7 +298,7 @@ int pvh_apply_headers(struct sip_msg *msg) res = 1; err: - if(rm_hdrs.size) + if(rm_hdrs.table) pvh_str_hash_free(&rm_hdrs); return res; }

1 0

git:5.4:38d72250: core: main - set ending 0 in allocated cfg file path
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 38d72250f4c9c77bee71262b6c340503cc9a92a2 URL: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T10:29:43+02:00 core: main - set ending 0 in allocated cfg file path (cherry picked from commit 15f57ceae26b967ad92dd3a97ebcd869d1197244) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… Patch: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… --- diff --git a/src/main.c b/src/main.c index ad83cff3a8..3a67f841e6 100644 --- a/src/main.c +++ b/src/main.c @@ -1281,7 +1281,7 @@ int fix_cfg_file(void) } if ((res = malloc(cfg_len + 1)) == NULL) goto error; memcpy(res, cfg_file, cfg_len); - cfg_file[cfg_len] = 0; + res[cfg_len] = 0; cfg_file = res; return 0; }

1 0

git:master:15f57cea: core: main - set ending 0 in allocated cfg file path
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: master Commit: 15f57ceae26b967ad92dd3a97ebcd869d1197244 URL: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T10:28:24+02:00 core: main - set ending 0 in allocated cfg file path --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… Patch: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… --- diff --git a/src/main.c b/src/main.c index 405b442158..71a024d5bb 100644 --- a/src/main.c +++ b/src/main.c @@ -1288,7 +1288,7 @@ int fix_cfg_file(void) } if ((res = malloc(cfg_len + 1)) == NULL) goto error; memcpy(res, cfg_file, cfg_len); - cfg_file[cfg_len] = 0; + res[cfg_len] = 0; cfg_file = res; return 0; }

1 0

git:5.4:3a9cf652: pkg/kamailio/deb: version set 5.4.5
by Victor Seva 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 3a9cf652716fdc3f5a679cf79c704daf43ac8783 URL: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T09:51:16+02:00 pkg/kamailio/deb: version set 5.4.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/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/3a9cf652716fdc3f5a679cf79c704da… Patch: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da…

1 0

git:5.4:9e6d4182: pkg/kamailio: version set to 5.4.5 for rpm specs and alpine
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 9e6d418212171f84236af4d537bae973de879fa9 URL: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T09:41:16+02:00 pkg/kamailio: version set to 5.4.5 for rpm specs and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… Patch: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 913168c652..e6576c616a 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.4.4 +pkgver=5.4.5 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 0bd9c0238a..ba4cb80618 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.4 +%define ver 5.4.5 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.4:1e6561f8: core: resolve - safety check for setting port
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 1e6561f86d4a139834952ff21b74ecca0b508966 URL: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:40+02:00 core: resolve - safety check for setting port (cherry picked from commit 703d6202e73e4e3778a2c66f4e29ae87dc6ac211) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… Patch: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 3796f05ceb..cfed6b5e1d 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1211,7 +1211,7 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto, * and *proto!=0 or port==0 && proto==0) * when performing SRV lookup (*port==0) it will use *proto to look for * tcp or udp hosts, otherwise proto is unused; if proto==0 => no SRV lookup - * If zt is set, name will be assumed to be 0 terminated and some copy + * If zt is set, name will be assumed to be 0 terminated and some copy * operations will be avoided. * If is_srv is set it will assume name has the srv prefixes for sip already * appended and it's already 0-term'ed; if not it will append them internally. @@ -1299,7 +1299,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, do_srv: /* try to find the SRV records inside previous ARs first*/ for (l=ars; l; l=l->next){ - if (l->type!=T_SRV) continue; + if (l->type!=T_SRV) continue; srv=(struct srv_rdata*) l->rdata; if (srv==0){ LM_CRIT("null rdata\n"); @@ -1311,7 +1311,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("found SRV(%s) = %s:%d in AR\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1330,7 +1330,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("SRV(%s) = %s:%d\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1342,7 +1342,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, goto end; } /* cleanup on exit */ - LM_DBG("no SRV record found for %.*s," + LM_DBG("no SRV record found for %.*s," " trying 'normal' lookup...\n", name->len, name->s); } }

1 0

git:5.4:e5de8af6: avp: check for null string
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: e5de8af690af460f086c6191a7502c903ca55699 URL: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:14+02:00 avp: check for null string (cherry picked from commit c30cd3db7587a3c875770fbc558f4a5ad38b58bd) --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… Patch: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f11d56baeb..63ce537d7a 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1359,7 +1359,7 @@ static int attr_hdr_body2attrs(struct sip_msg* m, char* header_, char* prefix_) } }; } - if (s.len && s.s[0] == header->field_delimiter) { + if (s.len && s.s && s.s[0] == header->field_delimiter) { s.s++; s.len--; }

1 0

git:5.4:98b091d1: seas: check when walking the list
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 98b091d16072bc767affde805c30c7ec4911b9ec URL: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:23+02:00 seas: check when walking the list (cherry picked from commit 7231be0785009cb17581822f0765985eb7bdb243) --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… Patch: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index cd62848ab0..83be6307d0 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -1329,8 +1329,12 @@ int extract_allowed_headers(struct sip_msg *my_msg,int strip_top_vias,int allow_ }else{ assert(rtcnt>0); rb=hf->parsed; - while(--rtcnt) + while(rb && --rtcnt) rb=rb->next; + if(!rb) { + LM_ERR("no rr\n"); + goto error; + } k= (((rb->nameaddr.name.s) + rb->len)-hf->name.s) ; if(len+k+CRLF_LEN<headers_len){ memcpy(headers+len,hf->name.s,k);

1 0

git:5.4:a10a7b5b: core: updated onsend_route_enabled() macro condtition
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: a10a7b5ba0cba5c268ff04a71bdf318e05dd0068 URL: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:32+02:00 core: updated onsend_route_enabled() macro condtition - detect when the kemi callbacks need to be executed for tm replies (cherry picked from commit 0640645efdbc1f7ce36750d5a784a4cfedc3f02f) --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… Patch: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index 744becedce..a78927c190 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -57,7 +57,9 @@ extern onsend_info_t* p_onsend; * WARNING: buf must be 0 terminated (to allow regex matches on it) */ int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, char* buf, int len); -#define onsend_route_enabled(rtype) (onsend_rt.rlist[DEFAULT_RT]?((rtype==SIP_REPLY)?onsend_route_reply:1):0) +#define onsend_route_enabled(rtype) ((onsend_rt.rlist[DEFAULT_RT]? \ + ((rtype==SIP_REPLY)?onsend_route_reply:1):0) \ + || (kemi_onsend_route_callback.len>0 && sr_kemi_eng_get())) int run_onsend_evroute(onsend_info_t *sndinfo, int evrt, str *evcb, str *evname);

1 0

git:5.4:681952d1: sca: return on rpc fault
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 681952d1f1fc5d0226f4a7adb99e7cfefef8727b URL: https://github.com/kamailio/kamailio/commit/681952d1f1fc5d0226f4a7adb99e7cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:47+02:00 sca: return on rpc fault (cherry picked from commit 005f4468bc5873ea02b6c0d3d75baa49067e17c9) --- Modified: src/modules/sca/sca_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/681952d1f1fc5d0226f4a7adb99e7cf… Patch: https://github.com/kamailio/kamailio/commit/681952d1f1fc5d0226f4a7adb99e7cf… --- diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index f1882fa879..c3b9b0f2ba 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -184,6 +184,7 @@ void sca_rpc_deactivate_all_subscriptions(rpc_t *rpc, void *ctx) if((ht = sca->subscriptions) == NULL) { rpc->fault(ctx, 500, "Empty subscription table!"); + return; } for(i = 0; i < ht->size; i++) {

1 0

git:5.4:95bbb4f0: group: check if credentials are parsed
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 95bbb4f0b1784a20db5c76fdbdd4fc58a2250b6d URL: https://github.com/kamailio/kamailio/commit/95bbb4f0b1784a20db5c76fdbdd4fc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:56+02:00 group: check if credentials are parsed (cherry picked from commit e84c1985f1c3ed7a791660702b398b9ac1eb1f4a) --- Modified: src/modules/group/group.c --- Diff: https://github.com/kamailio/kamailio/commit/95bbb4f0b1784a20db5c76fdbdd4fc5… Patch: https://github.com/kamailio/kamailio/commit/95bbb4f0b1784a20db5c76fdbdd4fc5… --- diff --git a/src/modules/group/group.c b/src/modules/group/group.c index 329587a69c..af1c62c0f3 100644 --- a/src/modules/group/group.c +++ b/src/modules/group/group.c @@ -54,7 +54,7 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, { struct sip_uri puri; struct sip_uri *turi; - struct hdr_field* h; + struct hdr_field* h = 0; struct auth_body* c = 0; pv_value_t value; @@ -89,15 +89,20 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, get_authorized_cred( msg->proxy_auth, &h); if (!h) { LM_ERR("no authorized credentials found " - "(error in scripts)\n"); + "(error in script)\n"); return -1; } } + if(!h->parsed) { + LM_ERR("no parsed authorized credentials found " + "(error in script)\n"); + return -1; + } c = (auth_body_t*)(h->parsed); break; case 5: /* AVP spec */ - if(pv_get_spec_value( msg, &gcp->sp, &value)!=0 + if(pv_get_spec_value( msg, &gcp->sp, &value)!=0 || value.flags&PV_VAL_NULL || value.rs.len<=0) { LM_ERR("no AVP found (error in scripts)\n");

1 0

git:5.4:cbe81cd6: imc: safety checks for function parameters
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: cbe81cd6941c277893958d5be45655ac21c6890e URL: https://github.com/kamailio/kamailio/commit/cbe81cd6941c277893958d5be45655a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:05+02:00 imc: safety checks for function parameters (cherry picked from commit 6c8d61850aa662016d952f25dc510ed4d602e10c) --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/cbe81cd6941c277893958d5be45655a… Patch: https://github.com/kamailio/kamailio/commit/cbe81cd6941c277893958d5be45655a… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 94ddc38884..8d9c6f3ea1 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -488,6 +488,10 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, str body; struct imc_uri room; + if(cmd==NULL || src==NULL || dst==NULL) { + return -1; + } + memset(&room, '\0', sizeof(room)); if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, &dst->parsed)) goto error; @@ -537,12 +541,14 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, goto error; } - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, STR_FMT(format_uri(src->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, + STR_FMT(format_uri(src->uri))); } else { LM_DBG("Attept to join private room [%.*s] by [%.*s]\n", STR_FMT(&rm->uri), STR_FMT(&src->uri)); - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_join_attempt_bcast.s, STR_FMT(format_uri(src->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_join_attempt_bcast.s, + STR_FMT(format_uri(src->uri))); imc_send_message(&rm->uri, &src->uri, build_headers(msg), &msg_join_attempt_ucast); } @@ -563,7 +569,7 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, rv = 0; error: - if (room.uri.s) pkg_free(room.uri.s); + if (room.uri.s != NULL) pkg_free(room.uri.s); if (rm != NULL) imc_release_room(rm); return rv; }

1 0

git:5.4:782aae70: db_text: safety check for lres
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 782aae708701eaf8bfc97d72263d1e2e08569515 URL: https://github.com/kamailio/kamailio/commit/782aae708701eaf8bfc97d72263d1e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:26+02:00 db_text: safety check for lres (cherry picked from commit 8a5b764e77d009eb6f236e74d3462bfce0d57f07) --- Modified: src/modules/db_text/dbt_base.c Modified: src/modules/db_text/dbt_res.c --- Diff: https://github.com/kamailio/kamailio/commit/782aae708701eaf8bfc97d72263d1e2… Patch: https://github.com/kamailio/kamailio/commit/782aae708701eaf8bfc97d72263d1e2… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 1e5dd01514..0b4437bced 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -258,7 +258,7 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, dbt_column_p pPrevCol = NULL; _tbc_temp->colv = (dbt_column_p*) shm_malloc(_nc*sizeof(dbt_column_p)); - for(i=0; i < _nc; i++) { + for(i=0; lres && i < _nc; i++) { dbt_column_p pCol = dbt_column_new(_tbc->colv[ lres[i] ]->name.s, _tbc->colv[ lres[i] ]->name.len); pCol->type = _tbc->colv[ lres[i] ]->type; pCol->flag = _tbc->colv[ lres[i] ]->flag; diff --git a/src/modules/db_text/dbt_res.c b/src/modules/db_text/dbt_res.c index 16a11f2695..87adc0b6bc 100644 --- a/src/modules/db_text/dbt_res.c +++ b/src/modules/db_text/dbt_res.c @@ -915,7 +915,7 @@ dbt_row_p dbt_result_extract_results(dbt_table_p _dtp, dbt_row_p* pRows, int _nr dbt_row_p pPrvRow=NULL; int i, n, r; - if(!_dtp || !pRows || _ncols<=0) + if(!_dtp || !pRows || _ncols<=0 || !_lres) return NULL; for(r=0; r < _nrows; r++) {

1 0

git:5.4:ce30413e: pike: safety check for ll variable
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: ce30413e6e60c1674d7200c32469779398860c40 URL: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:34:37+02:00 pike: safety check for ll variable (cherry picked from commit b123dec934769522407dad619bbb6c2074719884) --- Modified: src/modules/pike/pike_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… Patch: https://github.com/kamailio/kamailio/commit/ce30413e6e60c1674d7200c32469779… --- diff --git a/src/modules/pike/pike_funcs.c b/src/modules/pike/pike_funcs.c index 804ebb6ec0..7a01739fe1 100644 --- a/src/modules/pike/pike_funcs.c +++ b/src/modules/pike/pike_funcs.c @@ -211,8 +211,10 @@ void clean_routine(unsigned int ticks , void *param) /* unlink the node -> the list will get shorter and it will be * faster for the next branches to process it */ - ll->prev->prev->next = ll; - ll->prev = ll->prev->prev; + if(ll) { + ll->prev->prev->next = ll; + ll->prev = ll->prev->prev; + } node->expires = 0; node->timer_ll.prev = node->timer_ll.next = 0; if ( node->flags&NODE_EXPIRED_FLAG )

1 0

git:master:703d6202: core: resolve - safety check for setting port
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: master Commit: 703d6202e73e4e3778a2c66f4e29ae87dc6ac211 URL: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:32:38+02:00 core: resolve - safety check for setting port --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… Patch: https://github.com/kamailio/kamailio/commit/703d6202e73e4e3778a2c66f4e29ae8… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index deb20a740c..c2ea36d9ec 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1225,7 +1225,7 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto, * and *proto!=0 or port==0 && proto==0) * when performing SRV lookup (*port==0) it will use *proto to look for * tcp or udp hosts, otherwise proto is unused; if proto==0 => no SRV lookup - * If zt is set, name will be assumed to be 0 terminated and some copy + * If zt is set, name will be assumed to be 0 terminated and some copy * operations will be avoided. * If is_srv is set it will assume name has the srv prefixes for sip already * appended and it's already 0-term'ed; if not it will append them internally. @@ -1313,7 +1313,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, do_srv: /* try to find the SRV records inside previous ARs first*/ for (l=ars; l; l=l->next){ - if (l->type!=T_SRV) continue; + if (l->type!=T_SRV) continue; srv=(struct srv_rdata*) l->rdata; if (srv==0){ LM_CRIT("null rdata\n"); @@ -1325,7 +1325,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("found SRV(%s) = %s:%d in AR\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1344,7 +1344,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("SRV(%s) = %s:%d\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1356,7 +1356,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, goto end; } /* cleanup on exit */ - LM_DBG("no SRV record found for %.*s," + LM_DBG("no SRV record found for %.*s," " trying 'normal' lookup...\n", name->len, name->s); } }

1 0

Releasing Kamailio v5.4.5
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Hello, I am considering to release Kamailio v5.4.5 sometime next week, likely on Thursday, April 15, 2020. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) -- June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

onsend reply route issue with KEMI
by Salah Uddin Ahmed 14 Apr '21

14 Apr '21

Hello, We are using the Kamailio(5.4.1) with python3 KEMI interpreter. Here I noticed an issue on ksr_onsend_route with the reply messages. We did "onsend_route_reply=1" on the kamailio.cfg. But ksr_onsend_route is not triggered by any reply messages. Tried to dig some code and found, in t_reply.c before calling "run_onsend" it tested whether the onsend_rt list is empty or not by onsend_route_enabled(file: onsend.h) method. But presumably rt lists are always empty if we use a KEMI interpreter. We have tried the same version of Kamailio without KEMI, then onsend_route works fine. If onsend_rt is not being used in case of KEMI then can we replace this test with simply by testing only the onsend_route_reply flag? Please advise if we are missing something. Thank you, Rubel

3 3

git:master:0640645e: core: updated onsend_route_enabled() macro condtition
by Daniel-Constantin Mierla 14 Apr '21

14 Apr '21

Module: kamailio Branch: master Commit: 0640645efdbc1f7ce36750d5a784a4cfedc3f02f URL: https://github.com/kamailio/kamailio/commit/0640645efdbc1f7ce36750d5a784a4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-14T15:14:10+02:00 core: updated onsend_route_enabled() macro condtition - detect when the kemi callbacks need to be executed for tm replies --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/0640645efdbc1f7ce36750d5a784a4c… Patch: https://github.com/kamailio/kamailio/commit/0640645efdbc1f7ce36750d5a784a4c… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index 744becedce..a78927c190 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -57,7 +57,9 @@ extern onsend_info_t* p_onsend; * WARNING: buf must be 0 terminated (to allow regex matches on it) */ int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, char* buf, int len); -#define onsend_route_enabled(rtype) (onsend_rt.rlist[DEFAULT_RT]?((rtype==SIP_REPLY)?onsend_route_reply:1):0) +#define onsend_route_enabled(rtype) ((onsend_rt.rlist[DEFAULT_RT]? \ + ((rtype==SIP_REPLY)?onsend_route_reply:1):0) \ + || (kemi_onsend_route_callback.len>0 && sr_kemi_eng_get())) int run_onsend_evroute(onsend_info_t *sndinfo, int evrt, str *evcb, str *evname);

1 0

git:master:7231be07: seas: check when walking the list
by Daniel-Constantin Mierla 14 Apr '21

14 Apr '21

Module: kamailio Branch: master Commit: 7231be0785009cb17581822f0765985eb7bdb243 URL: https://github.com/kamailio/kamailio/commit/7231be0785009cb17581822f0765985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-14T12:52:58+02:00 seas: check when walking the list --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/7231be0785009cb17581822f0765985… Patch: https://github.com/kamailio/kamailio/commit/7231be0785009cb17581822f0765985… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index cd62848ab0..83be6307d0 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -1329,8 +1329,12 @@ int extract_allowed_headers(struct sip_msg *my_msg,int strip_top_vias,int allow_ }else{ assert(rtcnt>0); rb=hf->parsed; - while(--rtcnt) + while(rb && --rtcnt) rb=rb->next; + if(!rb) { + LM_ERR("no rr\n"); + goto error; + } k= (((rb->nameaddr.name.s) + rb->len)-hf->name.s) ; if(len+k+CRLF_LEN<headers_len){ memcpy(headers+len,hf->name.s,k);

1 0

git:master:c30cd3db: avp: check for null string
by Daniel-Constantin Mierla 14 Apr '21

14 Apr '21

Module: kamailio Branch: master Commit: c30cd3db7587a3c875770fbc558f4a5ad38b58bd URL: https://github.com/kamailio/kamailio/commit/c30cd3db7587a3c875770fbc558f4a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-14T12:50:36+02:00 avp: check for null string --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/c30cd3db7587a3c875770fbc558f4a5… Patch: https://github.com/kamailio/kamailio/commit/c30cd3db7587a3c875770fbc558f4a5… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f11d56baeb..63ce537d7a 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1359,7 +1359,7 @@ static int attr_hdr_body2attrs(struct sip_msg* m, char* header_, char* prefix_) } }; } - if (s.len && s.s[0] == header->field_delimiter) { + if (s.len && s.s && s.s[0] == header->field_delimiter) { s.s++; s.len--; }

1 0

git:master:6c8d6185: imc: safety checks for function parameters
by Daniel-Constantin Mierla 14 Apr '21

14 Apr '21

Module: kamailio Branch: master Commit: 6c8d61850aa662016d952f25dc510ed4d602e10c URL: https://github.com/kamailio/kamailio/commit/6c8d61850aa662016d952f25dc510ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-14T12:40:19+02:00 imc: safety checks for function parameters --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/6c8d61850aa662016d952f25dc510ed… Patch: https://github.com/kamailio/kamailio/commit/6c8d61850aa662016d952f25dc510ed… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 94ddc38884..8d9c6f3ea1 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -488,6 +488,10 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, str body; struct imc_uri room; + if(cmd==NULL || src==NULL || dst==NULL) { + return -1; + } + memset(&room, '\0', sizeof(room)); if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, &dst->parsed)) goto error; @@ -537,12 +541,14 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, goto error; } - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, STR_FMT(format_uri(src->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, + STR_FMT(format_uri(src->uri))); } else { LM_DBG("Attept to join private room [%.*s] by [%.*s]\n", STR_FMT(&rm->uri), STR_FMT(&src->uri)); - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_join_attempt_bcast.s, STR_FMT(format_uri(src->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_join_attempt_bcast.s, + STR_FMT(format_uri(src->uri))); imc_send_message(&rm->uri, &src->uri, build_headers(msg), &msg_join_attempt_ucast); } @@ -563,7 +569,7 @@ int imc_handle_join(struct sip_msg* msg, imc_cmd_t *cmd, rv = 0; error: - if (room.uri.s) pkg_free(room.uri.s); + if (room.uri.s != NULL) pkg_free(room.uri.s); if (rm != NULL) imc_release_room(rm); return rv; }

1 0

git:master:e84c1985: group: check if credentials are parsed
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

Module: kamailio Branch: master Commit: e84c1985f1c3ed7a791660702b398b9ac1eb1f4a URL: https://github.com/kamailio/kamailio/commit/e84c1985f1c3ed7a791660702b398b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T10:21:39+02:00 group: check if credentials are parsed --- Modified: src/modules/group/group.c --- Diff: https://github.com/kamailio/kamailio/commit/e84c1985f1c3ed7a791660702b398b9… Patch: https://github.com/kamailio/kamailio/commit/e84c1985f1c3ed7a791660702b398b9… --- diff --git a/src/modules/group/group.c b/src/modules/group/group.c index 329587a69c..af1c62c0f3 100644 --- a/src/modules/group/group.c +++ b/src/modules/group/group.c @@ -54,7 +54,7 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, { struct sip_uri puri; struct sip_uri *turi; - struct hdr_field* h; + struct hdr_field* h = 0; struct auth_body* c = 0; pv_value_t value; @@ -89,15 +89,20 @@ int get_username_domain(struct sip_msg *msg, group_check_p gcp, get_authorized_cred( msg->proxy_auth, &h); if (!h) { LM_ERR("no authorized credentials found " - "(error in scripts)\n"); + "(error in script)\n"); return -1; } } + if(!h->parsed) { + LM_ERR("no parsed authorized credentials found " + "(error in script)\n"); + return -1; + } c = (auth_body_t*)(h->parsed); break; case 5: /* AVP spec */ - if(pv_get_spec_value( msg, &gcp->sp, &value)!=0 + if(pv_get_spec_value( msg, &gcp->sp, &value)!=0 || value.flags&PV_VAL_NULL || value.rs.len<=0) { LM_ERR("no AVP found (error in scripts)\n");

1 0

git:master:b123dec9: pike: safety check for ll variable
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

Module: kamailio Branch: master Commit: b123dec934769522407dad619bbb6c2074719884 URL: https://github.com/kamailio/kamailio/commit/b123dec934769522407dad619bbb6c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T09:50:07+02:00 pike: safety check for ll variable --- Modified: src/modules/pike/pike_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b123dec934769522407dad619bbb6c2… Patch: https://github.com/kamailio/kamailio/commit/b123dec934769522407dad619bbb6c2… --- diff --git a/src/modules/pike/pike_funcs.c b/src/modules/pike/pike_funcs.c index 42fc5172e4..3096928d5d 100644 --- a/src/modules/pike/pike_funcs.c +++ b/src/modules/pike/pike_funcs.c @@ -245,8 +245,10 @@ void clean_routine(unsigned int ticks , void *param) /* unlink the node -> the list will get shorter and it will be * faster for the next branches to process it */ - ll->prev->prev->next = ll; - ll->prev = ll->prev->prev; + if(ll) { + ll->prev->prev->next = ll; + ll->prev = ll->prev->prev; + } node->expires = 0; node->timer_ll.prev = node->timer_ll.next = 0; if ( node->flags&NODE_EXPIRED_FLAG )

1 0

git:master:005f4468: sca: return on rpc fault
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

Module: kamailio Branch: master Commit: 005f4468bc5873ea02b6c0d3d75baa49067e17c9 URL: https://github.com/kamailio/kamailio/commit/005f4468bc5873ea02b6c0d3d75baa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T09:50:46+02:00 sca: return on rpc fault --- Modified: src/modules/sca/sca_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/005f4468bc5873ea02b6c0d3d75baa4… Patch: https://github.com/kamailio/kamailio/commit/005f4468bc5873ea02b6c0d3d75baa4… --- diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index f1882fa879..c3b9b0f2ba 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -184,6 +184,7 @@ void sca_rpc_deactivate_all_subscriptions(rpc_t *rpc, void *ctx) if((ht = sca->subscriptions) == NULL) { rpc->fault(ctx, 500, "Empty subscription table!"); + return; } for(i = 0; i < ht->size; i++) {

1 0

git:5.4:e46c76a1: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 Apr '21

13 Apr '21

Module: kamailio Branch: 5.4 Commit: e46c76a135ae24794748de8bdf87ae46f4ad7199 URL: https://github.com/kamailio/kamailio/commit/e46c76a135ae24794748de8bdf87ae4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-13T09:16:23+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/e46c76a135ae24794748de8bdf87ae4… Patch: https://github.com/kamailio/kamailio/commit/e46c76a135ae24794748de8bdf87ae4… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 8b87eb20d3..43270eec79 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -223,7 +223,7 @@ if(fnmatch("$rU", "123*")) Meaning of the parameters is as follows: * hf - Header field to be appended. Format: HFNAME [ [IDX] ]. If index is not specified new header is inserted at the end of - message. + message. The index 1 correxponds to the first header. * hvalue - Value to be added, config var formatting supported. Example 1.6. append_hf_value usage @@ -244,7 +244,7 @@ ot exists add new header Meaning of the parameters is as follows: * hf - Header field to be appended. Format: HFNAME [ [IDX] ]. If index is not specified new header is inserted at the top of - message. + message. The index 1 correxponds to the first header. * hvalue - Value to be added, config var formatting supported. Example 1.7. insert_hf_value usage @@ -262,7 +262,7 @@ insert_hf_value("foo[1]", "gogo") # try add to the first header Meaning of the parameters is as follows: * hf_par - Header field/param to be removed. Format: HFNAME [ [IDX] ] [. PARAM ] If asterisk is specified as index then all values are - affected. + affected. The index 1 correxponds to the first header. Example 1.8. remove_hf_value usage ... @@ -282,7 +282,7 @@ remove_hf_value("foo[*].bar") # for each foo delete bar parameters Meaning of the parameters is as follows: * hf_par - Header/param to be removed. Format: HFNAME [ [IDX] ] [. PARAM ] If asterisk is specified as index then all values are - affected. + affected. The index 1 correxponds to the first header. Example 1.9. remove_hf_value2 usage ... @@ -301,7 +301,7 @@ remove_hf_value2("foo[*].bar") # for each foo delete bar parameters Meaning of the parameters is as follows: * hf_para - Header field value / param to be appended. Format: HFNAME [ [IDX] ] [. PARAM] If asterisk is specified as index then all - values are affected. + values are affected. The index 1 correxponds to the first header. * hvalue - Value to be assigned, config var formatting supported. If value is empty then no equal sign appears in param. @@ -325,7 +325,7 @@ assign_hf_value("foo[*].bar", "") # set empty value (ex. lr) Meaning of the parameters is as follows: * hf_para - Header field value / param to be appended. Format: HFNAME [ [IDX] ] [. PARAM] If asterisk is specified as index then all - values are affected. + values are affected. The index 1 correxponds to the first header. * hvalue - Value to be assigned, config var formatting supported. If value is empty then no equal sign appears in param.

1 0

git:master:8a5b764e: db_text: safety check for lres
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

Module: kamailio Branch: master Commit: 8a5b764e77d009eb6f236e74d3462bfce0d57f07 URL: https://github.com/kamailio/kamailio/commit/8a5b764e77d009eb6f236e74d3462bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T09:15:10+02:00 db_text: safety check for lres --- Modified: src/modules/db_text/dbt_base.c Modified: src/modules/db_text/dbt_res.c --- Diff: https://github.com/kamailio/kamailio/commit/8a5b764e77d009eb6f236e74d3462bf… Patch: https://github.com/kamailio/kamailio/commit/8a5b764e77d009eb6f236e74d3462bf… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 1e5dd01514..0b4437bced 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -258,7 +258,7 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, dbt_column_p pPrevCol = NULL; _tbc_temp->colv = (dbt_column_p*) shm_malloc(_nc*sizeof(dbt_column_p)); - for(i=0; i < _nc; i++) { + for(i=0; lres && i < _nc; i++) { dbt_column_p pCol = dbt_column_new(_tbc->colv[ lres[i] ]->name.s, _tbc->colv[ lres[i] ]->name.len); pCol->type = _tbc->colv[ lres[i] ]->type; pCol->flag = _tbc->colv[ lres[i] ]->flag; diff --git a/src/modules/db_text/dbt_res.c b/src/modules/db_text/dbt_res.c index 16a11f2695..87adc0b6bc 100644 --- a/src/modules/db_text/dbt_res.c +++ b/src/modules/db_text/dbt_res.c @@ -915,7 +915,7 @@ dbt_row_p dbt_result_extract_results(dbt_table_p _dtp, dbt_row_p* pRows, int _nr dbt_row_p pPrvRow=NULL; int i, n, r; - if(!_dtp || !pRows || _ncols<=0) + if(!_dtp || !pRows || _ncols<=0 || !_lres) return NULL; for(r=0; r < _nrows; r++) {

1 0

git: new commits in branch 5.4
by Daniel-Constantin Mierla 13 Apr '21

13 Apr '21

- URL: https://github.com/kamailio/kamailio/commit/7c9ea2bf08ae3c481548b27fd4a793a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:19:07+02:00 path: removed svn id header (cherry picked from commit 0f0a56ad5c97a611fab64fc9b9eba304643dcec8) - URL: https://github.com/kamailio/kamailio/commit/f5334a57ae5159f1a37b3f25b9db220… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:21:12+02:00 textopsx: docs - notes about 1-based indexing for hf value functions - GH #2387 (cherry picked from commit 6379f1280ba41e87ddb34fa1705ffe4231dcac9c) - URL: https://github.com/kamailio/kamailio/commit/8622811124f641b6a4b09a802758a35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:22:10+02:00 core: parse uri - cast to unsigned for left shifting (cherry picked from commit d4e31e6ae494836c49e50f463517a576b18c5611) - URL: https://github.com/kamailio/kamailio/commit/3dca9d6bff8e08677a02e3bb0f47b4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:22:35+02:00 core: parse uri - check for invalid port values (cherry picked from commit b7f753ddc727e1d7ab42e7abe607059e03976f8d) - URL: https://github.com/kamailio/kamailio/commit/8b112fbb5e362931b5c684fd4a6c3fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:22:51+02:00 pua_dialoginfo: skip requests that do not control call state - GH #2700 (cherry picked from commit 1b47452cebb1b7866cbbabd5068a9ff4a39c86d2) - URL: https://github.com/kamailio/kamailio/commit/8cd3b40aa7e618226b0137f5e758bc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:23:09+02:00 core: init allocated memory in str_hash_alloc() - removed unused pointer shifting in dset.c - small reworking of lval_assign() (cherry picked from commit ba9f2b5af9cabd61f67ceedb8feab6bd7bc6526d) - URL: https://github.com/kamailio/kamailio/commit/2d091fa67133e49d23e81007820900c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:23:19+02:00 .gitignore: ignore files that can be generated by compiling tools (cherry picked from commit 1536f4bb3d4e654c8169afb6599c47c26df12ef6) - URL: https://github.com/kamailio/kamailio/commit/aa285587c015e03a105442b1964ac0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:23:33+02:00 core: fixed condition for 0 ID or NULL NAME AVP - avoid null in memcpy for AVP_NAME_STR (cherry picked from commit ca1821837dfe7dd6630f628d968ed4d1178c7040) - URL: https://github.com/kamailio/kamailio/commit/6bf9ce52bd4a10e77343d06cd82e4a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:23:57+02:00 core: cfg.len - sanitizer safety check of target buffer (cherry picked from commit ef31c82ac3bd7972c2d02c893f8041af4664b717) - URL: https://github.com/kamailio/kamailio/commit/bdd0da206d115e93383899463ad5f72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:24:10+02:00 imc: expect the second param only if first is set - bits of formatting for imc_handle_create() (cherry picked from commit c08620f6427d59749396fe2762e340328ce69c41) - URL: https://github.com/kamailio/kamailio/commit/78fcd0ff356a4f2388c389490a67004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:24:48+02:00 tm: init timeval structs (cherry picked from commit a749cc53ac4aa4825ba8d720825db856d897efb2) - URL: https://github.com/kamailio/kamailio/commit/aa7f0d76add3794719fe6006724559b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:25:14+02:00 uac: do not free chunks already inserted as lumps - in case of errors happening later, the pointers are linked in sip_msg_t and will be freed there, otherwise will result in a double free (cherry picked from commit 26ab0fcc97cbf0d6602454e60187a914f13424a2) - URL: https://github.com/kamailio/kamailio/commit/6e38b6e81e8cdb656b28e221a59aaf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:25:32+02:00 core: main - several optarg safety checks (cherry picked from commit 4f7b5537688293d196669dd5a7d0124f7656cf2d) - URL: https://github.com/kamailio/kamailio/commit/b1b91fe1969f65a94516baddc94738f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:01+02:00 core: rvalue - function to destroy content of rval without freeing it - needed in case of rval reuse in rve_replace_with_val() (cherry picked from commit e770e0aa6889f001a3f7f2644202bf106f6559da) - URL: https://github.com/kamailio/kamailio/commit/05f60d4d4a20d127a23bf6e42853060… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:21+02:00 core: rvalue - link to free at end of rve_opt_01() instead on replace - debug mode messages print fields (cherry picked from commit 7652f79640b3e792baa77531e697fd74a1ab4584) - URL: https://github.com/kamailio/kamailio/commit/9d8b937f832334be2660f95c9886ae3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:38+02:00 core: use same condition for extra_params in create_via_hf() (cherry picked from commit 62e822ce25e93a8183dd9e5e1fee517143849a6a) - URL: https://github.com/kamailio/kamailio/commit/bb1102a9366992b885100960000c9e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:47+02:00 ctl: free send_buf in case of error - disabled unused function (cherry picked from commit 3bb1a30dda3b40ba2f188a4baab94ebda41f4a74) - URL: https://github.com/kamailio/kamailio/commit/3aa2bfd98e6b647eda8f8a27f2da3f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:27:58+02:00 app_jsdt: init timeval structures (cherry picked from commit cad5cc37c63477fbcf429af34e516b523c74132e) - URL: https://github.com/kamailio/kamailio/commit/c13836bd9feeb27878810cd469d839d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:06+02:00 app_lua: init timeval structures (cherry picked from commit e1369a4cf0c668a0ee40d3b84b9c6382c2168e49) - URL: https://github.com/kamailio/kamailio/commit/fa571b6f79f9a2a9c06ccb3494ed2ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:14+02:00 app_python: init timeval structures (cherry picked from commit 97991c9cf56ca034df914ae499053e597582ef80) - URL: https://github.com/kamailio/kamailio/commit/8341025d73c0911683f8bb461d5b5b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:23+02:00 app_python3: init timeval structures (cherry picked from commit 7457b3cefd08595c054291398de0f9a4e62691b7) - URL: https://github.com/kamailio/kamailio/commit/50e3e3761804dd71a615f95eeb67c2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:31+02:00 app_ruby: init timeval structures (cherry picked from commit 50f92131ac0a9f5dd1e19fb6e3636657ad996e37) - URL: https://github.com/kamailio/kamailio/commit/7d5ab8071aef32d2c59f6acc7e93923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:42+02:00 app_sqlang: init timeval structures (cherry picked from commit e8583372cb1078a29bb6526c11f838e30811b94a) - URL: https://github.com/kamailio/kamailio/commit/53601d9e432b6b1c9351dd7a801dd75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:28:56+02:00 core: check for non empty receive address and port in msg translator (cherry picked from commit 7ef0a272dc9c81afa05ef8b1591e9f05c2810e9a) - URL: https://github.com/kamailio/kamailio/commit/d9eb361ebc07a84f5a36fdad4c0a576… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:29:08+02:00 core: cfg.lex - free after log message (cherry picked from commit 563c6f69aef22a90fc7870398fcfbd4242e33779) - URL: https://github.com/kamailio/kamailio/commit/04c07ced4cc6000a7ffcbfea79485ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:29:21+02:00 dlgs: safety check for accessing next field (cherry picked from commit 7dd643a88fd7944ee86b795298c76e6d5fd58b8f) - URL: https://github.com/kamailio/kamailio/commit/7ec5c6ec53f333b7a65a02d46ee8a37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:29:32+02:00 core: main - coherent behaviour for fix_cfg_file() - duplicate to build the output always, safer not to try to change the static string defined via macro at runtime (cherry picked from commit 74fa6c5570d6394af8c5352bd37e21e970f1575c) - URL: https://github.com/kamailio/kamailio/commit/fc9c1dc1e2dd2567bdd8fa6d75f412a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:05+02:00 tm: t_fifo.c - free app in case of error (cherry picked from commit 9c7a509f7189de8ce600a97b7c1c5f9e4f5afdb1) - URL: https://github.com/kamailio/kamailio/commit/e2d4ab36df274e92e9e04fc8b1973a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:15+02:00 core: dns cache - safety checks for rdata field (cherry picked from commit 7ea3b97c8acf8b623563b7a9fbf4ba23ea3e9170) - URL: https://github.com/kamailio/kamailio/commit/5e431ebf2d2986be962373dc9adba90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:27+02:00 rtpengine: reworked condition around locking for easier pairing - inside rtpengine_hash_table_insert() (cherry picked from commit c200d2e9109a5581491bebd91c30162716b0f4fa) - URL: https://github.com/kamailio/kamailio/commit/e0948071566a8d978dc2c57a21a7448… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:40+02:00 nat_traversal: check parameter for send_keepalive() (cherry picked from commit f33abd5e2d5978ba9e6e8a48066b0daff70c0b3b) - URL: https://github.com/kamailio/kamailio/commit/c905cab9d461b24d779a7404aaf1316… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:30:54+02:00 rr: conditions adjustmets for append from tag in record route preset (cherry picked from commit 42d90d3665256c3d38945193b0a14ad199221bc6) - URL: https://github.com/kamailio/kamailio/commit/335b40a417ff457f290ab6e963344ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:31:25+02:00 core: cfg ctx - checks for valid variable offset (cherry picked from commit 303be6a94be40dbe7c26c96e768627e8e9d0f860) - URL: https://github.com/kamailio/kamailio/commit/3a515d6e2ba184de05b96dfad3bdf9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:31:41+02:00 siptrace: fallback to udp if send sock is not set (cherry picked from commit a5f8810223021939b12eb0d04fc625f8d36980f7) - URL: https://github.com/kamailio/kamailio/commit/f5e8a6042f141fd32f611c5ddc8232d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:31:53+02:00 dialog: safety check for prev field (cherry picked from commit 80beb29ac0204697a8964231b441ac37866a4a1c) - URL: https://github.com/kamailio/kamailio/commit/2e16763a9c261cec47bd429a1dc0bee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:32:13+02:00 pua_dialoginfo: check request to cover cases of callbacks without it - updates the previous commit (cherry picked from commit 912e2ef41533e961bc55ca80619305af8e474469) - URL: https://github.com/kamailio/kamailio/commit/36667b400c77b50b4809fafd92b8d93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:32:28+02:00 pike: safety check for null node (cherry picked from commit c9dc0336a33a0ecfe776975be7fbfab8f3c91b48) - URL: https://github.com/kamailio/kamailio/commit/a197fecdf3f3da6e24a5792b9eb9572… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-13T08:32:40+02:00 core: dns - safety checks for port and proto (cherry picked from commit 6d46ec71f941b9db9c06c6c2edac14fc9f3d1074)

1 0

git:master:91ec4259: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 91ec4259465fdaab41749b8fed0f96636a0619e5 URL: https://github.com/kamailio/kamailio/commit/91ec4259465fdaab41749b8fed0f966… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-12T18:46:13+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/91ec4259465fdaab41749b8fed0f966… Patch: https://github.com/kamailio/kamailio/commit/91ec4259465fdaab41749b8fed0f966… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index ec12000f65..c96b7830c6 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -55,7 +55,7 @@ Daniel-Constantin Mierla 1.8. secsipid_check_identity_pubkey usage 1.9. secsipid_get_url usage 1.10. secsipid_add_identity usage - 1.11. Libsecsipid usage + 1.11. Libsecsipid Usage Chapter 1. Admin Guide @@ -299,25 +299,32 @@ request_route { 5. Installation - The module depends on "libsecsipid", which is a component of - "sipsecidx" project from https://github.com/asipto/secsipidx/. The - library is implemented in Go language, with generated C API and - library. Until the libsecsipid is going to be packaged in OS - distributions, the secsipid module can be compiled by copying - secsipid.h libsecsipid.h and libsecsipid.a files in the folder of the - module. + The module needs "secsipdi_proc.so" module thatdepends on + "libsecsipid", which is a component of "sipsecidx" project from + https://github.com/asipto/secsipidx/. The library is implemented in Go + language, with generated C API and library. Until the libsecsipid is + going to be packaged in OS distributions, the secsipid_proc module can + be compiled by copying secsipid.h libsecsipid.h and libsecsipid.a files + in the folder of the module. To generate the libsecsipid.a file, it requires to have Go language installed and its environment configured, then run the following commands: - Example 1.11. Libsecsipid usage + Example 1.11. Libsecsipid Usage ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba cp secsipid.h libsecsipid.h libsecsipid.a \ - /path/to/kamailio/src/modules/secsipid/ + /path/to/kamailio/src/modules/secsipid_proc/ + cd /path/to/kamailio/ -make modules modules=src/modules/secsipid/ +make include_modules="secsipid secsipid_proc ..." cfg +make all +make install + +## or compiling individual modules for use inside source tree +# make modules modules=src/modules/secsipid_proc +# make modules modules=src/modules/secsipid ...

1 0

git:master:7018672d: secsipid: docs - updates to installation section with secsipid_proc
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 7018672d9881ab97848b4e1131d73412b0db221d URL: https://github.com/kamailio/kamailio/commit/7018672d9881ab97848b4e1131d7341… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-12T18:39:25+02:00 secsipid: docs - updates to installation section with secsipid_proc --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7018672d9881ab97848b4e1131d7341… Patch: https://github.com/kamailio/kamailio/commit/7018672d9881ab97848b4e1131d7341… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 9360d788a4..d9d622af17 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -318,10 +318,11 @@ request_route { <section id="secsipid.s.installation"> <title>Installation</title> <para> - The module depends on "libsecsipid", which is a component of "sipsecidx" - project from https://github.com/asipto/secsipidx/. The library is + The module needs "secsipdi_proc.so" module thatdepends on "libsecsipid", + which is a component of "sipsecidx" project from + https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the - libsecsipid is going to be packaged in OS distributions, the secsipid + libsecsipid is going to be packaged in OS distributions, the secsipid_proc module can be compiled by copying secsipid.h libsecsipid.h and libsecsipid.a files in the folder of the module. </para> @@ -330,16 +331,23 @@ request_route { installed and its environment configured, then run the following commands: </para> <example> - <title>Libsecsipid usage</title> + <title>Libsecsipid Usage</title> <programlisting format="linespecific"> ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba cp secsipid.h libsecsipid.h libsecsipid.a \ - /path/to/kamailio/src/modules/secsipid/ + /path/to/kamailio/src/modules/secsipid_proc/ + cd /path/to/kamailio/ -make modules modules=src/modules/secsipid/ +make include_modules="secsipid secsipid_proc ..." cfg +make all +make install + +## or compiling individual modules for use inside source tree +# make modules modules=src/modules/secsipid_proc +# make modules modules=src/modules/secsipid ... </programlisting> </example>

1 0

git:master:84988f9d: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 84988f9d592a80c8c5b642a96b037ab0cd85cbb4 URL: https://github.com/kamailio/kamailio/commit/84988f9d592a80c8c5b642a96b037ab… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-12T08:01:22+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/84988f9d592a80c8c5b642a96b037ab… Patch: https://github.com/kamailio/kamailio/commit/84988f9d592a80c8c5b642a96b037ab… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 87ed1f9287..ec12000f65 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -31,6 +31,7 @@ Daniel-Constantin Mierla 3.3. cache_dir (str) 3.4. cache_expire (int) 3.5. modproc (str) + 3.6. libopt (str) 4. Functions @@ -49,11 +50,12 @@ Daniel-Constantin Mierla 1.3. Set cache_dir parameter 1.4. Set cache_expire parameter 1.5. Set modproc parameter - 1.6. secsipid_check_identity usage - 1.7. secsipid_check_identity_pubkey usage - 1.8. secsipid_get_url usage - 1.9. secsipid_add_identity usage - 1.10. Libsecsipid usage + 1.6. Set libopt parameter + 1.7. secsipid_check_identity usage + 1.8. secsipid_check_identity_pubkey usage + 1.9. secsipid_get_url usage + 1.10. secsipid_add_identity usage + 1.11. Libsecsipid usage Chapter 1. Admin Guide @@ -72,6 +74,7 @@ Chapter 1. Admin Guide 3.3. cache_dir (str) 3.4. cache_expire (int) 3.5. modproc (str) + 3.6. libopt (str) 4. Functions @@ -121,6 +124,7 @@ Chapter 1. Admin Guide 3.3. cache_dir (str) 3.4. cache_expire (int) 3.5. modproc (str) + 3.6. libopt (str) 3.1. expire (int) @@ -181,6 +185,18 @@ modparam("secsipid", "cache_expire", 7200) modparam("secsipid", "modproc", "secsipid_proc2.so") ... +3.6. libopt (str) + + Set a libsecsipid option. The value has to be name=value. The parameter + can be set many times. + + Default value is "" (not set). + + Example 1.6. Set libopt parameter +... +modparam("secsipid", "libopt", "CacheExpires=0") +... + 4. Functions 4.1. secsipid_check_identity(keyPath) @@ -202,7 +218,7 @@ modparam("secsipid", "modproc", "secsipid_proc2.so") This function can be used from ANY_ROUTE. - Example 1.6. secsipid_check_identity usage + Example 1.7. secsipid_check_identity usage ... request_route { ... @@ -226,7 +242,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.7. secsipid_check_identity_pubkey usage + Example 1.8. secsipid_check_identity_pubkey usage ... request_route { ... @@ -247,7 +263,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.8. secsipid_get_url usage + Example 1.9. secsipid_get_url usage ... request_route { ... @@ -271,7 +287,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.9. secsipid_add_identity usage + Example 1.10. secsipid_add_identity usage ... request_route { ... @@ -295,7 +311,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.10. Libsecsipid usage + Example 1.11. Libsecsipid usage ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/

1 0

git:master:3d7b1b12: secsipid: docs for libopt
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 3d7b1b12947b37faaacb12286f8ff763635185b9 URL: https://github.com/kamailio/kamailio/commit/3d7b1b12947b37faaacb12286f8ff76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-12T07:56:54+02:00 secsipid: docs for libopt --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d7b1b12947b37faaacb12286f8ff76… Patch: https://github.com/kamailio/kamailio/commit/3d7b1b12947b37faaacb12286f8ff76… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index d4489ebf73..9360d788a4 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -162,6 +162,27 @@ modparam("secsipid", "modproc", "secsipid_proc2.so") </programlisting> </example> </section> + <section id="secsipid.p.libopt"> + <title><varname>libopt</varname> (str)</title> + <para> + Set a libsecsipid option. The value has to be name=value. The + parameter can be set many times. + </para> + <para> + <emphasis> + Default value is "" (not set). + </emphasis> + </para> + <example> + <title>Set <varname>libopt</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("secsipid", "libopt", "CacheExpires=0") +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:ea628d35: secsipid_proc: synced with the upstream library api
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: ea628d35917036a252a3a0094a250b5df3cfe037 URL: https://github.com/kamailio/kamailio/commit/ea628d35917036a252a3a0094a250b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-12T07:51:41+02:00 secsipid_proc: synced with the upstream library api --- Modified: src/modules/secsipid_proc/libsecsipid.h Modified: src/modules/secsipid_proc/secsipid_proc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ea628d35917036a252a3a0094a250b5… Patch: https://github.com/kamailio/kamailio/commit/ea628d35917036a252a3a0094a250b5… --- diff --git a/src/modules/secsipid_proc/libsecsipid.h b/src/modules/secsipid_proc/libsecsipid.h index f0b8d51ebc..b95393ed39 100644 --- a/src/modules/secsipid_proc/libsecsipid.h +++ b/src/modules/secsipid_proc/libsecsipid.h @@ -92,6 +92,19 @@ extern int SecSIPIDSignJSONHP(char* headerJSON, char* payloadJSON, char* prvkeyP // * return: the length of `*outPtr` extern int SecSIPIDGetIdentity(char* origTN, char* destTN, char* attestVal, char* origID, char* x5uVal, char* prvkeyPath, char** outPtr); +// SecSIPIDGetIdentityPrvKey -- +// Generate the Identity header content using the input attributes +// * origTN - calling number +// * destTN - called number +// * attestVal - attestation level +// * origID - unique ID for tracking purposes, if empty string a UUID is generated +// * x5uVal - location of public certificate +// * prvkeyData - content of private key to be used to generate the signature +// * outPtr - to be set to the pointer containing the output (it is a +// 0-terminated string); the `*outPtr` must be freed after use +// * return: the length of `*outPtr` +extern int SecSIPIDGetIdentityPrvKey(char* origTN, char* destTN, char* attestVal, char* origID, char* x5uVal, char* prvkeyData, char** outPtr); + // SecSIPIDCheck -- // check the Identity header value // * identityVal - identity header value @@ -143,6 +156,26 @@ extern int SecSIPIDSetFileCacheOptions(char* dirPath, int expireVal); // * return: 0 - on success; -1 - on failure extern int SecSIPIDGetURLContent(char* urlVal, int timeoutVal, char** outPtr, int* outLen); +// SecSIPIDOptSetS -- +// set a string option for the library +// * optName - name of the option +// * optVal - value of the option +// * return: 0 if option was set, -1 otherwise +extern int SecSIPIDOptSetS(char* optName, char* optVal); + +// SecSIPIDOptSetN -- +// set a number (integer) option for the library +// * optName - name of the option +// * optVal - value of the option +// * 0 if option was set, -1 otherwise +extern int SecSIPIDOptSetN(char* optName, int optVal); + +// SecSIPIDOptSetV -- +// set an option for the library +// * optNameVal - string with name=value of the option +// * 0 if option was set, -1 otherwise +extern int SecSIPIDOptSetV(char* optNameVal); + #ifdef __cplusplus } #endif diff --git a/src/modules/secsipid_proc/secsipid_proc_mod.c b/src/modules/secsipid_proc/secsipid_proc_mod.c index 9356101d3a..1054582b17 100644 --- a/src/modules/secsipid_proc/secsipid_proc_mod.c +++ b/src/modules/secsipid_proc/secsipid_proc_mod.c @@ -44,6 +44,9 @@ int secsipid_proc_bind(secsipid_papi_t *papi) papi->SecSIPIDCheckFullPubKey = SecSIPIDCheckFullPubKey; papi->SecSIPIDSetFileCacheOptions = SecSIPIDSetFileCacheOptions; papi->SecSIPIDGetURLContent = SecSIPIDGetURLContent; + papi->SecSIPIDOptSetS = SecSIPIDOptSetS; + papi->SecSIPIDOptSetN = SecSIPIDOptSetN; + papi->SecSIPIDOptSetV = SecSIPIDOptSetV; return 0; }

1 0

git:master:5eacca80: secsipid: make it possible to verify certificate
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 5eacca80c4435a8cd55943493b52ea0e155ca524 URL: https://github.com/kamailio/kamailio/commit/5eacca80c4435a8cd55943493b52ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-12T07:54:24+02:00 secsipid: make it possible to verify certificate - follow the specs relate to verification - allow to set the level of certification via upstream library options --- Modified: src/modules/secsipid/secsipid_mod.c Modified: src/modules/secsipid/secsipid_papi.h --- Diff: https://github.com/kamailio/kamailio/commit/5eacca80c4435a8cd55943493b52ea0… Patch: https://github.com/kamailio/kamailio/commit/5eacca80c4435a8cd55943493b52ea0…

1 0

git:master:6d46ec71: core: dns - safety checks for port and proto
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 6d46ec71f941b9db9c06c6c2edac14fc9f3d1074 URL: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-11T09:09:24+02:00 core: dns - safety checks for port and proto --- Modified: src/core/dns_cache.c Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… Patch: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 7dbde8f378..58247265eb 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3011,25 +3011,30 @@ inline static int dns_srv_resolve_ip(struct dns_srv_handle* h, { int ret; str host; + unsigned short vport; host.len=0; host.s=0; + if(port) vport =*port; + else vport = 0; + do{ if (h->a==0){ #ifdef DNS_SRV_LB if ((ret=dns_srv_resolve_nxt(&h->srv, (flags & DNS_SRV_RR_LB)?&h->srv_tried_rrs:0, &h->srv_no, - name, &host, port))<0) + name, &host, &vport))<0) goto error; #else if ((ret=dns_srv_resolve_nxt(&h->srv, &h->srv_no, - name, &host, port))<0) + name, &host, &vport))<0) goto error; #endif - h->port=*port; /* store new port */ + h->port=vport; /* store new port */ + if(port) *port=vport; }else{ - *port=h->port; /* return the stored port */ + if(port) *port=h->port; /* return the stored port */ } if ((ret=dns_ip_resolve(&h->a, &h->ip_no, &host, ip, flags))<0){ /* couldn't find any good ip for this record, try the next one */ @@ -3257,6 +3262,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, char n_proto, origproto; str srv_name; int ret; + int res; int try_lookup_naptr = 0; ret=-E_DNS_NO_NAPTR; @@ -3302,7 +3308,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, if (!try_lookup_naptr) { if(proto) *proto=origproto; - int res = dns_srv_sip_resolve(h, name, ip, port, proto, flags); + res = dns_srv_sip_resolve(h, name, ip, port, proto, flags); if (res) { mark_skip_current_naptr(e->rr_lst, h->srv); if (have_more_active_naptr(e->rr_lst)) { @@ -3324,8 +3330,8 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, LM_DBG("(%.*s, %d, %d), srv0, ret=%d\n", name->len, name->s, h->srv_no, h->ip_no, ret); dns_hash_put(e); - *proto=n_proto; - h->proto=*proto; + if(proto) *proto=n_proto; + h->proto=n_proto; return ret; } } @@ -4130,7 +4136,9 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, new_rr->rdata = (void*)((char*)new_rr+rr_size); new_rr->expire = now + S_TO_TICKS(ttl); /* link the rr to the previous one */ - last_rr->next = new_rr; + if(last_rr) { + last_rr->next = new_rr; + } /* fix the total_size and expires values */ new->total_size=rounded_size+rr_size+rdata_size; @@ -4396,7 +4404,7 @@ int dns_cache_add_record(unsigned short type, if (*rr_iter != new_rr->next) { /* unlink rr from the list */ - *rr_p = (*rr_p)->next; + *rr_p = (*rr_p)?(*rr_p)->next:NULL; /* link it before *rr_iter */ new_rr->next = *rr_iter; *rr_iter = new_rr; diff --git a/src/core/resolve.c b/src/core/resolve.c index 928f6af3c5..deb20a740c 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1261,7 +1261,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, if (is_srv){ /* skip directly to srv resolving */ srv_proto=(proto)?*proto:0; - *port=(srv_proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; + if(port) *port=(srv_proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; if (zt){ srv_target=name->s; /* name.s must be 0 terminated in this case */

1 0

git:master:c9dc0336: pike: safety check for null node
by Daniel-Constantin Mierla 10 Apr '21

10 Apr '21

Module: kamailio Branch: master Commit: c9dc0336a33a0ecfe776975be7fbfab8f3c91b48 URL: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-10T11:21:09+02:00 pike: safety check for null node --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… Patch: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index e8b93b84f2..c0324c0476 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -285,7 +285,7 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, int byte_pos; kid = pike_root->entries[ ip[0] ].node; - node = 0; + node = NULL; byte_pos = 0; LM_DBG("search on branch %d (top=%p)\n", ip[0],kid); @@ -301,6 +301,10 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, } } + if(node==NULL) { + return NULL; + } + LM_DBG("only first %d were matched!\n",byte_pos); *flag = 0; *father = 0;

1 0

git:master:912e2ef4: pua_dialoginfo: check request to cover cases of callbacks without it
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 912e2ef41533e961bc55ca80619305af8e474469 URL: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T18:51:42+02:00 pua_dialoginfo: check request to cover cases of callbacks without it - updates the previous commit --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… Patch: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index a146b52d19..7e7afe2eae 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -272,7 +272,7 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para } /* skip requests that do not control call state */ - if((request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { + if(request && (request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { return; } if(include_req_uri) {

1 0

git:master:80beb29a: dialog: safety check for prev field
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 80beb29ac0204697a8964231b441ac37866a4a1c URL: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T17:18:54+02:00 dialog: safety check for prev field --- Modified: src/modules/dialog/dlg_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… Patch: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… --- diff --git a/src/modules/dialog/dlg_timer.c b/src/modules/dialog/dlg_timer.c index 0ac13df25c..6b84a4d68c 100644 --- a/src/modules/dialog/dlg_timer.c +++ b/src/modules/dialog/dlg_timer.c @@ -222,7 +222,7 @@ static inline struct dlg_tl* get_expired_dlgs(unsigned int time) lock_get( d_timer->lock); if (d_timer->first.next==&(d_timer->first) - || d_timer->first.next->timeout > time ) { + || d_timer->first.next->timeout > time ) { lock_release( d_timer->lock); return 0; } @@ -247,7 +247,9 @@ static inline struct dlg_tl* get_expired_dlgs(unsigned int time) ret = 0; } else { ret = d_timer->first.next; - tl->prev->next = 0; + if(tl->prev) { + tl->prev->next = 0; + } d_timer->first.next = tl; tl->prev = &d_timer->first; }

1 0

[kamailio/kamailio] pua_dialoginfo publishing confirmed for an early call (#2700)
by Nathan 09 Apr '21

09 Apr '21

### Description When updating from Kamailio 5.2.2 to 5.4.4, we're encountering an issue: the pua_dialoginfo module publishes a `confirmed` state for the dialog, even though it's still ringing. It turns out this commit introduces the problem since 5.3.0: 4efe19f So since 5.3.0, the dialog module (i think correctly?) sends out state updates for PRACK dialog updates as `DLGCB_REQ_WITHIN` events. But the `pua_dialoginfo` module seems to see that as a signal to mark the dialog confirmed (see [here](https://github.com/kamailio/kamailio/blob/master/src/modules/pua_dial…). One easy fix would be to simply remove `DLGCB__REQ_WITHIN` from the case list in pua_dialoginfo? OpenSER [seems to](https://github.com/OpenSIPS/opensips/blob/master/modules/pua_dialoginfo… ditch the `DLGCB_REQ_WITHIN` messages altogether, for specific messages... ### Troubleshooting #### Reproduction - Use the pua_dialoginfo module - Make sure your device uses PRACK - See that the dialog is confirmed even before you pick up; watch for log lines: `__dialog_sendpublish(): dialog confirmed` #### Debugging Data N/A #### Log Messages With 5.4.4: ``` 2021-04-02T16:49:44.453339+02:00 debug proxy[17964]: DEBUG: pua_dialoginfo [pua_dialoginfo.c:295]: __dialog_sendpublish(): dialog confirmed, from=sip:220@188.166.42.37 ``` #### SIP Traffic Just a regular invite with prack. ### Possible Solutions See above. ### Additional Information Reproduced with Kamailio 5.4.4, but probably all versions from 5.3.0 are affected. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2700

2 3

git:master:a5f88102: siptrace: fallback to udp if send sock is not set
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: a5f8810223021939b12eb0d04fc625f8d36980f7 URL: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T16:37:30+02:00 siptrace: fallback to udp if send sock is not set --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… Patch: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 31cabefe3b..4648340d73 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2211,6 +2211,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) dest_info_t new_dst; siptrace_data_t sto; sip_msg_t tmsg; + int proto; if(evp->data == 0) return -1; @@ -2238,6 +2239,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) LM_WARN("no sending socket found\n"); strcpy(sto.fromip_buff, SIPTRACE_ANYADDR); sto.fromip.len = SIPTRACE_ANYADDR_LEN; + proto = PROTO_UDP; } else { if(new_dst.send_sock->sock_str.len>=SIPTRACE_ADDR_MAX-1) { LM_ERR("socket string is too large: %d\n", @@ -2247,11 +2249,12 @@ int siptrace_net_data_sent(sr_event_param_t *evp) strncpy(sto.fromip_buff, new_dst.send_sock->sock_str.s, new_dst.send_sock->sock_str.len); sto.fromip.len = new_dst.send_sock->sock_str.len; + proto = new_dst.send_sock->proto; } sto.fromip.s = sto.fromip_buff; sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(new_dst.send_sock->proto), + siptrace_proto_name(proto), suip2a(&new_dst.to, sizeof(new_dst.to)), (int)su_getport(&new_dst.to)); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) {

1 0

git:master:303be6a9: core: cfg ctx - checks for valid variable offset
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 303be6a94be40dbe7c26c96e768627e8e9d0f860 URL: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T16:24:01+02:00 core: cfg ctx - checks for valid variable offset --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… Patch: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 733e0b4619..a1e761f3a2 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -284,7 +284,11 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, meta->array = array; clone_done = 1; } - memcpy(ginst->vars + var->offset, new_val, cfg_var_size(var)); + if(ginst->vars + var->offset) { + memcpy(ginst->vars + var->offset, new_val, cfg_var_size(var)); + } else { + LM_ERR("invalid variable offset\n"); + } } } return 0; @@ -1122,6 +1126,10 @@ int cfg_commit(cfg_ctx_t *ctx) } p = group_inst->vars + changed->var->offset; } + if(p==NULL) { + LM_ERR("failed to resolve valid variable offset\n"); + goto error; + } if (((changed->group_id_set && !changed->del_value && CFG_VAR_TEST_AND_SET(group_inst, changed->var))

1 0

git:master:bb917a29: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 09 Apr '21

09 Apr '21

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

1 0

[kamailio/kamailio] Wkampich/dev (#2675)
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

#### 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) - [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 - [x] Related to issue #2574 and #2641 #### Description  lost: new features, attributes and a new function to dereference location - features: LoST redirect, dynamic HELD url resolving (#2574), LoST NAPTR, POST request to dereference loation - attributes: reponse_time (-1:emergencyDispatch, 0:emergencyRouting, >0[ms]); post_request (POST method to dereference location #2641); recursion (1:yes/0:no); location_profile (PIDF/LO profile selection: 0:first/1:last/2:geo/3:civic); verbose 0/1 (detailed LoST response as log INFO); geoheader_type (filter schema: 0:any/1:cid/2:http/3:https); geoheader_order (0:first/1:last) - function: lost_held_dereference (specific function to dereference location using POST method); attributes are url (r;string), resp.-time (r;string), resp.-type (r;string), pidf (r/w;string) and error (r/w;string) - general: The extension of the module allows dynamic querying of LIS/HELD and LOST services via NAPTR lookup. In the case of LOST, a redirect response is evaluated. In case a lost_held_request (used to connect to a LIS via POST or GET) is passed with an empty string ("") for the connection parameter, then P-A-I or From header value hostnames are used for NAPTR lookup to get a corresponding service. http_client: http_client_request (api) content-type header support - new api call including a content-type argument implemented as new function - required to resolve geolocation url using POST (#2641) - Note: not sure if this is the most elegant solution, but it helps to avoid backward compatibility issues You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2675 -- Commit Summary -- * http_client: http_client_request (api) content-type header support * lost: new features, attributes and a new function to dereference location -- File Changes -- M src/modules/http_client/curl_api.c (1) M src/modules/http_client/curl_api.h (3) M src/modules/http_client/functions.c (68) M src/modules/http_client/functions.h (14) M src/modules/lost/functions.c (902) M src/modules/lost/functions.h (3) M src/modules/lost/lost.c (88) A src/modules/lost/naptr.c (255) A src/modules/lost/naptr.h (38) M src/modules/lost/pidf.c (5) A src/modules/lost/response.c (991) A src/modules/lost/response.h (131) M src/modules/lost/utilities.c (447) M src/modules/lost/utilities.h (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2675.patch https://github.com/kamailio/kamailio/pull/2675.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2675

5 52

git:master:9a8ff2b8: Merge pull request #2675 from kamailio/wkampich/dev
by GitHub 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 9a8ff2b8408c7b462d39f6ea25d81865b70ade42 URL: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186… Author: Wolfgang Kampichler <49035738+wkampich(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-04-09T16:10:45+02:00 Merge pull request #2675 from kamailio/wkampich/dev extensions to lost and http_client modules and core/parse_body.c/part_multipart_headers_cmp() log output changed from ERR to DBG in case a header does not exist --- Added: src/modules/lost/naptr.c Added: src/modules/lost/naptr.h Added: src/modules/lost/response.c Added: src/modules/lost/response.h Modified: src/core/parser/parse_body.c Modified: src/modules/http_client/curl_api.c Modified: src/modules/http_client/curl_api.h Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/lost/doc/lost.xml Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186… Patch: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186…

1 0

git:master:106b8a65: core: parse_body.c/part_multipart_headers_cmp() changed log output from ERR to DBG in case a header does not exist
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 106b8a659bd4a53e8a6872e9db8a9af0f12ff70a URL: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-07T13:10:30+02:00 core: parse_body.c/part_multipart_headers_cmp() changed log output from ERR to DBG in case a header does not exist --- Modified: src/core/parser/parse_body.c --- Diff: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… Patch: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… --- diff --git a/src/core/parser/parse_body.c b/src/core/parser/parse_body.c index 9794e43fb1..a9a3e64b82 100644 --- a/src/core/parser/parse_body.c +++ b/src/core/parser/parse_body.c @@ -475,8 +475,9 @@ int part_multipart_headers_cmp (char *buffer, ; } } else { + /* Nothing matched */ error = -9; - error_msg = "We reached the end of the buffer"; + error_msg = "Unsuccessfully reached the end of the buffer"; } found = found_content_type * found_content_id * found_content_length; if ((!found) && (!error)) { @@ -504,7 +505,7 @@ int part_multipart_headers_cmp (char *buffer, } if (error < 0) { - if(error == -2) { + if ((error == -2) || (error == -9)) { LM_DBG("result code: \"%i\" text: \"%s\".\n", error, error_msg); } else { LM_ERR("error code: \"%i\" error text: \"%s\".\n", error, error_msg);

1 0

git:master:5f1959cd: lost: typedef naming changed and copyright added
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 5f1959cd42ff925009dd9e0fdd87f9d0487ec4fe URL: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-08T21:31:24+02:00 lost: typedef naming changed and copyright added --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/naptr.c Modified: src/modules/lost/naptr.h Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d… Patch: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d…

1 0

git:master:25378c03: lost: README update
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 25378c0388bb4365e8d4f1a4e874381fe339cd3b URL: https://github.com/kamailio/kamailio/commit/25378c0388bb4365e8d4f1a4e874381… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-30T21:50:48+02:00 lost: README update --- Modified: src/modules/lost/doc/lost.xml Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/25378c0388bb4365e8d4f1a4e874381… Patch: https://github.com/kamailio/kamailio/commit/25378c0388bb4365e8d4f1a4e874381…

1 0

git:master:01fa6d96: lost: removed some typos and added explanatory text to doc
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 01fa6d962258a7ea82e6d3fe2d56f98b94806a31 URL: https://github.com/kamailio/kamailio/commit/01fa6d962258a7ea82e6d3fe2d56f98… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-04T23:09:02+02:00 lost: removed some typos and added explanatory text to doc --- Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/lost.c --- Diff: https://github.com/kamailio/kamailio/commit/01fa6d962258a7ea82e6d3fe2d56f98… Patch: https://github.com/kamailio/kamailio/commit/01fa6d962258a7ea82e6d3fe2d56f98… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 2ef2605f19..1df4aefd21 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -185,8 +185,7 @@ <title><varname>post_request</varname> (int)</title> <para> Dereferencing the location can be done using either the HTTP GET or POST method. This parameter - This parameter globally defines whether only HTTP POST method should be used. Values are 0 (GET) - or 1 (POST). + globally defines whether only HTTP POST method should be used. Values are 0 (GET) or 1 (POST). </para> <para> Default: 0 (GET) @@ -405,6 +404,7 @@ xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va </title> <para> Sends a HELD POST locationRequest to a given URL. Attributes are responseTime and resposeType. + The <emphasis>locationType</emphasis> property "exact" is set to "false". </para> <itemizedlist> <listitem><para> diff --git a/src/modules/lost/lost.c b/src/modules/lost/lost.c index ab6ef510e6..06b3bff2a2 100644 --- a/src/modules/lost/lost.c +++ b/src/modules/lost/lost.c @@ -411,7 +411,7 @@ static int w_lost_held_deref(struct sip_msg *_m, char *_url, char *_rtime, } /* - * Wrapper for lost_query w/o pudf, urn + * Wrapper for lost_query w/o pidf, urn */ static int w_lost_query( struct sip_msg *_m, char *_con, char *_uri, char *_name, char *_err)

1 0

git:master:b458bbcb: lost: memory leak fix and code refactoring
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: b458bbcba00cd6678617f004bbdeff2a1b0c524d URL: https://github.com/kamailio/kamailio/commit/b458bbcba00cd6678617f004bbdeff2… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-31T23:14:14+02:00 lost: memory leak fix and code refactoring --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/b458bbcba00cd6678617f004bbdeff2… Patch: https://github.com/kamailio/kamailio/commit/b458bbcba00cd6678617f004bbdeff2…

1 0

git:master:2f48d0cd: lost: DOM level count fix
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 2f48d0cdc84eaa583a2f2b6837e6251e62abc901 URL: https://github.com/kamailio/kamailio/commit/2f48d0cdc84eaa583a2f2b6837e6251… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-30T21:15:56+02:00 lost: DOM level count fix --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/2f48d0cdc84eaa583a2f2b6837e6251… Patch: https://github.com/kamailio/kamailio/commit/2f48d0cdc84eaa583a2f2b6837e6251… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 7aef5ea9d3..06a1727d74 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -1234,8 +1234,11 @@ int lost_xpath_location(xmlDocPtr doc, char *path, p_loc_t loc) } else { LM_WARN("xpath location-info element(%d) ignored\n", i + 1); } + /* clean up */ xmlFree(xmlbuff); xmlFreeDoc(new); + /* reset level count */ + nok = -1; } } } else {

1 0

git:master:5f50cc0e: http_client: duplicated code removed
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 5f50cc0ec7017a325d25249e6e66e6a2feb4dd08 URL: https://github.com/kamailio/kamailio/commit/5f50cc0ec7017a325d25249e6e66e6a… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-30T21:33:09+02:00 http_client: duplicated code removed --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/5f50cc0ec7017a325d25249e6e66e6a… Patch: https://github.com/kamailio/kamailio/commit/5f50cc0ec7017a325d25249e6e66e6a… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 54edfe9d32..7e2a9d66ba 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -637,10 +637,10 @@ int curl_con_query_url(struct sip_msg *_m, const str *connection, /*! * Performs http request and saves possible result (first body line of reply) * to pvar. - * This is the same http_query as used to be in the utils module. + * Similar to http_client_request but supports setting a content type attribute. */ -int http_client_request_c( - sip_msg_t *_m, char *_url, str *_dst, char *_body, char* ctype, char *_hdrs, char *_met) +int http_client_request_c(sip_msg_t *_m, char *_url, str *_dst, char *_body, + char* _ctype, char *_hdrs, char *_met) { int res; curl_query_t query_params; @@ -649,7 +649,7 @@ int http_client_request_c( query_params.username = NULL; query_params.secret = NULL; query_params.authmethod = default_authmethod; - query_params.contenttype = ctype ? (char *)ctype : "text/plain"; + query_params.contenttype = _ctype; query_params.hdrs = _hdrs; query_params.post = _body; query_params.clientcert = NULL; @@ -699,53 +699,7 @@ int http_client_request_c( int http_client_request( sip_msg_t *_m, char *_url, str *_dst, char *_body, char *_hdrs, char *_met) { - int res; - curl_query_t query_params; - - memset(&query_params, 0, sizeof(curl_query_t)); - query_params.username = NULL; - query_params.secret = NULL; - query_params.authmethod = default_authmethod; - query_params.contenttype = NULL; - query_params.hdrs = _hdrs; - query_params.post = _body; - query_params.clientcert = NULL; - query_params.clientkey = NULL; - query_params.cacert = NULL; - query_params.ciphersuites = NULL; - query_params.tlsversion = default_tls_version; - query_params.verify_peer = default_tls_verify_peer; - query_params.verify_host = default_tls_verify_host; - query_params.timeout = default_connection_timeout; - query_params.http_follow_redirect = default_http_follow_redirect; - query_params.oneline = default_query_result; - query_params.maxdatasize = default_query_maxdatasize; - query_params.netinterface = default_netinterface; - if(default_useragent.s != NULL && default_useragent.len > 0) { - query_params.useragent = default_useragent.s; - } - if(default_http_proxy.s != NULL && default_http_proxy.len > 0) { - query_params.http_proxy = default_http_proxy.s; - if(default_http_proxy_port > 0) { - query_params.http_proxy_port = default_http_proxy_port; - } - } - if(default_tls_clientcert.s != NULL && default_tls_clientcert.len > 0) { - query_params.clientcert = default_tls_clientcert.s; - } - if(default_tls_clientkey.s != NULL && default_tls_clientkey.len > 0) { - query_params.clientkey = default_tls_clientkey.s; - } - if(default_tls_cacert != NULL) { - query_params.cacert = default_tls_cacert; - } - if(default_cipher_suite_list.s != NULL && default_cipher_suite_list.len) { - query_params.ciphersuites = default_cipher_suite_list.s; - } - - res = curL_request_url(_m, _met, _url, _dst, &query_params); - - return res; + return http_client_request_c(_m, _url, _dst, _body, NULL, _hdrs, _met); } /*!

1 0

git:master:f7f68c57: http_client: http_client_request (api) content-type header support
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: f7f68c57e11124bd94ae21a40d11fcab93a8508f URL: https://github.com/kamailio/kamailio/commit/f7f68c57e11124bd94ae21a40d11fca… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-15T14:13:11+01:00 http_client: http_client_request (api) content-type header support - new api call including a content-type argument implemented as new function - required to resolve geolocation url using POST (#2641) - Note: not sure if this is the most elegant solution, but it helps to avoid backward compatibility issues --- Modified: src/modules/http_client/curl_api.c Modified: src/modules/http_client/curl_api.h Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h --- Diff: https://github.com/kamailio/kamailio/commit/f7f68c57e11124bd94ae21a40d11fca… Patch: https://github.com/kamailio/kamailio/commit/f7f68c57e11124bd94ae21a40d11fca…

1 0

git:master:356fba18: lost: new features, attributes and a new function to dereference location
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 356fba18ac5eef25e67a2357b4cdcd9255810094 URL: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-15T14:18:57+01:00 lost: new features, attributes and a new function to dereference location - features: LoST redirect, dynamic HELD url resolving (#2574), LoST NAPTR, POST request to dereference loation - attributes: reponse_time (-1:emergencyDispatch, 0:emergencyRouting, >0[ms]); post_request (POST method to dereference location #2641); recursion (yes/no); location_profile (PIDF/LO profile selection: first/last/geo/civic); verbose (detailed LoST response as log INFO); geoheader_type (filter schema: any/cid/http/https); geoheader_order (first/last) - function: lost_held_dereference (specific function to dereference location using POST method); attributes are url (r), resp.-time (r), resp.-type (r), pidf (r/w) and error (r/w) - general: The extension of the module allows dynamic querying of LIS/HELD and LOST services via NAPTR lookup. In the case of LOST, a redirect response is evaluated. In case a lost_held_request (used to connect to a LIS via POST or GET) is passed with an empty string ("") for the connection parameter, then P-A-I or From header value hostnames are used for NAPTR lookup to get a corresponding service. --- Added: src/modules/lost/naptr.c Added: src/modules/lost/naptr.h Added: src/modules/lost/response.c Added: src/modules/lost/response.h Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9… Patch: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9…

1 0

git:master:ffb0a862: lost: bug-fix due to a code formatting error
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: ffb0a8624af952e619ddc5f6fa29c6655f17d4c9 URL: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-16T10:29:04+01:00 lost: bug-fix due to a code formatting error --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… Patch: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 8f56a61816..7aef5ea9d3 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -442,7 +442,10 @@ p_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) && (hf->name.len == LOST_GEOLOC_HEADER_SIZE - 2)) { /* possible hit */ if(strncasecmp(hf->name.s, LOST_GEOLOC_HEADER, - LOST_GEOLOC_HEADER_SIZE) == 0) { + LOST_GEOLOC_HEADER_SIZE) == 0) { + + hdr.s = hf->body.s; + hdr.len = hf->body.len; LM_DBG("found geolocation header [%.*s]\n", hdr.len, hdr.s);

1 0

xflag losing state on serial forking
by David Escartin 09 Apr '21

09 Apr '21

Dear all i think i have noticed a wrong behaviour with xflags. When they are set in a failure_route and a t_relay is done after that to a destination, its state is lost in the next on_reply route. This doesn't happen with regular transaction flags, and it doesn't happen with xflags either when xflag is set inside an onreply_route. We have seen it on versions 5.3 and 5.4 Could you please confirm this? thanks a lot regards david escartin -- [image: Logo] David Escartín Almudévar VoIP/Switch Engineer descartin(a)sonoc.io *SONOC* C/ Josefa Amar y Borbón, 10, 4ª · 50001 Zaragoza, España Tlf: +34 917019888 · www.sonoc.io

1 2

git:master:abf9f244: core: main - checking of optarg for covering all unixes
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: abf9f244a96a9c2112036af24a1cc3435b6be41d URL: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T09:34:29+02:00 core: main - checking of optarg for covering all unixes --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… Patch: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… --- diff --git a/src/main.c b/src/main.c index 44fb940393..405b442158 100644 --- a/src/main.c +++ b/src/main.c @@ -2095,6 +2095,10 @@ int main(int argc, char** argv) ksr_cfg_print_mode = 1; break; case KARGOPTVAL+10: + if (optarg == NULL) { + fprintf(stderr, "bad atexit value\n"); + goto error; + } if(optarg[0]=='y' || optarg[0]=='1') { ksr_atexit_mode = 1; } else if(optarg[0]=='n' || optarg[0]=='0') { @@ -2234,6 +2238,10 @@ int main(int argc, char** argv) }; break; case 'u': + if (optarg == NULL) { + fprintf(stderr, "bad -u parameter\n"); + goto error; + } /* user needed for possible shm. pre-init */ user=optarg; break; @@ -2293,6 +2301,10 @@ int main(int argc, char** argv) /* long options */ case KARGOPTVAL: + if (optarg == NULL) { + fprintf(stderr, "bad alias parameter\n"); + goto error; + } if(parse_phostport(optarg, &tmp, &tmp_len, &port, &proto)!=0) { fprintf(stderr, "Invalid alias value '%s'\n", optarg); @@ -2304,24 +2316,40 @@ int main(int argc, char** argv) } break; case KARGOPTVAL+1: + if (optarg == NULL) { + fprintf(stderr, "bad subst parameter\n"); + goto error; + } if(pp_subst_add(optarg)<0) { LM_ERR("failed to add subst expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+2: + if (optarg == NULL) { + fprintf(stderr, "bad substdef parameter\n"); + goto error; + } if(pp_substdef_add(optarg, 0)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+3: + if (optarg == NULL) { + fprintf(stderr, "bad substdefs parameter\n"); + goto error; + } if(pp_substdef_add(optarg, 1)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+4: + if (optarg == NULL) { + fprintf(stderr, "bad server if parameter\n"); + goto error; + } server_id=(int)strtol(optarg, &tmp, 10); if ((tmp==0) || (*tmp)){ LM_ERR("bad server_id value: %s\n", optarg); @@ -2383,12 +2411,20 @@ int main(int argc, char** argv) while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case KARGOPTVAL+5: + if (optarg == NULL) { + fprintf(stderr, "bad load module parameter\n"); + goto error; + } if (load_module(optarg)!=0) { LM_ERR("failed to load the module: %s\n", optarg); goto error; } break; case KARGOPTVAL+6: + if (optarg == NULL) { + fprintf(stderr, "bad modparam parameter\n"); + goto error; + } if(set_mod_param_serialized(optarg) < 0) { LM_ERR("failed to set modparam: %s\n", optarg); goto error;

1 0

New Module Hash Table
by Dave Greeko 09 Apr '21

09 Apr '21

Dear All, I've successfully created a Kamailio module(thanks to the concise documentation.) My logic requires a synchronized access to an in-memory-only hash table from multiple Kamailio child-processes. Here is what I am trying to do: 1. Create a hash table(s) upon module init 2. Insert entries from any child process (based on business logic) 3. Retrieve entries from any child process with proper locking 4. Delete entries from any child process I would really appreciate it if anyone can point me to some samples where I can incorporate into my module the hash table functionalities that already exists in kamailio tree instead of doing my own because I would like to take advantage of Kamailio's memory managers(shared and private). Best Regards, Dave

1 0

[CRON] Still Failing: dbank888/kamailio#131 (master - 491e19e)
by Travis CI 08 Apr '21

08 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #131 Status: Still Failing Duration: 5 mins and 30 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/766405168?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:42d90d36: rr: conditions adjustmets for append from tag in record route preset
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 42d90d3665256c3d38945193b0a14ad199221bc6 URL: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T13:19:17+02:00 rr: conditions adjustmets for append from tag in record route preset --- Modified: src/modules/rr/record.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… Patch: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 083955803f..8624ee5e13 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -570,7 +570,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) hdr.len += user.len + 1; /* @ */ hdr.len += _data->len; - if (append_fromtag && from->tag_value.len) { + if (append_fromtag && from && from->tag_value.len) { hdr.len += RR_FROMTAG_LEN + from->tag_value.len; } @@ -612,7 +612,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) memcpy(p, _data->s, _data->len); p += _data->len; - if (append_fromtag && from->tag_value.len) { + if (append_fromtag && from && from->tag_value.len) { memcpy(p, RR_FROMTAG, RR_FROMTAG_LEN); p += RR_FROMTAG_LEN; memcpy(p, from->tag_value.s, from->tag_value.len); diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index d9cfedfaf9..67828d5d2d 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -253,7 +253,6 @@ static int direction_fixup(void** param, int param_no) return E_CFG; } if (param_no==1) { - n = 0; s = (char*) *param; if ( strcasecmp(s,"downstream")==0 ) { n = RR_FLOW_DOWNSTREAM;

1 0

git:master:f33abd5e: nat_traversal: check parameter for send_keepalive()
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: f33abd5e2d5978ba9e6e8a48066b0daff70c0b3b URL: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T12:05:07+02:00 nat_traversal: check parameter for send_keepalive() --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… Patch: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 27dbf2736d..4cfe8d4018 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1554,6 +1554,11 @@ static void send_keepalive(NAT_Contact *contact) unsigned short lport; char lproto; + if(contact==NULL || contact->socket==NULL) { + LM_ERR("invalid parameters\n"); + return; + } + if(keepalive_params.from == NULL) { if(contact->socket != last_socket) { memcpy(from_ip, contact->socket->address_str.s,

1 0

git:master:c200d2e9: rtpengine: reworked condition around locking for easier pairing
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: c200d2e9109a5581491bebd91c30162716b0f4fa URL: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:54:33+02:00 rtpengine: reworked condition around locking for easier pairing - inside rtpengine_hash_table_insert() --- Modified: src/modules/rtpengine/rtpengine_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… Patch: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… --- diff --git a/src/modules/rtpengine/rtpengine_hash.c b/src/modules/rtpengine/rtpengine_hash.c index eda947fe26..770bf494e0 100644 --- a/src/modules/rtpengine/rtpengine_hash.c +++ b/src/modules/rtpengine/rtpengine_hash.c @@ -221,16 +221,16 @@ int rtpengine_hash_table_insert(str callid, str viabranch, struct rtpengine_hash // get entry list hash_index = str_hash(callid); entry = rtpengine_hash_table->row_entry_list[hash_index]; - last_entry = entry; - // lock - if (rtpengine_hash_table->row_locks[hash_index]) { - lock_get(rtpengine_hash_table->row_locks[hash_index]); - } else { - LM_ERR("NULL rtpengine_hash_table->row_locks[%d]\n", hash_index); + if (entry==NULL || rtpengine_hash_table->row_locks[hash_index]==NULL) { + LM_ERR("NULL entry or lock for hash table slot[%d]\n", hash_index); return 0; } + last_entry = entry; + // lock + lock_get(rtpengine_hash_table->row_locks[hash_index]); + while (entry) { // if found, don't add new entry if (str_equal(entry->callid, new_entry->callid) &&

1 0

git:master:7ea3b97c: core: dns cache - safety checks for rdata field
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 7ea3b97c8acf8b623563b7a9fbf4ba23ea3e9170 URL: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:37:08+02:00 core: dns cache - safety checks for rdata field --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… Patch: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 9a63a5bd21..7dbde8f378 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -4012,7 +4012,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, size = e->total_size; if (rdata_size) { /* we have to extend the entry */ - rounded_size = ROUND_POINTER(size); /* size may not have been + rounded_size = ROUND_POINTER(size); /* size may not have been rounded previously */ switch (e->type) { case T_A: @@ -4064,7 +4064,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, /* fix the pointers inside the rr structures */ last_rr = NULL; for (rr=new->rr_lst; rr; rr=rr->next) { - rr->rdata = (void*)translate_pointer((char*)new, (char*)e, + rr->rdata = (void*)translate_pointer((char*)new, (char*)e, (char*)rr->rdata); if (rr->next) rr->next = (struct dns_rr*)translate_pointer((char*)new, (char*)e, @@ -4074,6 +4074,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, switch(e->type){ case T_NAPTR: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the NAPTR rdata stucture */ ((struct naptr_rdata*)rr->rdata)->flags = translate_pointer((char*)new, (char*)e, @@ -4092,6 +4096,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, ((struct naptr_rdata*)rr->rdata)->repl); break; case T_TXT: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the TXT structure */ for (i=0; i<((struct txt_rdata*)rr->rdata)->cstr_no; i++){ ((struct txt_rdata*)rr->rdata)->txt[i].cstr= @@ -4100,6 +4108,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, } break; case T_EBL: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the EBL structure */ ((struct ebl_rdata*)rr->rdata)->separator = translate_pointer((char*)new, (char*)e, @@ -4140,7 +4152,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, * If there is an existing record with the same name and value * (ip address in case of A/AAAA record, name in case of SRV record) * only the remaining fields are updated. - * + * * Note that permanent records cannot be overwritten unless * the new record is also permanent. A permanent record * completely replaces a non-permanent one.

1 0

git:master:1737e944: core: parse headers - check if anything was parsed
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 1737e9443d6617350c5e6044aef07be565a345d0 URL: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:20:32+02:00 core: parse headers - check if anything was parsed --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… Patch: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 4efb875d85..795c96a350 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -316,13 +316,14 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (unlikely(next)) { orig_flag = msg->parsed_flag; msg->parsed_flag &= ~flags; - }else + } else { orig_flag=0; + } #ifdef EXTRA_DEBUG DBG("flags=%llx\n", (unsigned long long)flags); #endif - while( tmp<end && (flags & msg->parsed_flag) != flags){ + while(tmp<end && (flags & msg->parsed_flag) != flags) { prefetch_loc_r(tmp+64, 1); hf=pkg_malloc(sizeof(struct hdr_field)); if (unlikely(hf==0)){ @@ -619,18 +620,25 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int #endif tmp=rest; } + skip: msg->unparsed=tmp; + if(msg->headers==NULL) { + /* nothing parsed - invalid input sip message */ + goto error1; + } /* restore original flags */ msg->parsed_flag |= orig_flag; return 0; error: - ser_error=E_BAD_REQ; if (hf) { clean_hdr_field(hf); pkg_free(hf); } + +error1: + ser_error=E_BAD_REQ; /* restore original flags */ msg->parsed_flag |= orig_flag; return -1;

1 0

git:master:9c7a509f: tm: t_fifo.c - free app in case of error
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 9c7a509f7189de8ce600a97b7c1c5f9e4f5afdb1 URL: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:25:05+02:00 tm: t_fifo.c - free app in case of error --- Modified: src/modules/tm/t_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… Patch: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… --- diff --git a/src/modules/tm/t_fifo.c b/src/modules/tm/t_fifo.c index cd3bb296ab..ea4e96b99a 100644 --- a/src/modules/tm/t_fifo.c +++ b/src/modules/tm/t_fifo.c @@ -214,6 +214,7 @@ int parse_tw_append( modparam_t type, void* val) app->name.s = (char*)pkg_malloc( foo.len+1 ); if (app->name.s==0) { PKG_MEM_ERROR; + pkg_free(app); goto error; } memcpy( app->name.s, foo.s, foo.len);

1 0

git:master:74fa6c55: core: main - coherent behaviour for fix_cfg_file()
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 74fa6c5570d6394af8c5352bd37e21e970f1575c URL: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:38:48+02:00 core: main - coherent behaviour for fix_cfg_file() - duplicate to build the output always, safer not to try to change the static string defined via macro at runtime --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… Patch: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… --- diff --git a/src/main.c b/src/main.c index 4dac30179c..44fb940393 100644 --- a/src/main.c +++ b/src/main.c @@ -1260,14 +1260,15 @@ static struct name_lst* parse_phostport_mh(char* s, char** host, int* hlen, -/** Update \c cfg_file variable to contain full pathname. The function updates +/** Update \c cfg_file variable to contain full pathname or '-' (for stdin) + * allocated in system memory. The function updates * the value of \c cfg_file global variable to contain full absolute pathname - * to the main configuration file of SER. The function uses CFG_FILE macro to + * to the main configuration file. The function uses CFG_FILE macro to * determine the default path to the configuration file if the user did not * specify one using the command line option. If \c cfg_file contains an - * absolute pathname then it is used unmodified, if it contains a relative + * absolute pathname then it is cloned unmodified, if it contains a relative * pathanme than the value returned by \c getcwd function will be added at the - * beginning. This function must be run before SER changes its current working + * beginning. This function must be run before changing its current working * directory to / (in daemon mode). * @return Zero on success, negative number * on error. @@ -1276,34 +1277,55 @@ int fix_cfg_file(void) { char* res = NULL; size_t max_len, cwd_len, cfg_len; - + if (cfg_file == NULL) cfg_file = CFG_FILE; - if (cfg_file[0] == '/') return 0; - if (cfg_file[0] == '-' && strlen(cfg_file)==1) return 0; - + if (cfg_file[0] == '/') { + cfg_len = strlen(cfg_file); + if(cfg_len < 2) { + /* do not accept only '/' */ + fprintf(stderr, "ERROR: invalid cfg file value\n"); + return -1; + } + if ((res = malloc(cfg_len + 1)) == NULL) goto error; + memcpy(res, cfg_file, cfg_len); + cfg_file[cfg_len] = 0; + cfg_file = res; + return 0; + } + if (cfg_file[0] == '-') { + cfg_len = strlen(cfg_file); + if(cfg_len == 1) { + if ((res = malloc(2)) == NULL) goto error; + res[0] = '-'; + res[1] = '\0'; + cfg_file = res; + return 0; + } + } + /* cfg_file contains a relative pathname, get the current * working directory and add it at the beginning */ cfg_len = strlen(cfg_file); - + max_len = pathmax(); if ((res = malloc(max_len)) == NULL) goto error; - + if (getcwd(res, max_len) == NULL) goto error; cwd_len = strlen(res); - + /* Make sure that the buffer is big enough */ if (cwd_len + 1 + cfg_len >= max_len) goto error; - + res[cwd_len] = '/'; memcpy(res + cwd_len + 1, cfg_file, cfg_len); - + res[cwd_len + 1 + cfg_len] = '\0'; /* Add terminating zero */ cfg_file = res; return 0; - + error: - fprintf(stderr, "ERROR: Unable to fix cfg_file to contain full pathname\n"); + fprintf(stderr, "ERROR: Unable to fix cfg file to contain full pathname\n"); if (res) free(res); return -1; }

1 0

git:master:563c6f69: core: cfg.lex - free after log message
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 563c6f69aef22a90fc7870398fcfbd4242e33779 URL: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:36:02+02:00 core: cfg.lex - free after log message --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… Patch: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d36fc72b54..2b90fbb66a 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1802,13 +1802,14 @@ static int sr_push_yy_state(char *fin, int mode) fp = fopen(newf, "r" ); if ( fp==NULL ) { - pkg_free(newf); if(mode==0) { LM_CRIT("cannot open included file: %s (%s)\n", fbuf, newf); + pkg_free(newf); return -1; } else { LM_DBG("importing file ignored: %s (%s)\n", fbuf, newf); + pkg_free(newf); return 0; } }

1 0

git:master:7dd643a8: dlgs: safety check for accessing next field
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 7dd643a88fd7944ee86b795298c76e6d5fd58b8f URL: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:36:49+02:00 dlgs: safety check for accessing next field --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… Patch: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 1f6af22ba3..d3084084d5 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -970,7 +970,9 @@ void dlgs_ht_timer(unsigned int ticks, void *param) it->prev = NULL; } } else { - ite->prev->next = it; + if(ite->prev) { + ite->prev->next = it; + } if(it!=NULL) { it->prev = ite->prev; }

1 0

git:master:7ef0a272: core: check for non empty receive address and port in msg translator
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 7ef0a272dc9c81afa05ef8b1591e9f05c2810e9a URL: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T11:33:24+02:00 core: check for non empty receive address and port in msg translator --- Modified: src/core/msg_translator.c Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… Patch: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4622b264d5..a2f6505e83 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -597,7 +597,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, #define SUBST_LUMP_LEN(subst_l) \ switch((subst_l)->u.subst){ \ case SUBST_RCV_IP: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ new_len+=recv_address_str->len; \ if (msg->rcv.bind_address->address.af!=AF_INET) \ new_len+=2; \ @@ -607,7 +607,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, }; \ break; \ case SUBST_RCV_PORT: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_port_str)){ \ new_len+=recv_port_str->len; \ }else{ \ /* FIXME */ \ @@ -646,14 +646,14 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, break; \ case SUBST_RCV_ALL: \ case SUBST_RCV_ALL_EX: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ new_len+=recv_address_str->len; \ if ((msg->rcv.bind_address->address.af==AF_INET6)\ && (recv_address_str->s[0]!='[')\ && (memchr(recv_address_str->s, ':',\ recv_address_str->len)!=NULL))\ new_len+=2; \ - if (recv_port_no!=SIP_PORT){ \ + if (recv_port_no!=SIP_PORT && STR_WITHVAL(recv_port_str)){ \ /* add :port_no */ \ new_len+=1+recv_port_str->len; \ }\ @@ -990,7 +990,7 @@ void process_lumps( struct sip_msg* msg, #define SUBST_LUMP(subst_l) \ switch((subst_l)->u.subst){ \ case SUBST_RCV_IP: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ if (msg->rcv.bind_address->address.af!=AF_INET){\ new_buf[offset]='['; offset++; \ }\ @@ -1006,7 +1006,7 @@ void process_lumps( struct sip_msg* msg, }; \ break; \ case SUBST_RCV_PORT: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_port_str)){ \ memcpy(new_buf+offset, recv_port_str->s, \ recv_port_str->len); \ offset+=recv_port_str->len; \ @@ -1017,7 +1017,7 @@ void process_lumps( struct sip_msg* msg, break; \ case SUBST_RCV_ALL: \ case SUBST_RCV_ALL_EX: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ /* address */ \ if ((msg->rcv.bind_address->address.af==AF_INET6)\ && (recv_address_str->s[0]!='[')\ @@ -1035,7 +1035,7 @@ void process_lumps( struct sip_msg* msg, new_buf[offset]=']'; offset++; \ }\ /* :port */ \ - if (recv_port_no!=SIP_PORT){ \ + if (recv_port_no!=SIP_PORT && STR_WITHVAL(recv_port_str)){ \ new_buf[offset]=':'; offset++; \ memcpy(new_buf+offset, \ recv_port_str->s, \ diff --git a/src/core/str.h b/src/core/str.h index 58d7d627f6..d7977652d9 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -142,6 +142,11 @@ typedef struct _str str; } \ } while(0) +/** + * str with value: not null and not emptu + */ +#define STR_WITHVAL(_sp) ((_sp) && ((_sp)->s) && ((_sp)->len)) + /** @} */ /** Appends a sufffix

1 0

[kamailio/kamailio] volte：401 Unauthorized (#2703)
by King-Osmond 07 Apr '21

07 Apr '21

Hello! I have a problem about volte. > 4(4467) INFO: rr [rr_mod.c:515]: pv_get_route_uri_f(): No route header present. > 4(4467) NOTICE: <script>: PCSCF REGISTER: > Destination URI: <null> > Request URI: sip:ims.mnc007.mcc460.3gppnetwork.org > 4(4467) INFO: rr [rr_mod.c:515]: pv_get_route_uri_f(): No route header present. > 4(4467) NOTICE: <script>: Source IP and Port: (10.45.0.6:5060) > Route-URI: > 4(4467) NOTICE: <script>: Received IP and Port: (192.168.107.6:5060) > 4(4467) NOTICE: <script>: Contact header: <sip:460070000000001@10.45.0.6:5060>;+sip.instance="<urn:gsma:imei:86772304-493882-0>";+g.3gpp.accesstype="cellular2";audio;video;+g.3gpp.smsip;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel" > 4(4467) INFO: ims_registrar_pcscf [sec_agree.c:296]: cscf_get_security_verify(): No sec ![1617780139(1)](https://user-images.githubusercontent.com/65008453/113834050-f41b2e80-97bc-11eb-8ebb-c669f2fee210.png) ![1617780742(1)](https://user-images.githubusercontent.com/65008453/113834075-fa110f80-97bc-11eb-951c-9a75283ff69a.png) urity-verify parameters found ![1617781355(1)](https://user-images.githubusercontent.com/65008453/113834098-04330e00-97bd-11eb-8dd3-3ff310df2e7c.png) [open5gs.tar.gz](https://github.com/kamailio/kamailio/files/6270079/open5gs.… Can you help me see where the problem is？ Thanks! Tips：About SQN, the SQN is the same at the beginning of the test (Open5GS, FOHSS), but when it is found that the sip registration fails, the SQN is inconsistent. If this situation is normal? If it is not normal, how to solve it? open5gs：v2.2.3 kamailio：5.3 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2703

2 2

git:master:7457b3ce: app_python3: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 7457b3cefd08595c054291398de0f9a4e62691b7 URL: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_python3: init timeval structures --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… Patch: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 7af949de6e..f3463a781f 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1791,7 +1791,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:50f92131: app_ruby: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 50f92131ac0a9f5dd1e19fb6e3636657ad996e37 URL: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_ruby: init timeval structures --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… Patch: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 41e6a3ec9e..116c4358ea 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -1421,7 +1421,7 @@ VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:e8583372: app_sqlang: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: e8583372cb1078a29bb6526c11f838e30811b94a URL: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:25+02:00 app_sqlang: init timeval structures --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… Patch: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 192e059e2e..7bff2a87d3 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1548,7 +1548,7 @@ int sr_kemi_sqlang_exec_func(HSQUIRRELVM J, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:e1369a4c: app_lua: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: e1369a4cf0c668a0ee40d3b84b9c6382c2168e49 URL: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_lua: init timeval structures --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… Patch: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 3fa131ca3a..f736bea98b 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -1605,7 +1605,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff; lua_Debug dinfo;

1 0

git:master:97991c9c: app_python: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 97991c9cf56ca034df914ae499053e597582ef80 URL: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_python: init timeval structures --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… Patch: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 43a47d28ad..586926428a 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -1783,7 +1783,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:cad5cc37: app_jsdt: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: cad5cc37c63477fbcf429af34e516b523c74132e URL: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_jsdt: init timeval structures --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… Patch: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ff4e629075..c41d1d2217 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1339,7 +1339,7 @@ int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb ={0}, tve = {0}; struct timezone tz; unsigned int tdiff; int sline = 0;

1 0

git:master:3bb1a30d: ctl: free send_buf in case of error
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 3bb1a30dda3b40ba2f188a4baab94ebda41f4a74 URL: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:08:56+02:00 ctl: free send_buf in case of error - disabled unused function --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… Patch: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 8c786a680a..5aed95c40f 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -223,7 +223,7 @@ static struct rpc_struct_l* grow_rpc_struct(struct rpc_struct_l *rs) #endif - +#if 0 /* appends buf to an already init. binrpc_pkt */ inline static int append_pkt_body(struct binrpc_pkt* p, unsigned char* buf, int len) @@ -247,7 +247,7 @@ inline static int append_pkt_body(struct binrpc_pkt* p, unsigned char* buf, error: return -1; /* buff. overflow */ } - +#endif inline static int append_iovec(struct iovec_array* a, unsigned char* buf, @@ -379,6 +379,9 @@ inline static int init_binrpc_ctx( struct binrpc_ctx* ctx, } /* we'll keep only the body */ err=binrpc_init_pkt(&ctx->out.pkt, send_buf, send_buf_len); + if(err!=0) { + ctl_free(send_buf); + } end: return err; }

1 0

git:master:62e822ce: core: use same condition for extra_params in create_via_hf()
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 62e822ce25e93a8183dd9e5e1fee517143849a6a URL: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T09:53:39+02:00 core: use same condition for extra_params in create_via_hf() --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… Patch: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index c3587d2e88..4622b264d5 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2992,12 +2992,14 @@ char* create_via_hf(unsigned int *len, /* params so far + ';rport' + '\0' */ via = (char*)pkg_malloc(extra_params.len+RPORT_LEN); if(via==0) { - PKG_MEM_ERROR; + PKG_MEM_ERROR; if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len!=0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } memcpy(via + extra_params.len, RPORT, RPORT_LEN-1); @@ -3018,8 +3020,10 @@ char* create_via_hf(unsigned int *len, if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len != 0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } memcpy(via + extra_params.len, sbuf, slen); @@ -3038,12 +3042,14 @@ char* create_via_hf(unsigned int *len, if(xparams.len>0) { via = (char*)pkg_malloc(extra_params.len+xparams.len+2); if(via==0) { - PKG_MEM_ERROR; + PKG_MEM_ERROR; if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len != 0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } /* add ';' between via parameters */

1 0

git:master:02c5f298: crypto: use same condition to free ttext.s on success or error
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 02c5f298d3355b7bb4c85bd290bc8265591f0ab8 URL: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T17:54:46+02:00 crypto: use same condition to free ttext.s on success or error --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… Patch: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 955bf264bf..2099b25148 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -284,16 +284,18 @@ static int ki_crypto_aes_encrypt_helper(sip_msg_t* msg, str *ins, str *keys, val.flags = PV_VAL_STR; dst->setf(msg, &dst->pvp, (int)EQ_T, &val); - free(etext.s); - if (! _crypto_key_derivation) + if (ttext.s != etext.s) { pkg_free(ttext.s); + } + free(etext.s); EVP_CIPHER_CTX_cleanup(en); EVP_CIPHER_CTX_free(en); return 1; error: - if (ttext.s != etext.s) + if (ttext.s != etext.s) { pkg_free(ttext.s); + } error1: free(etext.s); EVP_CIPHER_CTX_cleanup(en);

1 0

git:master:7652f796: core: rvalue - link to free at end of rve_opt_01() instead on replace
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 7652f79640b3e792baa77531e697fd74a1ab4584 URL: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T17:23:16+02:00 core: rvalue - link to free at end of rve_opt_01() instead on replace - debug mode messages print fields --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… Patch: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index f96f8ea536..902f3c2c66 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -3185,6 +3185,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) struct rvalue* rv; struct rval_expr* ct_rve; struct rval_expr* v_rve; + struct rval_expr* r_rve = NULL; int i; int ret; enum rval_expr_op op; @@ -3208,7 +3209,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) pos=(e)->fpos; \ *(e)=*(v); /* replace e with v (in-place) */ \ (e)->fpos=pos; \ - pkg_free((v)); /* rve_destroy(v_rve) would free everything*/ \ + r_rve = v; /* link to free it */ \ }else{\ /* unknown type or str => (int) $v */ \ (e)->op=RVE_##ctype##_OP; \ @@ -3564,9 +3565,11 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) } } if (rv) rval_destroy(rv); + if (r_rve) pkg_free(r_rve); /* rve_destroy(v_rve) would free everything*/ return ret; error: if (rv) rval_destroy(rv); + if (r_rve) pkg_free(r_rve); /* rve_destroy(v_rve) would free everything*/ return -1; }

1 0

git:master:4f7b5537: core: main - several optarg safety checks
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 4f7b5537688293d196669dd5a7d0124f7656cf2d URL: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T14:48:34+02:00 core: main - several optarg safety checks --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… Patch: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… --- diff --git a/src/main.c b/src/main.c index 6d363ba375..4dac30179c 100644 --- a/src/main.c +++ b/src/main.c @@ -2140,6 +2140,10 @@ int main(int argc, char** argv) /* ignore, they were parsed immediately after startup */ break; case 'f': + if (optarg == NULL) { + fprintf(stderr, "bad -f parameter\n"); + goto error; + } cfg_file=optarg; break; case 'c': @@ -2147,10 +2151,18 @@ int main(int argc, char** argv) log_stderr=1; /* force stderr logging */ break; case 'L': + if (optarg == NULL) { + fprintf(stderr, "bad -L parameter\n"); + goto error; + } mods_dir = optarg; mods_dir_cmd = 1; break; case 'm': + if (optarg == NULL) { + fprintf(stderr, "bad shared mem size\n"); + goto error; + } shm_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad shmem size number: -m %s\n", @@ -2188,6 +2200,10 @@ int main(int argc, char** argv) /* ignore it, was parsed immediately after startup */ break; case 'O': + if (optarg == NULL) { + fprintf(stderr, "bad -O parameter\n"); + goto error; + } scr_opt_lev=strtol(optarg, &tmp, 10); if (tmp &&(*tmp)){ fprintf(stderr, "bad optimization level: -O %s\n", @@ -2200,6 +2216,10 @@ int main(int argc, char** argv) user=optarg; break; case 'A': + if (optarg == NULL) { + fprintf(stderr, "bad -A parameter\n"); + goto error; + } p = strchr(optarg, '='); if(p) { tmp_len = p - optarg; @@ -2451,6 +2471,10 @@ int main(int argc, char** argv) takes priority over config */ break; case 'b': + if (optarg == NULL) { + fprintf(stderr, "bad -b parameter\n"); + goto error; + } maxbuffer=strtol(optarg, &tmp, 10); if (tmp &&(*tmp)){ fprintf(stderr, "bad max buffer size number: -b %s\n", @@ -2473,6 +2497,10 @@ int main(int argc, char** argv) #endif break; case 'l': + if (optarg == NULL) { + fprintf(stderr, "bad -l parameter\n"); + goto error; + } p = strrchr(optarg, '/'); if(p==NULL) { p = optarg; @@ -2522,6 +2550,10 @@ int main(int argc, char** argv) free_name_lst(n_lst); break; case 'n': + if (optarg == NULL) { + fprintf(stderr, "bad -n parameter\n"); + goto error; + } children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -n %s\n", @@ -2548,6 +2580,10 @@ int main(int argc, char** argv) "TCP support disabled\n", optarg); goto error; } + if (optarg == NULL) { + fprintf(stderr, "bad -N parameter\n"); + goto error; + } tcp_cfg_children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -N %s\n", @@ -2560,6 +2596,10 @@ int main(int argc, char** argv) break; case 'W': #ifdef USE_TCP + if (optarg == NULL) { + fprintf(stderr, "bad -W parameter\n"); + goto error; + } tcp_poll_method=get_poll_type(optarg); if (tcp_poll_method==POLL_NONE){ fprintf(stderr, "bad poll method name: -W %s\ntry " @@ -2577,6 +2617,10 @@ int main(int argc, char** argv) "SCTP support disabled\n", optarg); goto error; } + if (optarg == NULL) { + fprintf(stderr, "bad -Q parameter\n"); + goto error; + } sctp_children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -O %s\n",

1 0

git:master:e770e0aa: core: rvalue - function to destroy content of rval without freeing it
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: e770e0aa6889f001a3f7f2644202bf106f6559da URL: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T15:23:21+02:00 core: rvalue - function to destroy content of rval without freeing it - needed in case of rval reuse in rve_replace_with_val() --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… Patch: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 22393057fb..f96f8ea536 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -112,10 +112,7 @@ inline static void rval_force_clean(struct rvalue* rv) -/** frees a rval returned by rval_new(), rval_convert() or rval_expr_eval(). - * Note: it will be freed only when refcnt reaches 0 - */ -void rval_destroy(struct rvalue* rv) +static inline void rval_destroy_helper(struct rvalue* rv, int allocated) { if (rv && rv_unref(rv)){ rval_force_clean(rv); @@ -126,13 +123,38 @@ void rval_destroy(struct rvalue* rv) regfree(rv->v.re.regex); } if (rv->flags & RV_RV_ALLOCED_F){ - pkg_free(rv); + if(likely(allocated)) { + pkg_free(rv); + } else { + /* not expected to be allocated */ + abort(); /* abort, otherwise is lost - find bugs quicker */ + } } } } +/** frees a rval returned by rval_new(), rval_convert() or rval_expr_eval(). + * Note: it will be freed only when refcnt reaches 0 + */ +void rval_destroy(struct rvalue* rv) +{ + rval_destroy_helper(rv, 1); +} + + + +/** frees content of rval which is not allocated, otherwise aborts. + * Note: it will be freed only when refcnt reaches 0 + */ +void rval_destroy_content(struct rvalue* rv) +{ + rval_destroy_helper(rv, 0); +} + + + void rval_clean(struct rvalue* rv) { if (rv_unref(rv)) @@ -1523,7 +1545,7 @@ inline static int int_strop1(int* res, enum rval_expr_op op, str* s1) } - +#if 0 /** integer operation: ret= op v (returns a rvalue). * @return rvalue on success, 0 on error */ @@ -1619,7 +1641,7 @@ inline static struct rvalue* rval_intop2(struct run_act_ctx* h, rval_destroy(rv2); return 0; } - +#endif /* #if 0 */ /** string add operation: ret= l . r (returns a rvalue). @@ -3024,7 +3046,7 @@ static int rve_replace_with_val(struct rval_expr* rve, enum rval_type type, refcnt=rve->left.rval.refcnt; abort(); /* find bugs quicker -- andrei */ } - rval_destroy(&rve->left.rval); + rval_destroy_content(&rve->left.rval); } rval_init(&rve->left.rval, type, v, flags); rve->left.rval.refcnt=refcnt; @@ -3096,7 +3118,7 @@ static int fix_match_rve(struct rval_expr* rve) /* fixup the right side (RE) */ if (rve_is_constant(rve->right.rve)){ if ((rve_guess_type(rve->right.rve)!=RV_STR)){ - LM_ERR("fixup failure(%d,%d-%d,%d): left side of =~ is not string" + LM_ERR("fixup failure(%d,%d-%d,%d): right side of =~ is not string" " (%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col, rve->right.rve->fpos.s_line, @@ -3104,7 +3126,7 @@ static int fix_match_rve(struct rval_expr* rve) goto error; } if ((rv=rval_expr_eval(0, 0, rve->right.rve))==0){ - LM_ERR("fixup failure(%d,%d-%d,%d): bad RE expression\n", + LM_ERR("fixup failure(%d,%d-%d,%d): bad RE expression\n", rve->right.rve->fpos.s_line, rve->right.rve->fpos.s_col, rve->right.rve->fpos.e_line, rve->right.rve->fpos.e_col); goto error;

1 0

git:master:26ab0fcc: uac: do not free chunks already inserted as lumps
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 26ab0fcc97cbf0d6602454e60187a914f13424a2 URL: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T12:17:35+02:00 uac: do not free chunks already inserted as lumps - in case of errors happening later, the pointers are linked in sip_msg_t and will be freed there, otherwise will result in a double free --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… Patch: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 3a476a3d82..6e77eafe94 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -875,7 +875,7 @@ static void replace_callback(struct dlg_cell *dlg, int type, str old_uri; str* new_uri; str* new_display; - str buf; + str buf = STR_NULL; char *p; unsigned int uac_flag; int dlgvar_index = 0; @@ -968,11 +968,13 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free1; + pkg_free(buf.s); + return; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free1; + pkg_free(buf.s); + return; } } @@ -980,20 +982,22 @@ static void replace_callback(struct dlg_cell *dlg, int type, p = pkg_malloc( new_uri->len); if (!p) { PKG_MEM_ERROR; - goto free1; + return; } - memcpy( p, new_uri->s, new_uri->len); + memcpy(p, new_uri->s, new_uri->len); /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + l = del_lump(msg, old_uri.s-msg->buf, old_uri.len, 0); if (l==0) { LM_ERR("del lump failed\n"); - goto free2; + pkg_free(p); + return; } if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { LM_ERR("insert new lump failed\n"); - goto free2; + pkg_free(p); + return; } /* register tm callback to change replies, @@ -1007,12 +1011,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, msg->msg_flags |= uac_flag; return; - -free2: - pkg_free(p); - -free1: - pkg_free(buf.s); }

1 0

git:master:ddafeebf: core/mem: tlsf malloc - sync'ed with v3.1
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: ddafeebfaf1537c684eee22be228867563dd02ac URL: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T08:34:48+02:00 core/mem: tlsf malloc - sync'ed with v3.1 - tlsf malloc project: https://github.com/mattconte/tlsf - last commit when sync'ed: - https://github.com/mattconte/tlsf/commit/deff9ab509341f264addbd3c8ada533678… --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867… Patch: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867…

1 0

git:master:2d7aee50: core/mem: removed tlsf_malloc_bits.h
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 2d7aee506c617f2d258719562f8debf2b4ba087e URL: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T08:38:16+02:00 core/mem: removed tlsf_malloc_bits.h - no longer needed after sync with v3.1 --- Removed: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… Patch: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h deleted file mode 100644 index 29c783d4a4..0000000000 --- a/src/core/mem/tlsf_malloc_bits.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef INCLUDED_tlsfbits -#define INCLUDED_tlsfbits - -#if defined(__cplusplus) -#define tlsf_decl inline -#else -#define tlsf_decl static -#endif - -/* -** Architecture-specific bit manipulation routines. -** -** TLSF achieves O(1) cost for malloc and free operations by limiting -** the search for a free block to a free list of guaranteed size -** adequate to fulfill the request, combined with efficient free list -** queries using bitmasks and architecture-specific bit-manipulation -** routines. -** -** Most modern processors provide instructions to count leading zeroes -** in a word, find the lowest and highest set bit, etc. These -** specific implementations will be used when available, falling back -** to a reasonably efficient generic implementation. -** -** NOTE: TLSF spec relies on ffs/fls returning value 0..31. -** ffs/fls return 1-32 by default, returning 0 for error. -*/ - -/* -** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) -** architecture. There is no reliable portable method at compile-time. -*/ -#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ - || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) -#define TLSF_64BIT -#endif - -/* -** gcc 3.4 and above have builtin support, specialized for architecture. -** Some compilers masquerade as gcc; patchlevel test filters them out. -** -** Note: clang is compatible with GCC builtins and will also define those macros -*/ -#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ - && defined (__GNUC_PATCHLEVEL__) - -tlsf_decl int tlsf_ffs(unsigned int word) -{ - return __builtin_ffs(word) - 1; -} - -tlsf_decl int tlsf_fls(unsigned int word) -{ - const int bit = word ? 32 - __builtin_clz(word) : 0; - return bit - 1; -} - -#if defined (TLSF_64BIT) -tlsf_decl int tlsf_fls_sizet(size_t size) -{ - const int bit = size ? 64 - __builtin_clzl(size) : 0; - return bit - 1; -} -#endif -#else -/* Fall back to generic implementation. */ - -tlsf_decl int tlsf_fls_generic(unsigned int word) -{ - int bit = 32; - - if (!word) bit -= 1; - if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } - if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } - if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } - if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } - if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } - - return bit; -} - -/* Implement ffs in terms of fls. */ -tlsf_decl int tlsf_ffs(unsigned int word) -{ - return tlsf_fls_generic(word & (~word + 1)) - 1; -} - -tlsf_decl int tlsf_fls(unsigned int word) -{ - return tlsf_fls_generic(word) - 1; -} - -#if defined (TLSF_64BIT) -tlsf_decl int tlsf_fls_sizet(size_t size) -{ - int high = (int)(size >> 32); - int bits = 0; - if (high) - { - bits = 32 + tlsf_fls(high); - } - else - { - bits = tlsf_fls((int)size & 0xffffffff); - - } - return bits; -} -#endif /* defined (TLSF_64BIT) */ - -#endif /* GNUC */ - - -#if !defined (TLSF_64BIT) -#define tlsf_fls_sizet tlsf_fls -#endif - -#undef tlsf_decl - -#endif

1 0

[kamailio/kamailio] Add display name support to "pua_dialoginfo" (#2615)
by Jake Greene 05 Apr '21

05 Apr '21

### Description It doesn't look like the "pua_dialoginfo" module has support for the "display" attribute in the identity tag. This tag is used by some phones to update the phone display with caller/callee information for the respective key. I'm wondering how difficult it would be to add this feature. Thanks in advance for anyone who reads this! ### Expected behavior Kamailio includes display attribute in identity tags in generated publish messages. <pre> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="1" state="full"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" remote-tag="456887766" direction="initiator"> <state>early</state> <local> <identity <b><i>display="Alice"</i></b>>sip:alice@example.com</identity> <target uri="sip:alice@phone11.example.com"/> </local> <remote> <identity <b><i>display="Bob"</i></b>>sip:bob@example.org</identity> <target uri="sip:bobster@phone21.example.org"/> </remote> </dialog> </dialog-info> </pre> #### Actual observed behavior Kamailio generates a publish request for dialog events similar to the one below. The display attribute is not included in the "identity" tags. This means that when a notify message is sent to a watcher for this publish, the name is not rendered on the phone display. <pre> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="1" state="full"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" remote-tag="456887766" direction="initiator"> <state>early</state> <local> <b><identity>sip:alice@example.com</identity></b> <target uri="sip:alice@phone11.example.com"/> </local> <remote> <b><identity>sip:bob@example.org</identity></b> <target uri="sip:bobster@phone21.example.org"/> </remote> </dialog> </dialog-info> </pre> ### Possible Solutions I added a small modification to the module as a POC and it works as expected. With the following modification, the phone display is updated with the string in the “display” attribute. I added line 191-193 below, between lines 190 & 191 on the current master branch. The example below shows the “remote” tag, I also did the same thing for the local tag a few more lines down. <pre> 184 tag_node = xmlNewChild(remote_node, NULL, BAD_CAST "identity", 185 BAD_CAST buf) ; 186 if( tag_node ==NULL) 187 { 188 LM_ERR("while adding childn"); 189 goto error; 190 } 191 /* Testing - adding display attribute to the identity tag */ 192 xmlNewProp(tag_node, BAD_CAST "display", BAD_CAST "RemoteCallerName"); 193 /* */ 195 196 tag_node = xmlNewChild(remote_node, NULL, BAD_CAST "target", NULL); 197 if( tag_node ==NULL) </pre> Here is a link to the file in the module I’m referring to: https://github.com/kamailio/kamailio/blob/master/src/modules/pua_dialoginfo… I don’t really have any professional experience writing C code, and I was unable to identify a way to grab this string from the “From” header. Unfortunately, because I would have really loved to give this feature back to the community! ### Additional Information Thank you so much for this amazing software. I absolutely adore Kamailio! If someone is interested in this, please let me know if there is anything I can do to help. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2615

2 6

git:master:9c239dc3: core: checks for trying to define empty or null ids
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: 9c239dc385716255b977d8d879946e707e6f51c3 URL: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:50:31+02:00 core: checks for trying to define empty or null ids - use found pointer to compute the lenght of ID for -A parameter to save a strlen() --- Modified: src/core/cfg.lex Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… Patch: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index b8e4f9aa70..d36fc72b54 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1927,11 +1927,16 @@ ksr_ppdefine_t* pp_get_define(int idx) return &pp_defines[idx]; } -static int pp_lookup(int len, const char * text) +static int pp_lookup(int len, const char *text) { str var = {(char *)text, len}; int i; + if(len<=0 || text==NULL) { + LM_ERR("invalid parameters"); + return -1; + } + for (i=0; i<pp_num_defines; i++) if (STR_EQ(pp_defines[i].name, var)) return i; @@ -1945,10 +1950,15 @@ int pp_define_set_type(int type) return 0; } -int pp_define(int len, const char * text) +int pp_define(int len, const char *text) { int ppos; + if(len<=0 || text==NULL) { + LM_ERR("invalid parameters"); + return -1; + } + LM_DBG("defining id: %.*s\n", len, text); if (pp_num_defines == MAX_DEFINES) { @@ -2010,7 +2020,7 @@ int pp_define_set(int len, char *text) LM_BUG("BUG: the index in define table not set yet\n"); return -1; } - if(len<=0) { + if(len<=0 || text==NULL) { LM_DBG("no define value - ignoring\n"); return 0; } @@ -2046,7 +2056,7 @@ int pp_define_set(int len, char *text) return 0; } -int pp_define_env(const char * text, int len) +int pp_define_env(const char *text, int len) { char *r; str defname; @@ -2087,7 +2097,7 @@ int pp_define_env(const char * text, int len) return 0; } -str *pp_define_get(int len, const char * text) +str *pp_define_get(int len, const char *text) { str var = {(char *)text, len}; int i; @@ -2129,7 +2139,7 @@ static int pp_ifdef_type(int type) * ifndef defined -> 0 * ifndef undefined -> 1 */ -static void pp_ifdef_var(int len, const char * text) +static void pp_ifdef_var(int len, const char *text) { pp_ifdef_stack[pp_sptr] ^= (pp_lookup(len, text) < 0); } diff --git a/src/main.c b/src/main.c index ee558db13f..6d363ba375 100644 --- a/src/main.c +++ b/src/main.c @@ -2202,16 +2202,17 @@ int main(int argc, char** argv) case 'A': p = strchr(optarg, '='); if(p) { - *p = '\0'; + tmp_len = p - optarg; + } else { + tmp_len = strlen(optarg); } pp_define_set_type(0); - if(pp_define(strlen(optarg), optarg)<0) { + if(pp_define(tmp_len, optarg)<0) { fprintf(stderr, "error at define param: -A %s\n", optarg); goto error; } if(p) { - *p = '='; p++; if(pp_define_set(strlen(p), p)<0) { fprintf(stderr, "error at define value: -A %s\n",

1 0

git:master:a749cc53: tm: init timeval structs
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: a749cc53ac4aa4825ba8d720825db856d897efb2 URL: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T18:06:01+02:00 tm: init timeval structs --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… Patch: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index c8dd0c91ce..a46921cbfd 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1005,8 +1005,8 @@ int run_failure_handlers(tm_cell_t *t, struct sip_msg *rpl, struct sip_msg *shmem_msg = t->uas.request; int on_failure; sr_kemi_eng_t *keng = NULL; - struct timeval tvb; - struct timeval tve; + struct timeval tvb = {0}; + struct timeval tve = {0}; unsigned long tvd = 0; unsigned int t_hash_index = 0; unsigned int t_label = 0;

1 0

git:master:ef31c82a: core: cfg.len - sanitizer safety check of target buffer
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: ef31c82ac3bd7972c2d02c893f8041af4664b717 URL: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:31:48+02:00 core: cfg.len - sanitizer safety check of target buffer --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… Patch: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index afab5b68a5..b8e4f9aa70 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1593,7 +1593,7 @@ static char* addchar(struct str_buf* dst, char c) static char* addstr(struct str_buf* dst_b, char* src, int len) { - char *tmp; + char *tmp = NULL; unsigned size; unsigned used; @@ -1612,6 +1612,10 @@ static char* addstr(struct str_buf* dst_b, char* src, int len) dst_b->crt=dst_b->s+used; dst_b->left=size-used; } + if(dst_b->crt==NULL) { + LM_CRIT("unexpected null dst buffer\n"); + ksr_exit(-1); + } memcpy(dst_b->crt, src, len); dst_b->crt+=len; *(dst_b->crt)=0;

1 0

git:master:c08620f6: imc: expect the second param only if first is set
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: c08620f6427d59749396fe2762e340328ce69c41 URL: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:35:12+02:00 imc: expect the second param only if first is set - bits of formatting for imc_handle_create() --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… Patch: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 9dbc403e3e..94ddc38884 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -349,8 +349,12 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, memset(&room, '\0', sizeof(room)); - if (cmd->param[0].s) params++; - if (cmd->param[1].s) params++; + if (cmd->param[0].s) { + params++; + if (cmd->param[1].s) { + params++; + } + } switch(params) { case 0: @@ -361,7 +365,9 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, /* With one parameter, if the value is "private", it indicates * a private room, otherwise it is the URI of the room and we * create a public room. */ - if (cmd->param[0].len == IMC_ROOM_PRIVATE_LEN && !strncasecmp(cmd->param[0].s, IMC_ROOM_PRIVATE, cmd->param[0].len)) { + if (cmd->param[0].len == IMC_ROOM_PRIVATE_LEN + && !strncasecmp(cmd->param[0].s, IMC_ROOM_PRIVATE, + cmd->param[0].len)) { ps = cmd->param[0]; } else { rs = cmd->param[0]; @@ -384,7 +390,8 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, goto error; if (ps.s) { - if (ps.len == IMC_ROOM_PRIVATE_LEN && !strncasecmp(ps.s, IMC_ROOM_PRIVATE, ps.len)) { + if (ps.len == IMC_ROOM_PRIVATE_LEN + && !strncasecmp(ps.s, IMC_ROOM_PRIVATE, ps.len)) { flag_room |= IMC_ROOM_PRIV; LM_DBG("Room with private flag on\n"); } else { @@ -443,10 +450,12 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, LM_ERR("Failed to add member [%.*s]\n", STR_FMT(&src->uri)); goto error; } - LM_DBG("Added [%.*s] as member to room [%.*s]\n", STR_FMT(&member->uri), STR_FMT(&rm->uri)); + LM_DBG("Added [%.*s] as member to room [%.*s]\n", STR_FMT(&member->uri), + STR_FMT(&rm->uri)); body.s = imc_body_buf; - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, STR_FMT(format_uri(member->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, + STR_FMT(format_uri(member->uri))); if (body.len < 0) { LM_ERR("Error while building response\n");

1 0

git:master:ca182183: core: fixed condition for 0 ID or NULL NAME AVP
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: ca1821837dfe7dd6630f628d968ed4d1178c7040 URL: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:23:59+02:00 core: fixed condition for 0 ID or NULL NAME AVP - avoid null in memcpy for AVP_NAME_STR --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… Patch: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index 82183e3b28..e80e52d79d 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,7 +148,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == 0 && name.s.len == 0) { + if (name.s.s == NULL || name.s.len == 0) { LM_ERR("0 ID or NULL NAME AVP!"); goto error; }

1 0

git:master:36abe25e: crypto: fix use of uninitialized values introduced by b08fd55ddd598115a3b69afc630403a582d239f2
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: 36abe25e35d1862468999bedcaf8bba29ec5f48a URL: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:10:24+02:00 crypto: fix use of uninitialized values introduced by b08fd55ddd598115a3b69afc630403a582d239f2 --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… Patch: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 5ec753d602..955bf264bf 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -192,7 +192,8 @@ static int ki_crypto_aes_encrypt_helper(sip_msg_t* msg, str *ins, str *keys, { pv_value_t val; EVP_CIPHER_CTX *en = NULL; - str etext, lkey, iv, ttext; + str etext, lkey, ttext; + str iv = STR_NULL; unsigned char decoded_key[64]; unsigned char decoded_iv[16], tmpiv[16]; @@ -476,7 +477,7 @@ static int ki_crypto_aes_decrypt_helper(sip_msg_t* msg, str *ins, str *keys, EVP_CIPHER_CTX *de=NULL; str etext, lkey; unsigned char decoded_key[64]; - char *iv; + char *iv = NULL; de = EVP_CIPHER_CTX_new(); if(de==NULL) {

1 0

git:master:47b1b56e: dmq: fixes for changes in the 678f9c6ad8a8118741a921fcc01f9b23b5702c6e
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: 47b1b56e6cf86b2b6d74fdf4f292e8f2bf87f9fd URL: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T11:37:06+02:00 dmq: fixes for changes in the 678f9c6ad8a8118741a921fcc01f9b23b5702c6e - init the next field to first notification address str_list_t item - init local variables to avoid compile warnings on using garbage value - while condition on server_list instead of address of its ->s field (which always not null) - do not iterate using global dmq_notification_address_list variable, it shifts it till becomes NULL --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… Patch: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 79cc8ccbc9..27e950e472 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -387,6 +387,7 @@ static int dmq_add_notification_address(modparam_t type, void * val) } dmq_tmp_list = dmq_notification_address_list; dmq_tmp_list->s = tmp_str; + dmq_tmp_list->next = NULL; } else { dmq_tmp_list = append_str_list(tmp_str.s, tmp_str.len, &dmq_tmp_list, &total_list); if (dmq_tmp_list == NULL) { diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index ff8886d0ab..d40fd2cac2 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -284,7 +284,7 @@ dmq_node_t *add_server_and_notify(str_list_t *server_list) { char puri_data[MAXDMQHOSTS * (MAXDMQURILEN + 1)]; char *puri_list[MAXDMQHOSTS]; - dmq_node_t *pfirst, *pnode; + dmq_node_t *pfirst = NULL, *pnode = NULL; int host_cnt, index; sip_uri_t puri[1]; str pstr[1]; @@ -296,7 +296,7 @@ dmq_node_t *add_server_and_notify(str_list_t *server_list) **********/ if(!dmq_multi_notify) { - while (&server_list->s != NULL) { + while (server_list != NULL) { LM_DBG("adding notification node %.*s\n", server_list->s.len, server_list->s.s); pfirst = add_dmq_node(dmq_node_list, &server_list->s); @@ -592,6 +592,7 @@ int notification_resp_callback_f( { int ret; int nodes_recv; + str_list_t *slp; LM_DBG("notification_callback_f triggered [%p %d %p]\n", msg, code, param); if(code == 200) { @@ -605,15 +606,16 @@ int notification_resp_callback_f( } } else if(code == 408) { /* TODO this probably do not work for dmq_multi_notify */ - while (&dmq_notification_address_list->s != NULL) { - if(STR_EQ(node->orig_uri, dmq_notification_address_list->s)) { + slp = dmq_notification_address_list; + while (slp != NULL) { + if(STR_EQ(node->orig_uri, slp->s)) { LM_ERR("not deleting notification peer [%.*s]\n", - STR_FMT(&dmq_notification_address_list->s)); + STR_FMT(&slp->s)); update_dmq_node_status(dmq_node_list, node, DMQ_NODE_PENDING); return 0; } - dmq_notification_address_list = dmq_notification_address_list->next; - } + slp = slp->next; + } if (node->status == DMQ_NODE_DISABLED) { /* deleting node - the server did not respond */ LM_ERR("deleting server node %.*s because of failed request\n",

1 0

git:master:ba9f2b5a: core: init allocated memory in str_hash_alloc()
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: ba9f2b5af9cabd61f67ceedb8feab6bd7bc6526d URL: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T12:02:20+02:00 core: init allocated memory in str_hash_alloc() - removed unused pointer shifting in dset.c - small reworking of lval_assign() --- Modified: src/core/dset.c Modified: src/core/lvalue.c Modified: src/core/str_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… Patch: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… --- diff --git a/src/core/dset.c b/src/core/dset.c index adabe7bba0..b6999f32b5 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -860,7 +860,6 @@ int msg_get_src_addr(sip_msg_t *msg, str *uri, int mode) p += TRANSPORT_PARAM_LEN; memcpy(p, proto.s, proto.len); - p += proto.len; } uri->s = buf; diff --git a/src/core/lvalue.c b/src/core/lvalue.c index ab600c04bb..5d779cfbce 100644 --- a/src/core/lvalue.c +++ b/src/core/lvalue.c @@ -380,7 +380,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, struct rvalue* rv; int ret; - ret=0; + ret=-1; rv=rval_expr_eval(h, msg, rve); if (unlikely(rv==0)){ LM_ERR("rval expression evaluation failed (%d,%d-%d,%d)\n", @@ -404,9 +404,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, LM_ERR("assignment failed at pos: (%d,%d-%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col); - } - else - { + } else { if(unlikely(_log_assign_action!=NULL)) _log_assign_action(msg, lv); } @@ -414,5 +412,5 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, return ret; error: if (rv) rval_destroy(rv); - return -1; + return ret; } diff --git a/src/core/str_hash.h b/src/core/str_hash.h index 263bb3cd3d..63a041fd29 100644 --- a/src/core/str_hash.h +++ b/src/core/str_hash.h @@ -56,7 +56,7 @@ struct str_hash_table{ /* returns 0 on success, <0 on failure */ inline static int str_hash_alloc(struct str_hash_table* ht, int size) { - ht->table=(struct str_hash_head*)pkg_malloc(sizeof(struct str_hash_head)*size); + ht->table=(struct str_hash_head*)pkg_mallocxz(sizeof(struct str_hash_head)*size); if (ht->table==0) { PKG_MEM_ERROR; return -1;

1 0

git:master:1536f4bb: .gitignore: ignore files that can be generated by compiling tools
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: 1536f4bb3d4e654c8169afb6599c47c26df12ef6 URL: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T12:05:53+02:00 .gitignore: ignore files that can be generated by compiling tools --- Modified: .gitignore --- Diff: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… Patch: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… --- diff --git a/.gitignore b/.gitignore index e8eb381ff5..3ba24902bf 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ libiname.lst *.7 # vscode tmp files .vscode +# compiling tools files +.clangd +compile_commands.json

1 0

[kamailio/kamailio] not properly compassion (#2701)
by sergey-safarov 03 Apr '21

03 Apr '21

### Description I think something wrong with integer comparison when tested this config file ``` listen=udp:[::1]:5060 listen=udp:127.0.0.1:5060 loadmodule "xlog.so" loadmodule "sdpops.so" request_route { if (sdp_get_address_family() ieq 6 ) { xlog("L_WARN", "sdp_get_address_family == 6\n"); } else if (sdp_get_address_family() ieq 4) { xlog("L_WARN", "sdp_get_address_family == 4\n"); } else if (sdp_get_address_family() ieq 1) { xlog("L_WARN", "cannot detect sdp family\n"); } } ``` The expected output of IP address type used in SDP. But really I always get "cannot detect sdp family" message. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2701

2 4

git:master:b7f753dd: core: parse uri - check for invalid port values
by Daniel-Constantin Mierla 03 Apr '21

03 Apr '21

Module: kamailio Branch: master Commit: b7f753ddc727e1d7ab42e7abe607059e03976f8d URL: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-03T07:55:11+02:00 core: parse uri - check for invalid port values --- Modified: src/core/config.h Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… Patch: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… --- diff --git a/src/core/config.h b/src/core/config.h index e54413b5bc..e012e98edf 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -96,6 +96,7 @@ #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1) +#define MAX_PORT_VAL 65535 #define MAX_PORT_LEN 7 /* ':' + max 5 letters + \0 */ #define CRLF "\r\n" diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 2c24054d2c..19f6f2e02a 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -143,6 +143,9 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) #define case_port( ch, var) \ case ch: \ (var)=(var)*10+ch-'0'; \ + if((var) > MAX_PORT_VAL) { \ + goto error_bad_port; \ + }\ break #define still_at_user \

1 0

git:master:1b47452c: pua_dialoginfo: skip requests that do not control call state
by Daniel-Constantin Mierla 03 Apr '21

03 Apr '21

Module: kamailio Branch: master Commit: 1b47452cebb1b7866cbbabd5068a9ff4a39c86d2 URL: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-03T07:56:40+02:00 pua_dialoginfo: skip requests that do not control call state - GH #2700 --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… Patch: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index cb5969a23e..a146b52d19 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -270,6 +270,11 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para type, dlg, dlginfo); return; } + + /* skip requests that do not control call state */ + if((request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { + return; + } if(include_req_uri) { uri = dlginfo->req_uri; } else {

1 0

[kamailio/kamailio] siptrace: duplicate_uri with multiple values (#2693)
by sergey-safarov 02 Apr '21

02 Apr '21

### Description As admin, I want check TLS encrypted call signaling on local Kamailio. To do this I can use [this instruction](https://voipembedded.wordpress.com/2021/03/22/troubleshooting-…. Here used `siptrace` module. But at the same time, I need to send the same call signaling to the company `Homer` server. So I need to send a copy of the call signaling in two directions. Could you add the ability to allow specify multiple values in `duplicate_uri` param like. ``` modparam("siptrace", "duplicate_uri", "<sip:127.0.0.1:9060>,<sip:homer.example.com:9060>") ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2693

3 7

git:master:9413fc63: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: 9413fc6399d7e9b791ed0cb53172ab5fd887f0f6 URL: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-02T10:16:13+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… Patch: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 656a9315f2..783b57ba57 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -46,8 +46,8 @@ Frederic Gaisnon 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 4. Functions @@ -75,11 +75,11 @@ Frederic Gaisnon 1.10. Set contact_host parameter 1.11. Set contact_mode parameter 1.12. Set cparam_name parameter - 1.13. Set xavu_filed_a_contact parameter + 1.13. Set xavu_cfg parameter 1.14. Set xavu_filed_a_contact parameter 1.15. Set xavu_filed_b_contact parameter - 1.16. Set rr_update parameter - 1.17. Set xavu_field_contact_host parameter + 1.16. Set xavu_field_contact_host parameter + 1.17. Set rr_update parameter 1.18. Set context parameter 1.19. tps_set_context usage 1.20. Usage of event_route[topos:msg-outgoing] @@ -114,8 +114,8 @@ Chapter 1. Admin Guide 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 4. Functions @@ -184,8 +184,8 @@ Chapter 1. Admin Guide 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 3.1. storage (str) @@ -385,7 +385,7 @@ modparam("topos", "cparam_name", "xyz") Default value is “NULL” (disabled). - Example 1.13. Set xavu_filed_a_contact parameter + Example 1.13. Set xavu_cfg parameter ... modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_filed_a_contact", "a_contact") @@ -426,19 +426,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") ... -3.16. rr_update (int) - - If set to 1, topos module will track and update record route changes on - re-invite. - - Default value is 0 (do not update record route changes within dialog). - - Example 1.16. Set rr_update parameter -... -modparam("topos", "rr_update", 1) -... - -3.17. xavu_field_contact_host (str) +3.16. xavu_field_contact_host (str) Control from where to take the host part of the Contact header added by topos. This parameter allows to take the value from an XAVU during @@ -450,7 +438,7 @@ modparam("topos", "rr_update", 1) Default value is empty, not set. - Example 1.17. Set xavu_field_contact_host parameter + Example 1.16. Set xavu_field_contact_host parameter ... modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_contact_host", "contact_host") @@ -458,6 +446,18 @@ modparam("topos", "xavu_contact_host", "contact_host") $xavu(_tps_=>contact_host) = "kamailio.org"; ... +3.17. rr_update (int) + + If set to 1, topos module will track and update record route changes on + re-invite. + + Default value is 0 (do not update record route changes within dialog). + + Example 1.17. Set rr_update parameter +... +modparam("topos", "rr_update", 1) +... + 3.18. context (str) Set the global context for topos instance.

1 0

git:master:a877e707: topos: docs - fixed title for xavu_cfg example [skip ci]
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: a877e707c7768307886c67a8c64a5c524eac06f4 URL: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T10:11:01+02:00 topos: docs - fixed title for xavu_cfg example [skip ci] - groupped xavu parameters --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… Patch: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index ba622f13a6..b13902929f 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -393,7 +393,7 @@ modparam("topos", "cparam_name", "xyz") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_a_contact</varname> parameter</title> + <title>Set <varname>xavu_cfg</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") @@ -449,26 +449,6 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "..."; -... -</programlisting> - </example> - </section> - <section id="topos.p.rr_update"> - <title><varname>rr_update</varname> (int)</title> - <para> - If set to 1, topos module will track and update record - route changes on re-invite. - </para> - <para> - <emphasis> - Default value is 0 (do not update record route changes within dialog). - </emphasis> - </para> - <example> - <title>Set <varname>rr_update</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("topos", "rr_update", 1) ... </programlisting> </example> @@ -500,6 +480,26 @@ modparam("topos", "xavu_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ... +</programlisting> + </example> + </section> + <section id="topos.p.rr_update"> + <title><varname>rr_update</varname> (int)</title> + <para> + If set to 1, topos module will track and update record + route changes on re-invite. + </para> + <para> + <emphasis> + Default value is 0 (do not update record route changes within dialog). + </emphasis> + </para> + <example> + <title>Set <varname>rr_update</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "rr_update", 1) +... </programlisting> </example> </section>

1 0

git:master:f95ede23: dmq: access val after being tested for null
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: f95ede239474f8c3b901f83e7eb34cbfa8f0e0fd URL: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T10:04:10+02:00 dmq: access val after being tested for null --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… Patch: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 7d343b193b..79cc8ccbc9 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -365,14 +365,14 @@ static void destroy(void) static int dmq_add_notification_address(modparam_t type, void * val) { str tmp_str; - tmp_str.s = ((str*) val)->s; - tmp_str.len = ((str*) val)->len; int total_list = 0; /* not used */ if(val==NULL) { LM_ERR("invalid notification address parameter value\n"); return -1; } + tmp_str.s = ((str*) val)->s; + tmp_str.len = ((str*) val)->len; if(parse_uri(tmp_str.s, tmp_str.len, &dmq_notification_uri) < 0) { LM_ERR("could not parse notification address\n"); return -1;

1 0

git:master:d4e31e6a: core: parse uri - cast to unsigned for left shifting
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: d4e31e6ae494836c49e50f463517a576b18c5611 URL: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T09:38:55+02:00 core: parse uri - cast to unsigned for left shifting --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… Patch: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index ec39ea7cf2..2c24054d2c 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -26,6 +26,8 @@ */ +#include <stdint.h> + #include "../globals.h" #include "parse_uri.h" #include <string.h> @@ -124,7 +126,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) char* pass; int found_user; int error_headers; - unsigned int scheme; + uint32_t scheme; uri_type backup_urit; uri_flags backup_urif; @@ -386,9 +388,10 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) port_no=0; state=URI_INIT; memset(uri, 0, sizeof(struct sip_uri)); /* zero it all, just to be sure*/ - /*look for sip:, sips: ,tel: or urn:*/ + /*look for sip:, sips:, tel: or urn:*/ if (len<5) goto error_too_short; - scheme=buf[0]+(buf[1]<<8)+(buf[2]<<16)+(buf[3]<<24); + scheme=((uint32_t)buf[0]) + (((uint32_t)buf[1])<<8) + + (((uint32_t)buf[2])<<16) + (((uint32_t)buf[3])<<24); scheme|=0x20202020; if (scheme==SIP_SCH){ uri->type=SIP_URI_T;

1 0

[CRON] Still Failing: dbank888/kamailio#130 (master - 491e19e)
by Travis CI 01 Apr '21

01 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #130 Status: Still Failing Duration: 6 mins and 17 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/765550934?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:f21ad75e: pkg/kamailio/deb: set version 5.5.0~pre0
by Victor Seva 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: f21ad75e1f86f353cc9cdf6d21c9ee2b74e9eb6c URL: https://github.com/kamailio/kamailio/commit/f21ad75e1f86f353cc9cdf6d21c9ee2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-01T19:07:42+02:00 pkg/kamailio/deb: set version 5.5.0~pre0 --- Modified: pkg/kamailio/deb/bionic/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/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/f21ad75e1f86f353cc9cdf6d21c9ee2… Patch: https://github.com/kamailio/kamailio/commit/f21ad75e1f86f353cc9cdf6d21c9ee2…

1 0

git:master:a07de1e2: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: a07de1e2b892537c46879b4d744bff86af24e5e8 URL: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-01T17:01:14+02:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8… Patch: https://github.com/kamailio/kamailio/commit/a07de1e2b892537c46879b4d744bff8…

1 0

[kamailio/kamailio] acc_json: param to accept pre-encoded json values (#2699)
by Julien Chavanton 01 Apr '21

01 Apr '21

#### 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] New feature (non-breaking change which adds new functionality) #### Description New parameter to add json in an accounting/CDR field and prevent unwanted json escaping. Example: ``` modparam("acc_json", "acc_extra", "json_data=$avp(json_data);") modparam("acc_json", "acc_json_pre_encoded_prefix", "json_") ... $avp(json_data) = '{"b":2, "c":3}'; ... ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2699 -- Commit Summary -- * acc_json: param to accept pre-encoded json values -- File Changes -- M src/modules/acc_json/acc_json_mod.c (55) M src/modules/acc_json/doc/acc_json_admin.xml (43) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2699.patch https://github.com/kamailio/kamailio/pull/2699.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2699

2 3

git:master:c45d65ba: acc_json: param to accept pre-encoded json values (#2699)
by GitHub 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: c45d65ba1413ff2ca617d5fa1cf6cb391ffb1734 URL: https://github.com/kamailio/kamailio/commit/c45d65ba1413ff2ca617d5fa1cf6cb3… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-04-01T07:50:40-07:00 acc_json: param to accept pre-encoded json values (#2699) --- Modified: src/modules/acc_json/acc_json_mod.c Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c45d65ba1413ff2ca617d5fa1cf6cb3… Patch: https://github.com/kamailio/kamailio/commit/c45d65ba1413ff2ca617d5fa1cf6cb3…

1 0

Re: [sr-dev] [kamailio/kamailio] pkg/kamailio/deb: add lwsc module (f892b9a)
by Richard Fuchs 01 Apr '21

01 Apr '21

@linuxmaniac for your consideration -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f892b9a351cab6f7556113b531dfe22…

1 0

[kamailio/kamailio] dispatcher algorithm 11, no more than 25 hosts in group for proper distribution (#2698)
by E1isIvan 01 Apr '21

01 Apr '21

### Description We tried to load share 50+ media servers using dispatching algorithm 11 and faced an unexpected behavior when most calls go to very first host in the group. ### Troubleshooting I tried to start Kamailio like this: sudo kamailio -f /etc/kamailio/kamailio.cfg -E -d 5 -u 995 but errors were the same when dispatcher group had more than 25 and less than 25 hosts It was tried different combinations of dispatcher list host group configuration: 100 sip:10.60.27.123:7000 10 rweight=50 100 sip:10.60.27.123:7000 10 weight=50;rweight=50 100 sip:10.60.27.123:7000 rweight=50,maxload=80 When making 100 calls the quarter of them go to the first host in the group. #### Reproduction modparam("dispatcher", "list_file", "/etc/kamailio/dispatcher.list") modparam("dispatcher", "flags", 2) modparam("dispatcher", "ds_ping_method", "OPTIONS") modparam("dispatcher", "ds_probing_threshold", 3) modparam("dispatcher", "ds_inactive_threshold", 10) modparam("dispatcher", "ds_probing_mode", 3) modparam("dispatcher", "ds_ping_interval", 10) modparam("dispatcher", "ds_ping_reply_codes", "501,403,404,400,200") modparam("dispatcher", "ds_ping_from",DS_PING_FROM_PARAM) modparam("dispatcher", "use_default", 0) if ( ds_is_from_list("101")) { sl_send_reply("100","My calls"); ds_select_dst("100", "11"); return; } Dispatcher group must have more than 25 hosts, if equal or less than 25 than it is Ok: 100 sip:10.60.27.123:7000 0 10 rweight=50 100 sip:10.60.27.123:7001 0 10 rweight=50 100 sip:10.60.27.123:7002 0 10 rweight=50 100 sip:10.60.27.123:7003 0 10 rweight=50 100 sip:10.60.27.123:7004 0 10 rweight=50 100 sip:10.60.27.123:7005 0 10 rweight=50 100 sip:10.60.27.123:7006 0 10 rweight=50 100 sip:10.60.27.123:7007 0 10 rweight=50 100 sip:10.60.27.123:7008 0 10 rweight=50 100 sip:10.60.27.123:7009 0 10 rweight=50 100 sip:10.60.27.123:7010 0 10 rweight=50 100 sip:10.60.27.123:7011 0 10 rweight=50 100 sip:10.60.27.123:7012 0 10 rweight=50 100 sip:10.60.27.123:7013 0 10 rweight=50 100 sip:10.60.27.123:7014 0 10 rweight=50 100 sip:10.60.27.123:7015 0 10 rweight=50 100 sip:10.60.27.123:7016 0 10 rweight=50 100 sip:10.60.27.123:7017 0 10 rweight=50 100 sip:10.60.27.123:7018 0 10 rweight=50 100 sip:10.60.27.123:7019 0 10 rweight=50 100 sip:10.60.27.123:7020 0 10 rweight=50 100 sip:10.60.27.123:7021 0 10 rweight=50 100 sip:10.60.27.123:7022 0 10 rweight=50 100 sip:10.60.27.123:7023 0 10 rweight=50 100 sip:10.60.27.123:7024 0 10 rweight=50 To emulate call load and multiple media servers, SIPp scenarios were used. #### Debugging Data #### Log Messages #### SIP Traffic No specific traffic, regular INVITE messages having international numbers. ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.4.4 (x86_64/linux) e16352 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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_BLACKLIST, HAVE_RESOLV_RES 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: e16352 compiled on 15:56:46 Feb 15 2021 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.7.1908 (Core) Linux test-carrier-1.prd.tc5.ams.nl.kwebbl.loc 3.10.0-1062.4.1.el7.x86_64 #1 SMP Fri Oct 18 17:15:30 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2698

5 13

[kamailio/kamailio] Adds initial fuzzer for integration with oss-fuzz. (#2660)
by DavidKorczynski 01 Apr '21

01 Apr '21

#### 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 - [ ] 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  Hi Maintainers, I have worked a bit on setting fuzzing up for Kamailio by way of OSS-Fuzz. Essentially, OSS-Fuzz is a free service run by Google that performs continuous fuzzing of important open source projects, and it would be great to have Kamailio integrated. The only expectation of integrating into OSS-Fuzz is that bugs will be fixed. This is not a "hard" requirement in that no one enforces this and the main point is if bugs are not fixed then it is a waste of resources to run the fuzzers, which we would like to avoid. In this PR https://github.com/google/oss-fuzz/pull/5279 I have done exactly that, namely created the necessary logic from an OSS-Fuzz perspective to integrate Kamailio. If you would like to integrate, could you please provide a set of email(s) that will get access to the data produced by OSS-Fuzz, such as bug reports, coverage reports and more stats. The emails should be linked to a Google account in order to view the detailed reports and notice the emails affiliated with the project will be public in the OSS-Fuzz repo, as they will be part of a configuration file. At the moment I stored the fuzzers in the Google OSS-Fuzz repository, but we can move them up here to make maintenance easier. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2660 -- Commit Summary -- * Adds initial fuzzer for integration with oss-fuzz. -- File Changes -- A fuzz/fuzz_uri.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2660.patch https://github.com/kamailio/kamailio/pull/2660.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2660

3 8

git:master:161c6723: Makefile.defs: version set to 5.5.0-dev6
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 161c67236bcd0f9844f02fe4f0b5ed302f431de9 URL: https://github.com/kamailio/kamailio/commit/161c67236bcd0f9844f02fe4f0b5ed3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T11:48:20+02:00 Makefile.defs: version set to 5.5.0-dev6 - development for 5.5 series is closed --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/161c67236bcd0f9844f02fe4f0b5ed3… Patch: https://github.com/kamailio/kamailio/commit/161c67236bcd0f9844f02fe4f0b5ed3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 4f5c61ad3f..46a7b10e21 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:2f1067f0: Makefile.defs: version set to 5.5.0-pre0
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 2f1067f010dd497c7a348c9f2233b318b9d7c663 URL: https://github.com/kamailio/kamailio/commit/2f1067f010dd497c7a348c9f2233b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T11:49:26+02:00 Makefile.defs: version set to 5.5.0-pre0 - starting of testing phase for 5.5 series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2f1067f010dd497c7a348c9f2233b31… Patch: https://github.com/kamailio/kamailio/commit/2f1067f010dd497c7a348c9f2233b31… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 46a7b10e21..1d8e131e12 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] Kamailio 5.0.4 extremely slow carrierroute preloading (#2653)
by NiteCrwlr 01 Apr '21

01 Apr '21

### Description Carrierroute module takes now 16 minutes to load about 50'000 entries from postgres-db. In version 5.0.3 it was 10 seconds from the same db. ### Troubleshooting #### Reproduction Install kamailio 5.0.3 and fill your carrierroute table with thousands of entries. See how fast its loaded. Then install 5.0.4 and see how long it takes now. You can observe the query "SELECT * FROM carrierroute WHERE carrier=1 and domain=1 and prob>0" multiple times in the postgres-db log. #### Debugging Data none. #### Log Messages not needed. #### SIP Traffic not needed. ### Possible Solutions Perhaps try to do the check "in-memory" instead generate a new sql-query. ### Additional Information This bug exists in Kamilio versions >=5.0.4 and is (potentially) introduced by: commit 9800aba65146b72623bb512049300d1beb8c8ec4 Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: Tue Sep 12 15:37:17 2017 +0200 carrierroute: warning for the same carrier/domain having routes with only 0 probability - While starting kamailio or reloading the routes, if the same carrier/domain pairs do not have any route with a probability other than 0 (zero) then an error log will be printed on the screen. Besides, the log "invalid dice_max value" in the cr_func.c has been made more clear. (cherry picked from commit 9741bee7af8136b35af8e6279e530aa0ad54f574) * **Operating System**: Ubuntu 20.04.2 LTS Linux 5.4.0-66-generic #74-Ubuntu SMP Wed Jan 27 22:54:38 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2653

8 21

git:master:52d89a4d: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 52d89a4d6a11f8d5d660fc871c9f5e79d5075e75 URL: https://github.com/kamailio/kamailio/commit/52d89a4d6a11f8d5d660fc871c9f5e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-01T09:16:14+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/52d89a4d6a11f8d5d660fc871c9f5e7… Patch: https://github.com/kamailio/kamailio/commit/52d89a4d6a11f8d5d660fc871c9f5e7…

1 0

git:master:e90bfa7c: topos: docs for inbound event routes and context
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: e90bfa7cc3b5e3cd23e4071d811277c5f94ddd6d URL: https://github.com/kamailio/kamailio/commit/e90bfa7cc3b5e3cd23e4071d811277c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T09:12:16+02:00 topos: docs for inbound event routes and context --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e90bfa7cc3b5e3cd23e4071d811277c… Patch: https://github.com/kamailio/kamailio/commit/e90bfa7cc3b5e3cd23e4071d811277c…

1 0

git:master:c030fc52: topos: use xavu instead of avp
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: c030fc5231d2a6534867e90b412c15e7a9db7a98 URL: https://github.com/kamailio/kamailio/commit/c030fc5231d2a6534867e90b412c15e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T08:40:25+02:00 topos: use xavu instead of avp - replaced params refering to avp with corresponding xavp alternatives --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/c030fc5231d2a6534867e90b412c15e… Patch: https://github.com/kamailio/kamailio/commit/c030fc5231d2a6534867e90b412c15e…

1 0

git:master:7a3ad547: topos: docs updated for xavu replacing avp parameters
by Daniel-Constantin Mierla 01 Apr '21

01 Apr '21

Module: kamailio Branch: master Commit: 7a3ad54711c855ab209ef23f08c34902f5dac9a8 URL: https://github.com/kamailio/kamailio/commit/7a3ad54711c855ab209ef23f08c3490… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T08:56:29+02:00 topos: docs updated for xavu replacing avp parameters --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7a3ad54711c855ab209ef23f08c3490… Patch: https://github.com/kamailio/kamailio/commit/7a3ad54711c855ab209ef23f08c3490…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev