- sr-dev - kamailio.org

git:master:784f55cd: lost: removed use of deprecated xmlKeepBlanksDefault()
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: 784f55cdb31de9eda6971e04ee12c2cb88556835 URL: https://github.com/kamailio/kamailio/commit/784f55cdb31de9eda6971e04ee12c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T09:33:58+01:00 lost: removed use of deprecated xmlKeepBlanksDefault() - XML_PARSE_NOBLANKS seems to be used, which is suggested in deprecation message - GH #4038 --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/784f55cdb31de9eda6971e04ee12c2c… Patch: https://github.com/kamailio/kamailio/commit/784f55cdb31de9eda6971e04ee12c2c… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 282bb27a57d..5035185efc1 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -1419,7 +1419,6 @@ char *lost_held_post_request(int *lgth, long rtime, char *type) xmlNodePtr ptrLocationRequest = NULL; xmlNodePtr ptrLocationType = NULL; - xmlKeepBlanksDefault(1); *lgth = 0; /* @@ -1517,7 +1516,6 @@ char *lost_held_location_request(p_lost_held_t held, int *lgth) xmlNodePtr ptrLocationType = NULL; xmlNodePtr ptrDevice = NULL; - xmlKeepBlanksDefault(1); *lgth = 0; /* @@ -1670,8 +1668,6 @@ char *lost_find_service_request(p_lost_loc_t loc, p_lost_list_t path, int *lgth) xmlNodePtr ptrNode = NULL; xmlNodePtr ptrPath = NULL; - xmlKeepBlanksDefault(1); - *lgth = 0; /*

1 0

git:master:4a9bb81a: lost: clang format
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: 4a9bb81a69fbef11d92d294fa1db0711ff8e78db URL: https://github.com/kamailio/kamailio/commit/4a9bb81a69fbef11d92d294fa1db071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T09:15:59+01:00 lost: clang format --- 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/4a9bb81a69fbef11d92d294fa1db071… Patch: https://github.com/kamailio/kamailio/commit/4a9bb81a69fbef11d92d294fa1db071…

1 0

git:master:be2d3bfe: lost: use buffer size for snprintf
by Daniel-Constantin Mierla 29 Nov '24

29 Nov '24

Module: kamailio Branch: master Commit: be2d3bfe537a692efa8cdc2bd4e4441eed5d0840 URL: https://github.com/kamailio/kamailio/commit/be2d3bfe537a692efa8cdc2bd4e4441… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-29T09:13:49+01:00 lost: use buffer size for snprintf --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/be2d3bfe537a692efa8cdc2bd4e4441… Patch: https://github.com/kamailio/kamailio/commit/be2d3bfe537a692efa8cdc2bd4e4441… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 6e3d9c43f06..ae1bed14fa3 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -1047,7 +1047,7 @@ int lost_parse_geo(xmlNodePtr node, p_lost_loc_t loc) if(loc->latitude == NULL) goto err; - snprintf(loc->latitude, len, "%s", (char *)bufLat); + snprintf(loc->latitude, len + 1, "%s", (char *)bufLat); /* logitude */ len = strlen((char *)bufLon); @@ -1057,7 +1057,7 @@ int lost_parse_geo(xmlNodePtr node, p_lost_loc_t loc) goto err; } - snprintf(loc->longitude, len, "%s", (char *)bufLon); + snprintf(loc->longitude, len + 1, "%s", (char *)bufLon); /* altitude */ if(scan == 3) { @@ -1071,13 +1071,13 @@ int lost_parse_geo(xmlNodePtr node, p_lost_loc_t loc) goto err; } - snprintf(loc->altitude, len, "%s", (char *)bufAlt); + snprintf(loc->altitude, len + 1, "%s", (char *)bufAlt); } /* geolocation */ len = strlen((char *)bufLat) + strlen((char *)bufLon) + 1; if((scan == 3) && (lost_geoloc_3d == 1)) { - len += strlen((char *)bufAlt); + len += strlen((char *)bufAlt) + 1; } loc->geodetic = (char *)pkg_malloc(len + 1); if(loc->geodetic == NULL) { @@ -1089,9 +1089,9 @@ int lost_parse_geo(xmlNodePtr node, p_lost_loc_t loc) } if((scan == 3) && (lost_geoloc_3d == 1)) { s_profile = LOST_PRO_GEO3D; - snprintf(loc->geodetic, len, "%s %s %s", (char *)bufLat, (char *)bufLon, (char *)bufAlt); + snprintf(loc->geodetic, len + 1, "%s %s %s", (char *)bufLat, (char *)bufLon, (char *)bufAlt); } else { - snprintf(loc->geodetic, len, "%s %s", (char *)bufLat, (char *)bufLon); + snprintf(loc->geodetic, len + 1, "%s %s", (char *)bufLat, (char *)bufLon); } /* find <radius> element */

1 0

[kamailio/kamailio] kamcmd tm.t_uac_start error (Issue #4042)
by suiyuemanbu 29 Nov '24

29 Nov '24

kamcmd tm.t_uac_start INVITE sip:1346@192.168.10.22:5080 . . 'From: <sip:1000@192.168.10.11>\r\n' 'To: <sip:1346@192.168.10.22:5080>\r\n' error: 400 - Invalid headers the log is : /usr/bin/kamailio[2773]: ERROR: <core> [core/parser/msg_parser.c:260]: get_hdr_field(): no eol - bad body for <From> (hdr type: 4) [<sip:1000@192.168.10.11>\r\n] /usr/bin/kamailio[2773]: ERROR: <core> [core/parser/msg_parser.c:339]: parse_headers(): bad header field [From: <sip:1000@192.168.10.11>\r\n] kamailio -v version: kamailio 5.7.0 (x86_64/linux) f1e91d please help me, thank you -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4042 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4042(a)github.com>

2 2

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

git:master:2fccae6c: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 2fccae6cf901edf8b9515636b348246297a06131 URL: https://github.com/kamailio/kamailio/commit/2fccae6cf901edf8b9515636b348246… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-28T08:31:10+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/2fccae6cf901edf8b9515636b348246… Patch: https://github.com/kamailio/kamailio/commit/2fccae6cf901edf8b9515636b348246…

1 0

git:master:97c9aca6: async: docs for mode parameter
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 97c9aca6d2e7300b295c5cc7f9cd405d563d31b2 URL: https://github.com/kamailio/kamailio/commit/97c9aca6d2e7300b295c5cc7f9cd405… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T08:22:15+01:00 async: docs for mode parameter --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97c9aca6d2e7300b295c5cc7f9cd405… Patch: https://github.com/kamailio/kamailio/commit/97c9aca6d2e7300b295c5cc7f9cd405… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index f11e28540ed..4bfa5da48e7 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -129,6 +129,27 @@ modparam("async", "ms_timer", 10) ... modparam("async", "return", 1) ... +</programlisting> + </example> + </section> + <section id="async.p.mode"> + <title><varname>mode</varname> (int)</title> + <para> + Control if the module should bind (0) to tm or not (1). It may not + be needed to use tm functions (e.g., when needing async_tkv_emit() + only). + </para> + <para> + <emphasis> + Default value is 0 (bind to tm module). + </emphasis> + </para> + <example> + <title>Set <varname>mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("async", "mode", 1) +... </programlisting> </example> </section>

1 0

git:master:21d48531: async: added parameter mode
by Daniel-Constantin Mierla 28 Nov '24

28 Nov '24

Module: kamailio Branch: master Commit: 21d4853139523920810a9d73916f3435a5a73d70 URL: https://github.com/kamailio/kamailio/commit/21d4853139523920810a9d73916f343… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-28T08:16:11+01:00 async: added parameter mode - control if binding to tm should be done or not --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/21d4853139523920810a9d73916f343… Patch: https://github.com/kamailio/kamailio/commit/21d4853139523920810a9d73916f343… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 5353082359f..504efa28125 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -43,6 +43,7 @@ MODULE_VERSION static int async_workers = 1; static int async_ms_timer = 0; static int async_return = 0; +static int async_mode = 0; static int mod_init(void); static int child_init(int); @@ -97,6 +98,7 @@ static param_export_t params[]={ {"workers", PARAM_INT, &async_workers}, {"ms_timer", PARAM_INT, &async_ms_timer}, {"return", PARAM_INT, &async_return}, + {"mode", PARAM_INT, &async_mode}, {0, 0, 0} }; @@ -132,13 +134,18 @@ static int mod_init(void) return -1; } - if(load_tm_api(&tmb) == -1) { - LM_ERR("cannot load the TM-functions. Missing TM module?\n"); - return -1; + if(async_mode == 0) { + if(load_tm_api(&tmb) == -1) { + LM_ERR("cannot load the TM-functions. Missing TM module?\n"); + return -1; + } + } else { + memset(&tmb, 0, sizeof(struct tm_binds)); } - if(async_workers <= 0) + if(async_workers <= 0) { return 0; + } if(async_init_timer_list() < 0) { LM_ERR("cannot initialize internal structure\n"); @@ -173,8 +180,9 @@ static int child_init(int rank) if(rank != PROC_MAIN) return 0; - if(async_workers <= 0) + if(async_workers <= 0) { return 0; + } for(i = 0; i < async_workers; i++) { if(fork_basic_timer(PROC_TIMER, "ASYNC MOD TIMER", 1 /*socks flag*/,

1 0

git:master:b003a718: corez: set sndinfo attributes for corex_sip_reply_out()
by Daniel-Constantin Mierla 27 Nov '24

27 Nov '24

Module: kamailio Branch: master Commit: b003a7184a02da5fd6dfe27def8d928d363e36ce URL: https://github.com/kamailio/kamailio/commit/b003a7184a02da5fd6dfe27def8d928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-27T15:36:33+01:00 corez: set sndinfo attributes for corex_sip_reply_out() --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b003a7184a02da5fd6dfe27def8d928… Patch: https://github.com/kamailio/kamailio/commit/b003a7184a02da5fd6dfe27def8d928… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 115e50f8a03..9f22b445ece 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -1453,6 +1453,16 @@ static int corex_sip_reply_out(sr_event_param_t *evp) str evname = str_init("corex:reply-out"); memset(&sndinfo, 0, sizeof(onsend_info_t)); + sndinfo.dst = evp->dst; + if(evp->rpl != NULL) { + sndinfo.msg = evp->rpl; + sndinfo.buf = evp->rpl->buf; + sndinfo.len = evp->rpl->len; + } else { + sndinfo.msg = evp->req; + sndinfo.buf = evp->req->buf; + sndinfo.len = evp->req->len; + } if(corex_evrt_reply_out_no >= 0 || corex_evcb_reply_out.len > 0) { run_onsend_evroute(&sndinfo, corex_evrt_reply_out_no,

1 0

git:master:13f77911: core: parameter to set async_tkv_evcb
by Daniel-Constantin Mierla 27 Nov '24

27 Nov '24

Module: kamailio Branch: master Commit: 13f77911ebf5c5b53c9793727a9c5b4f1f0865fe URL: https://github.com/kamailio/kamailio/commit/13f77911ebf5c5b53c9793727a9c5b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-27T12:20:05+01:00 core: parameter to set async_tkv_evcb - name of event route or kemi callback for tkv processing --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/13f77911ebf5c5b53c9793727a9c5b4… Patch: https://github.com/kamailio/kamailio/commit/13f77911ebf5c5b53c9793727a9c5b4…

1 0

[kamailio/kamailio] kamailio exceed limit issue (Issue #4040)
by Muhammad Jawad Ud Din 27 Nov '24

27 Nov '24

route[HANDLE_INVITE] { if (!has_totag()) { if (!t_newtran()) { xlog("L_ERROR", "Failed to create new transaction\n"); sl_reply_error(); exit; } if (!is_present_hf("X-VICIdial-Client-Id")) { xlog("L_WARN", "INVITE received without X-VICIdial-Client-Id header\n"); t_reply("400", "Bad Request - Missing Client ID"); exit; } if ($rU == $null) { xlog("L_WARN", "INVITE received with empty Request-URI username\n"); t_reply("400", "Bad Request - Missing User"); exit; } $var(full_client_id) = $hdr(X-VICIdial-Client-Id); # Extract parent ID if ($var(full_client_id) =~ "^(CID_[0-9]+)-[a-z]$") { $var(parent_client_id) = $(var(full_client_id){re.subst,/^(CID_[0-9]+)-[a-z]$/\1/}); } else { $var(parent_client_id) = $var(full_client_id); } # CPS Check and Rate Limiting lock("cps_counter"); # Get current CPS count and max limit $var(current_cps) = $sht(client_limits=>$var(parent_client_id)); $var(max_cps) = $sht(client_max_cps=>$var(parent_client_id)); xlog("L_INFO", "CPS Check - Client: $var(parent_client_id), Current: $var(current_cps), Max: $var(max_cps)\n"); # Check for configured limit if($var(max_cps) == $null) { unlock("cps_counter"); xlog("L_WARN", "No CPS limit configured for client $var(parent_client_id)\n"); t_reply("403", "Client Not Authorized"); exit; } # Get concurrent calls $var(concurrent_calls) = $sht(client_calls=>$var(parent_client_id)); if($var(concurrent_calls) == $null) { $var(concurrent_calls) = 0; } # Strict limit check if($var(concurrent_calls) >= $var(max_cps)) { unlock("cps_counter"); xlog("L_WARN", "Concurrent call limit reached for $var(parent_client_id): $var(concurrent_calls)/$var(max_cps)\n"); t_reply("503", "Concurrent Call Limit Exceeded"); exit; } # Allow call and increment counter if($var(current_cps) == $null) { $sht(client_limits=>$var(parent_client_id)) = 1; } else { $sht(client_limits=>$var(parent_client_id)) = $var(current_cps) + 1; } xlog("L_INFO", "Call allowed for $var(parent_client_id): Concurrent=$var(concurrent_calls+1)/$var(max_cps)\n"); unlock("cps_counter"); $var(user) = $rU; # Extract parent client ID if this is a child ID if ($var(full_client_id) =~ "^(CID_[0-9]+)-[a-z]$") { $var(parent_client_id) = $(var(full_client_id){re.subst,/^(CID_[0-9]+)-[a-z]$/\1/}); $var(is_child) = 1; } else { $var(parent_client_id) = $var(full_client_id); $var(is_child) = 0; } $avp(full_client_id) = $var(full_client_id); $avp(parent_client_id) = $var(parent_client_id); $avp(user) = $var(user); $var(call_id) = $ci; route(GENERATE_SERIAL_NUMBER); # Track client calls lock("client_counter"); # Update parent counter $var(parent_calls) = $sht(client_calls=>$var(parent_client_id)); if($var(parent_calls) == $null) { $var(parent_calls) = 0; } $sht(client_calls=>$var(parent_client_id)) = $var(parent_calls) + 1; # If it's a child ID, update its individual counter too if ($var(is_child) == 1) { $var(child_calls) = $sht(client_calls=>$var(full_client_id)); if($var(child_calls) == $null) { $var(child_calls) = 0; } $sht(client_calls=>$var(full_client_id)) = $var(child_calls) + 1; } # Store mappings $sht(client_calls=>$var(call_id)) = $var(parent_client_id); $sht(client_original=>$var(call_id)) = $var(full_client_id); unlock("client_counter"); # Find destination with lowest active calls $var(min_calls) = 999; $var(selected_dst) = ""; lock("calls_counter"); if (ds_select_dst("4", "4")) { $var(count) = 0; # Add counter $var(current_calls) = $sht(active_calls=>$du); if ($var(current_calls) == $null) { $var(current_calls) = 0; } if ($var(current_calls) < $var(min_calls)) { $var(min_calls) = $var(current_calls); $var(selected_dst) = $du; } while(ds_next_dst() && $var(count) < 350) { # Set higher than 280 $var(count) = $var(count) + 1; $var(current_calls) = $sht(active_calls=>$du); if ($var(current_calls) == $null) { $var(current_calls) = 0; } if ($var(current_calls) < $var(min_calls)) { $var(min_calls) = $var(current_calls); $var(selected_dst) = $du; } } } if ($var(selected_dst) != "" && $var(min_calls) < 25) { $du = $var(selected_dst); # Add this block - Double check the count hasn't changed $var(current_count) = $sht(active_calls=>$du); if ($var(current_count) >= 25) { unlock("calls_counter"); xlog("L_ERROR", "Count increased during selection for $du to $var(current_count)\n"); t_reply("503", "Service Unavailable"); exit; } # Store Call-ID to destination mapping $sht(active_calls=>$var(call_id)) = $du; # Increment call counter $sht(active_calls=>$du) = $var(min_calls) + 1; unlock("calls_counter"); route(RELAY_INVITE); } else { unlock("calls_counter"); xlog("L_NOTICE", "Unlocked $ci"); $du = "sip:34.125.5.64:5060"; t_on_failure("FINAL_FAILURE"); if (!t_relay()) { t_reply("500", "Internal Server Error"); } } } else { route(RELAY); } } here is my invite rout configuration if you look at to the cps limit this is occultly the call per second limit on the client id when i set it 200 and the start calling up to 3000 per seconds so some time or for a bit of time it exceed the limit 201 or 202 then it start enforce 200 so if anyone have the best idea or suggestion regarding to this with the good ms time -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4040 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4040(a)github.com>

2 2

git:master:a6c7538c: core: new parameter to define async_tkv_gname
by Daniel-Constantin Mierla 27 Nov '24

27 Nov '24

Module: kamailio Branch: master Commit: a6c7538cb873aa8ee173eadffecbe3fdefe40bd7 URL: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-27T09:18:06+01:00 core: new parameter to define async_tkv_gname --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… Patch: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index e66205335fa..66b3d2c0b08 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -537,6 +537,16 @@ int async_task_run(async_wgroup_t *awg, int idx) static async_wgroup_t *_async_tkv_awg = NULL; static async_tkv_param_t *_ksr_async_tkv_param = NULL; static int _ksr_async_tkv_ridx = -1; +static str async_tkv_gname = str_init("tkv"); + +/** + * + */ +void async_tkv_gname_set(char *gname) +{ + async_tkv_gname.s = gname; + async_tkv_gname.len = strlen(async_tkv_gname.s); +} /** * @@ -551,10 +561,12 @@ async_tkv_param_t *ksr_async_tkv_param_get(void) */ void async_tkv_init(void) { - str gname = str_init("tkv"); str evname = str_init("core:tkv"); - _async_tkv_awg = async_task_group_find(&gname); + if(async_tkv_gname.len <= 0) { + return; + } + _async_tkv_awg = async_task_group_find(&async_tkv_gname); _ksr_async_tkv_ridx = route_lookup(&event_rt, evname.s); if(_ksr_async_tkv_ridx <= 0 diff --git a/src/core/async_task.h b/src/core/async_task.h index 67df94d6169..8319f0b8a46 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -69,5 +69,6 @@ typedef struct async_tkv_param void async_tkv_init(void); int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); async_tkv_param_t *ksr_async_tkv_param_get(void); +void async_tkv_gname_set(char *gname); #endif diff --git a/src/core/cfg.lex b/src/core/cfg.lex index a557f62754f..91aece447f3 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -381,6 +381,7 @@ ASYNC_WORKERS async_workers ASYNC_USLEEP async_usleep ASYNC_NONBLOCK async_nonblock ASYNC_WORKERS_GROUP async_workers_group +ASYNC_TKV_GNAME async_tkv_gname CHECK_VIA check_via PHONE2TEL phone2tel MEMLOG "memlog"|"mem_log" @@ -874,6 +875,7 @@ IMPORTFILE "import_file" <INITIAL>{ASYNC_USLEEP} { count(); yylval.strval=yytext; return ASYNC_USLEEP; } <INITIAL>{ASYNC_NONBLOCK} { count(); yylval.strval=yytext; return ASYNC_NONBLOCK; } <INITIAL>{ASYNC_WORKERS_GROUP} { count(); yylval.strval=yytext; return ASYNC_WORKERS_GROUP; } +<INITIAL>{ASYNC_TKV_GNAME} { count(); yylval.strval=yytext; return ASYNC_TKV_GNAME; } <INITIAL>{CHECK_VIA} { count(); yylval.strval=yytext; return CHECK_VIA; } <INITIAL>{PHONE2TEL} { count(); yylval.strval=yytext; return PHONE2TEL; } <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 1033e61cb19..f5544a96ac6 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -397,6 +397,7 @@ extern char *default_routename; %token ASYNC_USLEEP %token ASYNC_NONBLOCK %token ASYNC_WORKERS_GROUP +%token ASYNC_TKV_GNAME %token CHECK_VIA %token PHONE2TEL %token MEMLOG @@ -1088,6 +1089,8 @@ assign_stm: | ASYNC_NONBLOCK EQUAL error { yyerror("number expected"); } | ASYNC_WORKERS_GROUP EQUAL STRING { async_task_set_workers_group($3); } | ASYNC_WORKERS_GROUP EQUAL error { yyerror("string expected"); } + | ASYNC_TKV_GNAME EQUAL STRING { async_tkv_gname_set($3); } + | ASYNC_TKV_GNAME EQUAL error { yyerror("string expected"); } | CHECK_VIA EQUAL NUMBER { check_via=$3; } | CHECK_VIA EQUAL error { yyerror("boolean value expected"); } | PHONE2TEL EQUAL NUMBER { phone2tel=$3; }

1 0

git:master:a433cdf5: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: a433cdf5532e9b2e945fa4ced2e07c0566c01eb3 URL: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T15:46:10+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… Patch: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index d4aa520a5ea..1e14cf89af0 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -421,6 +421,8 @@ event_route[xhttp:request] { ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "corex.debug", "params": [ 2 ], "id": + 1}'); ... 6. JSONRPC Commands

1 0

git:master:5437ad1a: jsonrpcs: docs - example for jsonrpc_exec() with rpc params
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 5437ad1a1dd691707e6ea1774e5c8ff6a72d30a7 URL: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T15:41:44+01:00 jsonrpcs: docs - example for jsonrpc_exec() with rpc params --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… Patch: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index ab8aee4fcd0..f16cac7a7ee 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -495,6 +495,7 @@ event_route[xhttp:request] { ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "corex.debug", "params": [ 2 ], "id": 1}'); ... </programlisting> </example>

1 0

Request for assistance with Microsoft Teams and Asterisk integration
by Giuseppe Marletta 26 Nov '24

26 Nov '24

Dear Kamailio Team, My name is Marletta, and I am a technician. I am working on a project involving Kamailio and need some information or assistance to configure its integration with Microsoft Teams and Asterisk. Specifically, I would like to know: 1. Is this integration feasible? 2. Which certificates should be used? 3. How can I validate the communication between Kamailio and Teams? I have consulted the official documentation and forums but could not find comprehensive answers. Would it be possible to receive your support or be directed to relevant resources or experts? Thank you in advance for your time and for the work you do to support this remarkable open-source community. I remain available to provide further details or clarifications. Best regards / 此致 [cid:image001.png@01DB3F60.F5D74DE0] Giuseppe Marletta Viale Europa, 128 - 65010 SPOLTORE (PE) Tel [+39] 085 4450011- Fax [+39] 085 4459477 PI e C.F. 01635460684 www.tecnojest.com<http://www.tecnojest.com/> [Image result for you tube icon]<https://www.youtube.com/@tecnojestsrl>[cid:image003.png@01DB3F60.F5D74DE0]<http://www.tecnojest.com/> [cid:image004.png@01DB3F60.F5D74DE0] <https://www.linkedin.com/company/tecnojests.r.l./> Le informazioni contenute nella presente e-mail e nei documenti eventualmente allegati possono essere confidenziali e sono comunque riservate al destinatario della stessa. La loro diffusione, distribuzione e/o copiatura da parte di terzi è proibita. I contenuti testuali sono divulgati a mero titolo informativo, gli stessi non possono essere rivendicati come impegni, ordini o commesse se non accompagnati da specifico documento firmato a norma di legge. Se avete ricevuto questa comunicazione per errore, Vi preghiamo di informare immediatamente il mittente del messaggio e di distruggere questa e-mail. This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden.

2 1

git:master:50ae4a98: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 50ae4a986c93ef8e405732d52f79ab98505888a4 URL: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T13:31:10+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… Patch: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… --- diff --git a/src/modules/async/README b/src/modules/async/README index a703c1224b1..f1ac057d01a 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -39,6 +39,7 @@ Daniel-Constantin Mierla 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) List of Examples @@ -54,6 +55,7 @@ Daniel-Constantin Mierla 1.10. async_task_group_route usage 1.11. async_task_data usage 1.12. async_task_group_data usage + 1.13. async_tkv_emit usage Chapter 1. Admin Guide @@ -81,6 +83,7 @@ Chapter 1. Admin Guide 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) 1. Overview @@ -168,6 +171,7 @@ modparam("async", "return", 1) 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) 4.1. async_route(routename, seconds) @@ -416,3 +420,24 @@ route[RESUME] { exit; } ... + +4.9. async_tkv_emit(type, key, value) + + Emit a type-key-value event. + + This function can be used from ANY_ROUTE. + + Example 1.13. async_tkv_emit usage +... +async_workers_group="name=tkv;workers=1;nonblock=0;usleep=0" +... +request_route { + ... + async_tkv_emit("8000", "call", "caller='$fU';callee='$tU'"); + ... +} +event_route[core:tkv] { + xinfo("$atkv(type) / $atkv(key) / $atkv(val)\n"); + exit; +} +...

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev