sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
372 discussions

git:master:8e6a8e0b: ndb_mongodb: fix for deprecated bson_as_json() from v1.29.0
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: 8e6a8e0baf8a700f36c81d3f808391f03a37c9d1 URL: https://github.com/kamailio/kamailio/commit/8e6a8e0baf8a700f36c81d3f808391f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T07:53:31+01:00 ndb_mongodb: fix for deprecated bson_as_json() from v1.29.0 - GH #4037 --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/8e6a8e0baf8a700f36c81d3f808391f… Patch: https://github.com/kamailio/kamailio/commit/8e6a8e0baf8a700f36c81d3f808391f… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index 946eb6de19f..dd48e5d471e 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -34,6 +34,12 @@ #include "mongodb_client.h" #include "api.h" +#if MONGOC_CHECK_VERSION(1, 29, 0) +#define _ksr_bson_as_json bson_as_legacy_extended_json +#else +#define _ksr_bson_as_json bson_as_json +#endif + static mongodbc_server_t *_mongodbc_srv_list = NULL; static mongodbc_reply_t *_mongodbc_rpl_list = NULL; @@ -263,7 +269,7 @@ int mongodbc_exec_cmd( goto error_exec; } bson_destroy(&command); - rpl->jsonrpl.s = bson_as_json(&reply, NULL); + rpl->jsonrpl.s = _ksr_bson_as_json(&reply, NULL); rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; bson_destroy(&reply); } else { @@ -303,7 +309,7 @@ int mongodbc_exec_cmd( } goto error_exec; } - rpl->jsonrpl.s = bson_as_json(cdoc, NULL); + rpl->jsonrpl.s = _ksr_bson_as_json(cdoc, NULL); rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; } @@ -479,7 +485,7 @@ int mongodbc_next_reply(str *name) rpl->jsonrpl.s = NULL; rpl->jsonrpl.len = 0; } - rpl->jsonrpl.s = bson_as_json(cdoc, NULL); + rpl->jsonrpl.s = _ksr_bson_as_json(cdoc, NULL); rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; LM_DBG("next cursor result: [[%s]]\n", (rpl->jsonrpl.s) ? rpl->jsonrpl.s : "<null>");

1 0

git:master:a4a86bd1: db_mongodb: fix for deprecated bson_as_json() from v1.29.0
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: a4a86bd1a84ee16630660873486ec7d870a4e361 URL: https://github.com/kamailio/kamailio/commit/a4a86bd1a84ee16630660873486ec7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T07:33:58+01:00 db_mongodb: fix for deprecated bson_as_json() from v1.29.0 - GH #4037 --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a4a86bd1a84ee16630660873486ec7d… Patch: https://github.com/kamailio/kamailio/commit/a4a86bd1a84ee16630660873486ec7d… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index a57324d4afa..df49af6f925 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -29,6 +29,12 @@ #define DB_MONGODB_ROWS_STEP 1000 +#if MONGOC_CHECK_VERSION(1, 29, 0) +#define _ksr_bson_as_json bson_as_legacy_extended_json +#else +#define _ksr_bson_as_json bson_as_json +#endif + typedef struct db_mongodb_result { mongoc_collection_t *collection; /*!< Collection link */ @@ -773,7 +779,7 @@ static int db_mongodb_convert_result(const db1_con_t *_h, db1_res_t *_r) mgres->maxrows = RES_ROW_N(_r); } if(is_printable(L_DBG)) { - jstr = bson_as_json(itdoc, NULL); + jstr = _ksr_bson_as_json(itdoc, NULL); LM_DBG("selected document: %s\n", jstr); bson_free(jstr); } @@ -1000,7 +1006,7 @@ int db_mongodb_query(const db1_con_t *_h, const db_key_t *_k, } if(is_printable(L_DBG)) { - jstr = bson_as_json(seldoc, NULL); + jstr = _ksr_bson_as_json(seldoc, NULL); LM_DBG("query filter: %s\n", jstr); bson_free(jstr); } @@ -1036,7 +1042,7 @@ int db_mongodb_query(const db1_con_t *_h, const db_key_t *_k, } #endif if(is_printable(L_DBG)) { - jstr = bson_as_json(mgcon->colsdoc, NULL); + jstr = _ksr_bson_as_json(mgcon->colsdoc, NULL); LM_DBG("columns filter: %s\n", jstr); bson_free(jstr); } @@ -1174,7 +1180,7 @@ int db_mongodb_insert(const db1_con_t *_h, const db_key_t *_k, goto error; } if(is_printable(L_DBG)) { - jstr = bson_as_json(doc, NULL); + jstr = _ksr_bson_as_json(doc, NULL); LM_DBG("insert document: %s\n", jstr); bson_free(jstr); } @@ -1268,7 +1274,7 @@ int db_mongodb_delete(const db1_con_t *_h, const db_key_t *_k, } if(is_printable(L_DBG)) { - jstr = bson_as_json(doc, NULL); + jstr = _ksr_bson_as_json(doc, NULL); LM_DBG("delete filter document: %s\n", jstr); bson_free(jstr); }

1 0

git:master:5eac8fd5: lib/ims: libxml2 is not needed - removed from makefile
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 5eac8fd5356cc424d87cac4b4102c99e97054414 URL: https://github.com/kamailio/kamailio/commit/5eac8fd5356cc424d87cac4b4102c99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T14:38:08+01:00 lib/ims: libxml2 is not needed - removed from makefile --- Modified: src/lib/ims/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5eac8fd5356cc424d87cac4b4102c99… Patch: https://github.com/kamailio/kamailio/commit/5eac8fd5356cc424d87cac4b4102c99… --- diff --git a/src/lib/ims/Makefile b/src/lib/ims/Makefile index 482404ca36e..5a3dab42316 100644 --- a/src/lib/ims/Makefile +++ b/src/lib/ims/Makefile @@ -8,30 +8,8 @@ NAME:=kamailio_ims MAJOR_VER=0 MINOR_VER=1 BUGFIX_VER=0 -DEFS+=-DSER +LIBS= -ifeq ($(CROSS_COMPILE),) -XML2CFG=$(shell which xml2-config) -ifeq ($(XML2CFG),) -XML2CFG=$(shell \ - if pkg-config --exists libxml-2.0; then \ - echo 'pkg-config libxml-2.0'; \ - fi) -endif -endif - -ifneq ($(XML2CFG),) - libxml2_includes = $(shell $(XML2CFG) --cflags) - libxml2_libs = $(shell $(XML2CFG) --libs) -else - libxml2_includes = -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include - libxml2_libs = -L$(LOCALBASE)/lib -lxml2 -endif - -INCLUDES= -I$(CURDIR)/.. -I$(CURDIR)/../.. $(libxml2_includes) -LIBS=$(libxml2_libs) -#SERLIBPATH=.. -#SER_LIBS=$(SERLIBPATH)/cds/ser_cds +INCLUDES= -I$(CURDIR)/.. -I$(CURDIR)/../.. include ../../Makefile.libs -

1 0

git:master:97b3d1cd: ims_registrar_scscf: use defined fetchc fixup free function
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 97b3d1cd3daec0741352764cb89f08d6d98fe3df URL: https://github.com/kamailio/kamailio/commit/97b3d1cd3daec0741352764cb89f08d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T11:00:40+01:00 ims_registrar_scscf: use defined fetchc fixup free function --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/97b3d1cd3daec0741352764cb89f08d… Patch: https://github.com/kamailio/kamailio/commit/97b3d1cd3daec0741352764cb89f08d… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 4c55f50f4a0..5e163b0403a 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -262,7 +262,7 @@ static cmd_export_t cmds[] = { {"unregister", (cmd_function)unregister, 2, unreg_fixup, unreg_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"reg_fetch_contacts", (cmd_function)pv_fetch_contacts, 3, fetchc_fixup, - 0, REQUEST_ROUTE | FAILURE_ROUTE}, + fetchc_fixup_free, REQUEST_ROUTE | FAILURE_ROUTE}, {"reg_free_contacts", (cmd_function)pv_free_contacts, 1, fixup_str_null, fixup_free_str_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"can_subscribe_to_reg", (cmd_function)can_subscribe_to_reg, 1, domain_fixup, 0, REQUEST_ROUTE},

1 0

git:master:b993b824: ims_registrar_pcscf: init and check vb variable
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: b993b824447f30c9533b6ebd90ab74c19ea001bb URL: https://github.com/kamailio/kamailio/commit/b993b824447f30c9533b6ebd90ab74c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:56:12+01:00 ims_registrar_pcscf: init and check vb variable --- Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/b993b824447f30c9533b6ebd90ab74c… Patch: https://github.com/kamailio/kamailio/commit/b993b824447f30c9533b6ebd90ab74c… --- diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c index 26b31ad6f1e..c04db041e0c 100644 --- a/src/modules/ims_registrar_pcscf/service_routes.c +++ b/src/modules/ims_registrar_pcscf/service_routes.c @@ -228,7 +228,7 @@ pcontact_t *getContactP(struct sip_msg *_m, udomain_t *_d, pcontact_info_t search_ci; str received_host = {0, 0}; char srcip[50]; - struct via_body *vb; + struct via_body *vb = NULL; unsigned short port, proto; str host; sip_uri_t contact_uri; @@ -274,7 +274,7 @@ pcontact_t *getContactP(struct sip_msg *_m, udomain_t *_d, "[%d://%.*s:%d]\n", proto, host.len, host.s, port); - if(trust_bottom_via) { + if(trust_bottom_via && vb) { if(vb->received != NULL && vb->received->value.len > 0) { received_host = vb->received->value; } else { @@ -285,7 +285,7 @@ pcontact_t *getContactP(struct sip_msg *_m, udomain_t *_d, received_host.s = srcip; } unsigned short received_port = 0; - if(trust_bottom_via) { + if(trust_bottom_via && vb) { if(vb->rport != NULL && vb->rport->value.len > 0) { received_port = atoi(vb->rport->value.s); } else { @@ -298,7 +298,7 @@ pcontact_t *getContactP(struct sip_msg *_m, udomain_t *_d, received_port = 5060; } char received_proto = 0; - if(trust_bottom_via && vb->proto) { + if(trust_bottom_via && vb && vb->proto) { received_proto = vb->proto; } else { received_proto = _m->rcv.proto;

1 0

git:master:c36dd7e9: http_async_client: remove unnecessary str len
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: c36dd7e9c8b01aae5f35e8c576188cd34b1f8aa6 URL: https://github.com/kamailio/kamailio/commit/c36dd7e9c8b01aae5f35e8c576188cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:51:56+01:00 http_async_client: remove unnecessary str len --- Modified: src/modules/http_async_client/async_http.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/c36dd7e9c8b01aae5f35e8c576188cd… Patch: https://github.com/kamailio/kamailio/commit/c36dd7e9c8b01aae5f35e8c576188cd… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 1dbe8adc5c1..2ece3a9dd32 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -522,7 +522,7 @@ int async_send_query(sip_msg_t *msg, str *query, str *cbname) q_idx++; snprintf(q_id, MAX_ID_LEN + 1, "%u-%u", (unsigned int)getpid(), q_idx); - strncpy(aq->id, q_id, strlen(q_id)); + strcpy(aq->id, q_id); aq->query_params.tls_client_cert = NULL; if(ah_params.tls_client_cert) { diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a57aba9c951..daceb932ec9 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -100,7 +100,7 @@ void event_cb(int fd, short kind, void *userp) update_stat(timeouts, 1); const char *error = "TIMEOUT"; - strncpy(cell->error, error, strlen(error) + 1); + strcpy(cell->error, error); reply_error(cell); @@ -218,7 +218,7 @@ int check_mcode(CURLMcode code, char *error) break; } LM_ERR("ERROR: %s\n", s); - strncpy(error, s, strlen(s) + 1); + strcpy(error, s); return -1; } return 0;

1 0

git:master:eab6682e: keepalive: use memcpy for coping data
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: eab6682e4d8bebaf97f85c55b0863ad435e1d133 URL: https://github.com/kamailio/kamailio/commit/eab6682e4d8bebaf97f85c55b0863ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:39:44+01:00 keepalive: use memcpy for coping data --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/eab6682e4d8bebaf97f85c55b0863ad… Patch: https://github.com/kamailio/kamailio/commit/eab6682e4d8bebaf97f85c55b0863ad… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index b1b3581cb34..4c8a186b660 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -210,9 +210,10 @@ int ka_str_copy(str *src, str *dest, char *prefix) return -1; } - if(prefix) - strncpy(dest->s, prefix, lp); - strncpy(dest->s + lp, src->s, src->len); + if(prefix) { + memcpy(dest->s, prefix, lp); + } + memcpy(dest->s + lp, src->s, src->len); dest->s[src->len + lp] = '\0'; dest->len = src->len + lp;

1 0

git:master:92698848: core: removed unnecessary use of strlen
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 926988487358e1ae3ba79ca999629c452e2d32df URL: https://github.com/kamailio/kamailio/commit/926988487358e1ae3ba79ca999629c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:36:47+01:00 core: removed unnecessary use of strlen --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/926988487358e1ae3ba79ca999629c4… Patch: https://github.com/kamailio/kamailio/commit/926988487358e1ae3ba79ca999629c4… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 5db20255874..afd67173a5d 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -512,7 +512,7 @@ int ksr_locate_module(char *mod_path, char **new_path) len++; } path[len] = 0; - strncat(path, mod_path, strlen(mod_path)); + strcat(path, mod_path); if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

1 0

git:master:c2ff02b6: core: modparam - use memcpy for data cloning
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: c2ff02b6d07c0f84dcbe5d0d47de3f12ed791e3a URL: https://github.com/kamailio/kamailio/commit/c2ff02b6d07c0f84dcbe5d0d47de3f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T10:35:19+01:00 core: modparam - use memcpy for data cloning --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/c2ff02b6d07c0f84dcbe5d0d47de3f1… Patch: https://github.com/kamailio/kamailio/commit/c2ff02b6d07c0f84dcbe5d0d47de3f1… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index b48d9e82442..a166cc50706 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -151,7 +151,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) pkg_free(reg); return -1; } - strncpy(*((char **)ptr), (char *)val2, len_param); + memcpy(*((char **)ptr), (char *)val2, len_param); (*((char **)ptr))[len_param] = '\0'; break;

1 0

git:master:78f272da: async: fixed typo in log message
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 78f272da156ff7796dd84697bbf04522b7a08009 URL: https://github.com/kamailio/kamailio/commit/78f272da156ff7796dd84697bbf0452… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T08:33:41+01:00 async: fixed typo in log message --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/78f272da156ff7796dd84697bbf0452… Patch: https://github.com/kamailio/kamailio/commit/78f272da156ff7796dd84697bbf0452… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 504efa28125..722eb0cdbf9 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -130,7 +130,7 @@ static int mod_init(void) { /* init faked sip msg */ if(faked_msg_init() < 0) { - LM_ERR("failed to iit local sip msg\n"); + LM_ERR("failed to init local sip msg\n"); return -1; }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024