- sr-dev - kamailio.org

git:master:77eaba17: dispatcher: copy over the ocdata structure for records kept by rpc add/remove record
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 77eaba17916109ef5656a276e3f469b29415d6f5 URL: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:39:12+01:00 dispatcher: copy over the ocdata structure for records kept by rpc add/remove record --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… Patch: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b404ede384b..ca1636edbd2 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2866,14 +2866,16 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) void ds_add_dest_cb(ds_set_t *node, int i, void *arg) { int setn; + ds_dest_t *ndst = NULL; - if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, - node->dlist[i].priority, &node->dlist[i].attrs.body, - *ds_next_idx, &setn, node->dlist[i].dload, - &node->dlist[i].latency_stats) - == NULL) { + ndst = add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, + node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, + &setn, node->dlist[i].dload, &node->dlist[i].latency_stats); + if(ndst == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); + } else { + memcpy(&ndst->ocdata, &node->dlist[i].ocdata, sizeof(ds_ocdata_t)); } return; } @@ -2922,7 +2924,10 @@ int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) /* callback for removing nodes based on setid & address */ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) { - struct ds_filter_dest_cb_arg *filter_arg = (typeof(filter_arg))arg; + ds_dest_t *ndst = NULL; + struct ds_filter_dest_cb_arg *filter_arg; + + filter_arg = (typeof(filter_arg))arg; if(node->id == filter_arg->setid && node->dlist[i].uri.len == filter_arg->dest->uri.len @@ -2931,13 +2936,16 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) == 0) return; - if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, - node->dlist[i].priority, &node->dlist[i].attrs.body, - *ds_next_idx, filter_arg->setn, node->dlist[i].dload, - &node->dlist[i].latency_stats) - == NULL) { + ndst = add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, + node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, + filter_arg->setn, node->dlist[i].dload, + &node->dlist[i].latency_stats); + + if(ndst == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); + } else { + memcpy(&ndst->ocdata, &node->dlist[i].ocdata, sizeof(ds_ocdata_t)); } return; }

1 0

git:master:cff6f9fd: dspatcher: return the new ds dest for add_dest2list()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: cff6f9fd7051f4b8ac6e4fc59257c239cb32f21d URL: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:39:12+01:00 dspatcher: return the new ds dest for add_dest2list() - easier to access the fields of the new record afterwards --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… Patch: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 1d85c34203e..b404ede384b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -713,7 +713,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /** * */ -int add_dest2list(int id, str uri, int flags, int priority, str *attrs, +ds_dest_t *add_dest2list(int id, str uri, int flags, int priority, str *attrs, int list_idx, int *setn, int dload, ds_latency_stats_t *latency_stats) { ds_dest_t *dp = NULL; @@ -722,8 +722,9 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, ds_dest_t *dp1 = NULL; dp = pack_dest(uri, flags, priority, attrs, dload); - if(!dp) - goto err; + if(!dp) { + goto error; + } if(latency_stats != NULL) { dp->latency_stats.stdev = latency_stats->stdev; @@ -739,7 +740,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, sp = ds_avl_insert(&ds_lists[list_idx], id, setn); if(!sp) { LM_ERR("no more memory.\n"); - goto err; + goto error; } sp->nr++; @@ -766,8 +767,8 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, LM_DBG("dest [%d/%d] <%.*s>\n", sp->id, sp->nr, dp->uri.len, dp->uri.s); - return 0; -err: + return dp; +error: if(dp != NULL) { if(dp->uri.s != NULL) shm_free(dp->uri.s); @@ -776,7 +777,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, shm_free(dp); } - return -1; + return NULL; } @@ -1112,7 +1113,7 @@ int ds_load_list(char *lfile) } if(add_dest2list(id, uri, flags, priority, &attrs, *ds_next_idx, &setn, 0, latency_stats) - != 0) { + == NULL) { LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); if(ds_load_mode == 1) { @@ -1372,7 +1373,7 @@ int ds_load_db(void) } if(add_dest2list(id, uri, flags, priority, &attrs, *ds_next_idx, &setn, 0, latency_stats) - != 0) { + == NULL) { dest_errs++; LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); @@ -2870,7 +2871,7 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, &setn, node->dlist[i].dload, &node->dlist[i].latency_stats) - != 0) { + == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); } @@ -2893,7 +2894,7 @@ int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) // add new destination if(add_dest2list(group, *address, flags, priority, attrs, *ds_next_idx, &setn, 0, NULL) - != 0) { + == NULL) { LM_WARN("unable to add destination %.*s to set %d", address->len, address->s, group); if(ds_load_mode == 1) { @@ -2934,7 +2935,7 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, filter_arg->setn, node->dlist[i].dload, &node->dlist[i].latency_stats) - != 0) { + == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); }

1 0

git:6.0:db1ddc0d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: db1ddc0dd2d663887ecfd24b9d74322518e8e98f URL: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-28T18:19:54+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/file_out/README --- Diff: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… Patch: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… --- diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c2..89ca58147c1 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is ��/var/log/kamailio/file_out/��. + Default value is ��/var/log/kamailio/file_out��. Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ��.out��. * interval (Optional) - the interval in seconds of the file rotation Default value is ��600�� (10min). + * prefix (Optional) - the prefix for log messages + Default value is ��""�� (empty string). Example 1.2. Set file parameter ...

1 0

file_out module README is not up to date
by Henning Westerholt 28 Jan '25

28 Jan '25

Hello, the file_out module README is not up to date. Should I just fix it manually, or could somebody trigger the automatic auto-build job for it? Maybe it was not included so far? Thanks, Henning henning@app01:~/repositories/kamailio$ git diff diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c..89ca58147c 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is "/var/log/kamailio/file_out/". + Default value is "/var/log/kamailio/file_out". Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ".out". * interval (Optional) - the interval in seconds of the file rotation Default value is "600" (10min). + * prefix (Optional) - the prefix for log messages + Default value is """" (empty string). Example 1.2. Set file parameter ...

2 1

git:master:1dabcc6c: modules: readme files regenerated - file_out ... [skip ci]
by Kamailio Dev 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 1dabcc6c863a3f2da5834b0a9773ffb744c6d62e URL: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-28T18:11:49+01:00 modules: readme files regenerated - file_out ... [skip ci] --- Modified: src/modules/file_out/README --- Diff: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… Patch: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… --- diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c2..89ca58147c1 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is ��/var/log/kamailio/file_out/��. + Default value is ��/var/log/kamailio/file_out��. Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ��.out��. * interval (Optional) - the interval in seconds of the file rotation Default value is ��600�� (10min). + * prefix (Optional) - the prefix for log messages + Default value is ��""�� (empty string). Example 1.2. Set file parameter ...

1 0

git:6.0:374b7e46: kamctl: refresh db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 374b7e46881bbf591fd56305d3572ab3c12d1979 URL: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:47+01:00 kamctl: refresh db creation files --- Added: utils/kamctl/db_berkeley/kamailio/pcscf_location Added: utils/kamctl/db_redis/kamailio/pcscf_location Added: utils/kamctl/dbtext/kamailio/pcscf_location Added: utils/kamctl/mongodb/kamailio/pcscf_location.json Modified: utils/kamctl/db_berkeley/kamailio/dialog_out Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/htable-create.sql Modified: utils/kamctl/db_sqlite/ims_dialog-create.sql Modified: utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/dbtext/kamailio/dialog_in Modified: utils/kamctl/dbtext/kamailio/dialog_out Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/dialog_in.json Modified: utils/kamctl/mongodb/kamailio/dialog_out.json Modified: utils/kamctl/mysql/htable-create.sql Modified: utils/kamctl/mysql/ims_dialog-create.sql Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/oracle/htable-create.sql Modified: utils/kamctl/oracle/ims_dialog-create.sql Modified: utils/kamctl/oracle/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/postgres/htable-create.sql Modified: utils/kamctl/postgres/ims_dialog-create.sql Modified: utils/kamctl/postgres/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab… Patch: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab…

1 0

git:6.0:c1f8cb4d: ims_qos_npn/doc/Makefile: proper xml file name
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: c1f8cb4de71ec11d669484db8b67484caf96b288 URL: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:22+01:00 ims_qos_npn/doc/Makefile: proper xml file name (cherry picked from commit 9daea6c00dc5b613d9e4b7ffd711ee7999e31ad5) --- Modified: src/modules/ims_qos_npn/doc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… Patch: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… --- diff --git a/src/modules/ims_qos_npn/doc/Makefile b/src/modules/ims_qos_npn/doc/Makefile index 4ab9c620042..6517aef6b72 100644 --- a/src/modules/ims_qos_npn/doc/Makefile +++ b/src/modules/ims_qos_npn/doc/Makefile @@ -1,4 +1,4 @@ -docs = ims_qos.xml +docs = ims_qos_npn.xml docbook_dir = ../../../../doc/docbook include $(docbook_dir)/Makefile.module

1 0

git:6.0:4fe03b9e: srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 4fe03b9e59e0e4598419818cf1770312eeada86a URL: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:14+01:00 srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location - fix conflict with default table for registrar/usrloc - GH #4124 (cherry picked from commit fc02c3ca46bd96e50cbb6903a2efe48cb134377b) --- Modified: src/lib/srdb1/schema/location_pcscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… Patch: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… --- diff --git a/src/lib/srdb1/schema/location_pcscf.xml b/src/lib/srdb1/schema/location_pcscf.xml index a85f07bf75b..8538bf72ed6 100644 --- a/src/lib/srdb1/schema/location_pcscf.xml +++ b/src/lib/srdb1/schema/location_pcscf.xml @@ -7,8 +7,8 @@ ]> -<table id="location" xmlns:db="http://docbook.org/ns/docbook"> - <name>location</name> +<table id="pcscf_location" xmlns:db="http://docbook.org/ns/docbook"> + <name>pcscf_location</name> <version>7</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description>

1 0

git:master:9daea6c0: ims_qos_npn/doc/Makefile: proper xml file name
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 9daea6c00dc5b613d9e4b7ffd711ee7999e31ad5 URL: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:58:46+01:00 ims_qos_npn/doc/Makefile: proper xml file name --- Modified: src/modules/ims_qos_npn/doc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… Patch: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… --- diff --git a/src/modules/ims_qos_npn/doc/Makefile b/src/modules/ims_qos_npn/doc/Makefile index 4ab9c620042..6517aef6b72 100644 --- a/src/modules/ims_qos_npn/doc/Makefile +++ b/src/modules/ims_qos_npn/doc/Makefile @@ -1,4 +1,4 @@ -docs = ims_qos.xml +docs = ims_qos_npn.xml docbook_dir = ../../../../doc/docbook include $(docbook_dir)/Makefile.module

1 0

[kamailio/kamailio] ERROR: Creating extra tables failed at ims_icscf! (Issue #4124)
by Luke Escudé 28 Jan '25

28 Jan '25

### Description Installing Kamailio 5.8.5 on Debian 12, running kamdbctl create kamailio continually fails with error "ERROR: Creating extra tables failed at ims_icscf!" ### Troubleshooting #### Reproduction Create a brand new VM with Debian 12, clone Kamailio from git tag 5.8.5, and follow the steps: make include_modules="db_mysql crypto http_async_client http_client jansson janssonrpcc json jsonrpcc lcr presence presence_dialoginfo presence_mwi presence_reginfo presence_xml tls utils uuid xmlops" cfg make all make install # Installs Kamailio in /usr/local/sbin make install-systemd-debian sed -i 's/^# DBENGINE/DBENGINE/' /usr/local/etc/kamailio/kamctlrc kamdbctl create kamailio Will result in the error occurring. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4124 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4124(a)github.com>

2 2

git:5.8:1b4aa300: kamctl: renegenerate db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 5.8 Commit: 1b4aa300292dd6bdd64e174111939293fbbd76ed URL: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:47:11+01:00 kamctl: renegenerate db creation files - GH #4124 --- Added: utils/kamctl/db_berkeley/kamailio/nds_trusted_domains Added: utils/kamctl/db_berkeley/kamailio/s_cscf Added: utils/kamctl/db_berkeley/kamailio/s_cscf_capabilities Added: utils/kamctl/db_redis/kamailio/nds_trusted_domains Added: utils/kamctl/db_redis/kamailio/s_cscf Added: utils/kamctl/db_redis/kamailio/s_cscf_capabilities Added: utils/kamctl/db_sqlite/ims_icscf-create.sql Added: utils/kamctl/dbtext/kamailio/nds_trusted_domains Added: utils/kamctl/dbtext/kamailio/s_cscf Added: utils/kamctl/dbtext/kamailio/s_cscf_capabilities Added: utils/kamctl/mongodb/kamailio/nds_trusted_domains.json Added: utils/kamctl/mongodb/kamailio/s_cscf.json Added: utils/kamctl/mongodb/kamailio/s_cscf_capabilities.json Added: utils/kamctl/mysql/ims_icscf-create.sql Added: utils/kamctl/oracle/ims_icscf-create.sql Added: utils/kamctl/postgres/ims_icscf-create.sql Added: utils/kamctl/xhttp_pi/ims_icscf-mod Added: utils/kamctl/xhttp_pi/ims_icscf-table Modified: utils/kamctl/xhttp_pi/acc-mod Modified: utils/kamctl/xhttp_pi/alias_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/avpops-mod Modified: utils/kamctl/xhttp_pi/carrierroute-mod Modified: utils/kamctl/xhttp_pi/cpl-mod Modified: utils/kamctl/xhttp_pi/dialog-mod Modified: utils/kamctl/xhttp_pi/dialplan-mod Modified: utils/kamctl/xhttp_pi/dispatcher-mod Modified: utils/kamctl/xhttp_pi/domain-mod Modified: utils/kamctl/xhttp_pi/domainpolicy-mod Modified: utils/kamctl/xhttp_pi/drouting-mod Modified: utils/kamctl/xhttp_pi/group-mod Modified: utils/kamctl/xhttp_pi/htable-mod Modified: utils/kamctl/xhttp_pi/imc-mod Modified: utils/kamctl/xhttp_pi/lcr-mod Modified: utils/kamctl/xhttp_pi/matrix-mod Modified: utils/kamctl/xhttp_pi/mohqueue-mod Modified: utils/kamctl/xhttp_pi/msilo-mod Modified: utils/kamctl/xhttp_pi/mtree-mod Modified: utils/kamctl/xhttp_pi/pdt-mod Modified: utils/kamctl/xhttp_pi/permissions-mod Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/pipelimit-mod Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/purple-mod Modified: utils/kamctl/xhttp_pi/registrar-mod Modified: utils/kamctl/xhttp_pi/rls-mod Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpproxy-mod Modified: utils/kamctl/xhttp_pi/sca-mod Modified: utils/kamctl/xhttp_pi/secfilter-mod Modified: utils/kamctl/xhttp_pi/siptrace-mod Modified: utils/kamctl/xhttp_pi/speeddial-mod Modified: utils/kamctl/xhttp_pi/standard-mod Modified: utils/kamctl/xhttp_pi/topos-mod Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uid_auth_db-mod Modified: utils/kamctl/xhttp_pi/uid_avp_db-mod Modified: utils/kamctl/xhttp_pi/uid_domain-mod Modified: utils/kamctl/xhttp_pi/uid_gflags-mod Modified: utils/kamctl/xhttp_pi/uid_uri_db-mod Modified: utils/kamctl/xhttp_pi/uri_db-mod Modified: utils/kamctl/xhttp_pi/userblocklist-mod Modified: utils/kamctl/xhttp_pi/usrloc-mod --- Diff: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929… Patch: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929…

1 0

git:6.0:be2c68f8: outbound: Fix flow_token_secret bug
by Henning Westerholt 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: be2c68f86fcf84dac24501a6b24a6573917894aa URL: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-28T16:33:55Z outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization (cherry picked from commit 046ba41e431fec7fad0c82a9091ea9e27d9f677d) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… Patch: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f3c80f18c15..f2e0c7dbc3d 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -66,7 +66,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -86,7 +86,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:master:360bccbc: kamctl: regenerated db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 360bccbca1fe7515384065651034374be303bab3 URL: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:28:19+01:00 kamctl: regenerated db creation files --- Added: utils/kamctl/db_berkeley/kamailio/pcscf_location Added: utils/kamctl/db_redis/kamailio/pcscf_location Added: utils/kamctl/dbtext/kamailio/pcscf_location Added: utils/kamctl/mongodb/kamailio/pcscf_location.json Modified: utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/oracle/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/postgres/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374… Patch: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374…

1 0

git:master:fc02c3ca: srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: fc02c3ca46bd96e50cbb6903a2efe48cb134377b URL: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:28:19+01:00 srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location - fix conflict with default table for registrar/usrloc - GH #4124 --- Modified: src/lib/srdb1/schema/location_pcscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… Patch: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… --- diff --git a/src/lib/srdb1/schema/location_pcscf.xml b/src/lib/srdb1/schema/location_pcscf.xml index a85f07bf75b..8538bf72ed6 100644 --- a/src/lib/srdb1/schema/location_pcscf.xml +++ b/src/lib/srdb1/schema/location_pcscf.xml @@ -7,8 +7,8 @@ ]> -<table id="location" xmlns:db="http://docbook.org/ns/docbook"> - <name>location</name> +<table id="pcscf_location" xmlns:db="http://docbook.org/ns/docbook"> + <name>pcscf_location</name> <version>7</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description>

1 0

[kamailio/kamailio] cmake: should we use >= 3.13, i.e., "more modern cmake" generation? (Issue #4078)
by space88man 28 Jan '25

28 Jan '25

### Description From the cmake timeline 3.0(2014) is called "modern cmake" and ~3.12/3.13(2018) is "more modern cmake" : https://www.youtube.com/watch?v=y7ndUhdQuU8 Since we are doing a major renovation on the kamailio build system should we target the "more modern" generation (that is already > 5 years old). This will encourage the project to follow cmake best practices. Ping @xkaraman @miconda Versions in debian: buster(3.13) bullseye(3.25) bookworm/trixie(3.30) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4078 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4078(a)github.com>

8 25

[kamailio/kamailio] outbound: Fix flow_token_secret bug (PR #4125)
by Xenofon Karamanos 28 Jan '25

28 Jan '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes a bug where when `flow_token_secret` was provided, it was not initialized properly and always set to an empty string. - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4125 -- Commit Summary -- * outbound: Fix flow_token_secret bug -- File Changes -- M src/modules/outbound/outbound_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4125.patch https://github.com/kamailio/kamailio/pull/4125.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4125 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4125(a)github.com>

3 4

git:master:046ba41e: outbound: Fix flow_token_secret bug
by Henning Westerholt 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 046ba41e431fec7fad0c82a9091ea9e27d9f677d URL: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-28T17:11:49+01:00 outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… Patch: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f3c80f18c15..f2e0c7dbc3d 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -66,7 +66,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -86,7 +86,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:master:99d36df0: cmake/json: Remove find_package call. Use pkg-config instead.
by Xenofon Karamanos 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 99d36df0a15bbb960b2d7ee5916d65a55b9b26cd URL: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-28T14:05:25Z cmake/json: Remove find_package call. Use pkg-config instead. --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… Patch: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index 72df4d390f5..5d791dbd03d 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,13 +2,18 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c CONFIG) - -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() target_link_libraries(${module_name} PRIVATE json-c::json-c)

1 0

git:master:532744ee: cmake/json: Use CONFIG mode
by Xenofon Karamanos 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 532744eebf1014939c4ccd9a6aa4e7d6fbb454ac URL: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-28T11:18:24Z cmake/json: Use CONFIG mode --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… Patch: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index c4cbf81440c..72df4d390f5 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c QUIET) +find_package(json-c CONFIG) + if(NOT json-c_FOUND) message(STATUS "json-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED)

1 0

git:6.0:3a480f03: etc/kamailio.cfg: close comment for tls_threads_mode
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 3a480f03fa54855059b72db8304f47cca7ee753e URL: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:14:00+01:00 etc/kamailio.cfg: close comment for tls_threads_mode (cherry picked from commit d8d627eff7de268a487d7f91cc52e7ba8a6c708e) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… Patch: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a61227d4173..a06e09fdc77 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -234,9 +234,10 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use thread executors for process#0 only - * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 1: use thread executors for process #0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL */ tls_threads_mode=2 + #!endif /* set it to yes to enable sctp and load sctp.so module */

1 0

git:6.0:b4718cd7: http_async_client: check returned cell inside check_multi_info()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: b4718cd7dca8e037664dbc49a1cfac684906ecea URL: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:50+01:00 http_async_client: check returned cell inside check_multi_info() (cherry picked from commit b16550fa72d23084b4221769fe74b1f3c357c9fd) --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… Patch: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 30ae016d720..7edc0ddc1a0 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -604,7 +604,7 @@ void check_multi_info(struct http_m_global *g) CURL *easy; CURLcode res; - struct http_m_cell *cell; + struct http_m_cell *cell = NULL; double tmp_time; LM_DBG("REMAINING: %d\n", g->still_running); @@ -616,9 +616,15 @@ void check_multi_info(struct http_m_global *g) curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url); - LM_DBG("DONE: %s => (%d) %s\n", eff_url, res, cell->error); + LM_DBG("DONE: %s => (%d)\n", eff_url, res); cell = http_m_cell_lookup(easy); + if(cell == NULL) { + LM_ERR("failed to get the cell\n"); + curl_multi_remove_handle(g->multi, easy); + curl_easy_cleanup(easy); + continue; + } if(msg->data.result != 0) { LM_ERR("handle %p returned error %d: %s\n", easy, res, cell->error);

1 0

git:6.0:dfa9239c: htable: wrapped maco code in do {} while(0)
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: dfa9239cf6df7644e9fe6b83cfc33aff518a19c6 URL: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:39+01:00 htable: wrapped maco code in do {} while(0) (cherry picked from commit 65a296b3478503ed3519ea9156d8f46f5cb9ce2a) --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… Patch: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4e0757f237b..d9fc187e722 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -144,10 +144,19 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); -#define HT_UPDATE_EXPIRE(ht, it, now) \ - if(ht->updateexpire || (now && it->expire && it->expire < now)) \ - it->expire = now + ht->htexpire -#define HT_COPY_EXPIRE(ht, it, now, src) \ - HT_UPDATE_EXPIRE(ht, it, now); \ - else it->expire = src->expire +#define HT_UPDATE_EXPIRE(ht, it, now) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } \ + } while(0) +#define HT_COPY_EXPIRE(ht, it, now, src) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } else { \ + it->expire = src->expire; \ + } \ + } while(0) + #endif

1 0

git:6.0:b38925b0: htable: Fix expiry on assignment
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: b38925b0b3628539840de2b6240da75b9f9f3cc6 URL: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:31+01:00 htable: Fix expiry on assignment Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079). (cherry picked from commit 75994f40c99ffa2c7c33e5fce5e3d3cd8db7d780) --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… Patch: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 9190dd310ff..47b4b975194 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -496,9 +496,7 @@ int ht_set_cell_ex( it->value.s.s[it->value.s.len] = '\0'; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -514,11 +512,7 @@ int ht_set_cell_ex( cell->next = it->next; cell->prev = it->prev; if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -535,9 +529,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -556,11 +548,7 @@ int ht_set_cell_ex( return -1; } if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -578,9 +566,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 5ac11b9bb00..4e0757f237b 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -143,4 +143,11 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); + +#define HT_UPDATE_EXPIRE(ht, it, now) \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) \ + it->expire = now + ht->htexpire +#define HT_COPY_EXPIRE(ht, it, now, src) \ + HT_UPDATE_EXPIRE(ht, it, now); \ + else it->expire = src->expire #endif

1 0

git:6.0:9c44aec6: core/parser/sdp: proper test for media ip separator
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 9c44aec667fc3c088612dd31935bce2eb082812d URL: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:23+01:00 core/parser/sdp: proper test for media ip separator (cherry picked from commit 200cdb318569191cd012dfe99b252f98fe9623b9) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… Patch: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 61022b6148f..893ef0e58a4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -561,7 +561,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) * - for length, at least 6: ' IP[4|6] x...' * - white space after */ - if(cp + 6 > mediaip->s + mediaip->len && cp[4] != ' ') { + if(cp + 6 > mediaip->s + mediaip->len || cp[4] != ' ') { LM_ERR("invalid content for `%s' line\n", line); return -1; }

1 0

git:6.0:9e21ce85: presence: do not break on one notify sending failure
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 9e21ce85d0c97679f9e14f9c31108f2dcdad772e URL: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:11+01:00 presence: do not break on one notify sending failure - try all of them, debug message with successful and failure counters - GH #4118 (cherry picked from commit 65e51b776290a1981e9ac27fbe6b47813516bc8b) --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… Patch: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 47a11b23183..191cac0d04b 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1557,6 +1557,8 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) subs_t *subs_array = NULL, *s = NULL; str *notify_body = NULL, *aux_body = NULL; int ret_code = -1; + int retOK = 0; + int retErr = 0; subs_array = get_subs_dialog(pres_uri, event, NULL); if(subs_array == NULL) { @@ -1586,7 +1588,9 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) < 0) { LM_ERR("Could not send notify for [event]=%.*s\n", event->name.len, event->name.s); - goto done; + retErr++; + } else { + retOK++; } if(aux_body != NULL) { @@ -1599,7 +1603,10 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) } } - ret_code = 1; + LM_DBG("sent ok: %d - err: %d\n", retOK, retErr); + if(retOK > 0) { + ret_code = 1; + } done: free_subs_list(subs_array, PKG_MEM_TYPE, 0);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev