- sr-dev - kamailio.org

[kamailio/kamailio] db_mongodb: build warning on CentOS 10 (Issue #4037)
by sergey-safarov 01 Dec '24

01 Dec '24

``` make[2]: --libs: No such file or directory CC (gcc) [M db_mongodb.so] db_mongodb_mod.o CC (gcc) [M db_mongodb.so] mongodb_connection.o CC (gcc) [M db_mongodb.so] mongodb_dbase.o mongodb_dbase.c: In function ‘db_mongodb_convert_result’: mongodb_dbase.c:776:25: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 776 | jstr = bson_as_json(itdoc, NULL); | ^~~~ In file included from /usr/include/libmongoc-1.0/mongoc/mongoc.h:22, from /usr/include/libmongoc-1.0/mongoc.h:18, from mongodb_connection.h:26, from mongodb_dbase.c:27: /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_dbase.c: In function ‘db_mongodb_query’: mongodb_dbase.c:1003:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 1003 | jstr = bson_as_json(seldoc, NULL); | ^~~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_dbase.c:1039:25: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 1039 | jstr = bson_as_json(mgcon->colsdoc, NULL); | ^~~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_dbase.c: In function ‘db_mongodb_insert’: mongodb_dbase.c:1177:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 1177 | jstr = bson_as_json(doc, NULL); | ^~~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_dbase.c: In function ‘db_mongodb_delete’: mongodb_dbase.c:1271:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 1271 | jstr = bson_as_json(doc, NULL); | ^~~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ make[3]: Entering directory '/root/rpmbuild/BUILD/kamailio-6.0.0-dev3/src/lib/srdb1' make[3]: 'libsrdb1.so.1.0' is up to date. make[3]: Leaving directory '/root/rpmbuild/BUILD/kamailio-6.0.0-dev3/src/lib/srdb1' LD (gcc) [M db_mongodb.so] db_mongodb.so make[2]: --libs: No such file or directory make[2]: --libs: No such file or directory CC (gcc) [M ndb_mongodb.so] mongodb_client.o mongodb_client.c: In function ‘mongodbc_exec_cmd’: mongodb_client.c:266:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 266 | rpl->jsonrpl.s = bson_as_json(&reply, NULL); | ^~~ In file included from /usr/include/libmongoc-1.0/mongoc/mongoc.h:22, from /usr/include/libmongoc-1.0/mongoc.h:18, from mongodb_client.h:25, from mongodb_client.c:34: /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_client.c:271:25: warning: ‘mongoc_collection_command’ is deprecated: Use mongoc_collection_command_simple instead [-Wdeprecated-declarations] 271 | rpl->cursor = mongoc_collection_command(rpl->collection, | ^~~ In file included from /usr/include/libmongoc-1.0/mongoc/mongoc-client.h:26, from /usr/include/libmongoc-1.0/mongoc/mongoc-bulkwrite.h:22, from /usr/include/libmongoc-1.0/mongoc/mongoc.h:28: /usr/include/libmongoc-1.0/mongoc/mongoc-collection.h:51:1: note: declared here 51 | mongoc_collection_command (mongoc_collection_t *collection, | ^~~~~~~~~~~~~~~~~~~~~~~~~ mongodb_client.c:306:17: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 306 | rpl->jsonrpl.s = bson_as_json(cdoc, NULL); | ^~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ mongodb_client.c: In function ‘mongodbc_next_reply’: mongodb_client.c:482:9: warning: ‘bson_as_json’ is deprecated: Use bson_as_legacy_extended_json instead [-Wdeprecated-declarations] 482 | rpl->jsonrpl.s = bson_as_json(cdoc, NULL); | ^~~ /usr/include/libbson-1.0/bson/bson.h:535:1: note: declared here 535 | bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); | ^~~~~~~~~~~~ CC (gcc) [M ndb_mongodb.so] ndb_mongodb_mod.o LD (gcc) [M ndb_mongodb.so] ndb_mongodb.so make[2]: --libs: No such file or directory make[2]: --libs: No such file or directory CC (gcc) [M db_mysql.so] db_mysql.o CC (gcc) [M db_mysql.so] km_db_mysql.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4037 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4037(a)github.com>

2 7

git:master:dca29a87: db_mongodb: use STR_VTOZ() macro
by Daniel-Constantin Mierla 01 Dec '24

01 Dec '24

Module: kamailio Branch: master Commit: dca29a87467fd074bcb63a5f20b6834a87fadc5f URL: https://github.com/kamailio/kamailio/commit/dca29a87467fd074bcb63a5f20b6834… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-01T09:02:12+01:00 db_mongodb: use STR_VTOZ() macro --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/dca29a87467fd074bcb63a5f20b6834… Patch: https://github.com/kamailio/kamailio/commit/dca29a87467fd074bcb63a5f20b6834… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index 94d1b87500b..6f4818a712f 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -252,14 +252,13 @@ int mongodbc_exec_cmd( mongoc_client_get_collection(rsrv->client, dname->s, cname->s); LM_DBG("trying to execute: [[%.*s]]\n", cmd->len, cmd->s); - c = cmd->s[cmd->len]; - cmd->s[cmd->len] = '\0'; + STR_VTOZ(cmd->s[cmd->len], c); if(!bson_init_from_json(&command, cmd->s, cmd->len, &error)) { cmd->s[cmd->len] = c; LM_ERR("Failed to run command: %s\n", error.message); goto error_exec; } - cmd->s[cmd->len] = c; + STR_ZTOV(cmd->s[cmd->len], c); if(emode == 0) { ret = mongoc_collection_command_simple( rpl->collection, &command, NULL, &reply, &error);

1 0

[kamailio/kamailio] Python exception handling (Issue #4045)
by Matthias Urlichs 30 Nov '24

30 Nov '24

### Description The Python3 modules violate Python's exception handling contract.  ### Troubleshooting #### Reproduction ``` KSR.pc.sets("$fU",None) ``` #### Debugging Data ``` Unhandled exception in the Python code: TypeError: kemi-param-ss() argument 2 must be str, not None The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/usr/local/lib/python3.11/dist-packages/kamailio/trace.py", line 212, in pac return proc(*a, **k) ^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/kamailio/_basic.py", line 181, in ksr_request_route self.do_route(msg) File "/usr/local/lib/python3.11/dist-packages/kamailio/_basic.py", line 261, in do_route self.route_static(msg) File "/usr/local/lib/python3.11/dist-packages/kamailio/_basic.py", line 287, in route_static if self.fix_addrs(msg): ^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/kamailio/_basic.py", line 334, in fix_addrs PV.tU = dnr ^^^^^ File "/usr/local/lib/python3.11/dist-packages/kamailio/var.py", line 46, in __setattr__ return self.__setitem__(k, v) ^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/lib/python3.11/dist-packages/kamailio/var.py", line 73, in __setitem__ KSR.pv.sets("$fU", v) SystemError: <built-in function sets> returned a result with an exception set ``` ### Possible Solutions See PR #4044 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` seen with 5.6 and 5.8 ``` * **Operating System**: Debian Stable but doesn't matter -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4045 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4045(a)github.com>

2 3

git:master:3991350b: ndb_mongodb: mongoc_collection_command_with_opts() for mongodb_cmd()
by Daniel-Constantin Mierla 30 Nov '24

30 Nov '24

Module: kamailio Branch: master Commit: 3991350b1acdcd8b3cd575cdbc8932b4f8540e13 URL: https://github.com/kamailio/kamailio/commit/3991350b1acdcd8b3cd575cdbc8932b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-30T10:39:20+01:00 ndb_mongodb: mongoc_collection_command_with_opts() for mongodb_cmd() - mongoc_collection_command() is deprecated with lib v1.29.0 - GH #4037 --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/3991350b1acdcd8b3cd575cdbc8932b… Patch: https://github.com/kamailio/kamailio/commit/3991350b1acdcd8b3cd575cdbc8932b… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index dd48e5d471e..94d1b87500b 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -274,8 +274,24 @@ int mongodbc_exec_cmd( bson_destroy(&reply); } else { if(emode == 1) { +#if MONGOC_CHECK_VERSION(1, 29, 0) + opts = bson_new(); + ret = mongoc_collection_command_with_opts( + rpl->collection, &command, NULL, opts, &reply, &error); + bson_free(opts); + if(!ret) { + LM_ERR("Failed to run command: %s\n", error.message); + bson_destroy(&command); + goto error_exec; + } + rpl->jsonrpl.s = _ksr_bson_as_json(&reply, NULL); + rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; + bson_destroy(&reply); + goto done; +#else rpl->cursor = mongoc_collection_command(rpl->collection, MONGOC_QUERY_NONE, 0, 0, 0, &command, NULL, 0); +#endif } else { #if MONGOC_CHECK_VERSION(1, 5, 0) if(emode == 3) @@ -313,6 +329,10 @@ int mongodbc_exec_cmd( rpl->jsonrpl.len = (rpl->jsonrpl.s) ? strlen(rpl->jsonrpl.s) : 0; } +#if MONGOC_CHECK_VERSION(1, 29, 0) +done: +#endif + LM_DBG("command result: [[%s]]\n", (rpl->jsonrpl.s) ? rpl->jsonrpl.s : "<null>");

1 0

[kamailio/kamailio] race condition in load distribution Use call load distribution (Issue #4047)
by Muhammad Jawad Ud Din 30 Nov '24

30 Nov '24

i am using the 10 algorithm for the call load distribution it is good but when i put more load on it at create a race condition -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4047 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4047(a)github.com>

2 2

[kamailio/kamailio] ERROR: dispatcher [dispatch.c:1796]: ds_load_remove(): cannot find load for (Issue #4046)
by Muhammad Jawad Ud Din 30 Nov '24

30 Nov '24

hey kindly help me with error as i am using the call load distribution algorithm how i resolve this error -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4046 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4046(a)github.com>

1 1

[kamailio/kamailio] lost: build warning on CentOS 10 (Issue #4038)
by sergey-safarov 29 Nov '24

29 Nov '24

``` CC (gcc) [M lost.so] pidf.o CC (gcc) [M lost.so] response.o CC (gcc) [M lost.so] utilities.o utilities.c: In function ‘lost_held_post_request’: utilities.c:1420:9: warning: ‘xmlKeepBlanksDefault’ is deprecated [-Wdeprecated-declarations] 1420 | xmlKeepBlanksDefault(1); | ^~~~~~~~~~~~~~~~~~~~ In file included from pidf.h:37, from utilities.c:49: /usr/include/libxml2/libxml/parser.h:957:17: note: declared here 957 | xmlKeepBlanksDefault (int val); | ^~~~~~~~~~~~~~~~~~~~ utilities.c: In function ‘lost_held_location_request’: utilities.c:1518:9: warning: ‘xmlKeepBlanksDefault’ is deprecated [-Wdeprecated-declarations] 1518 | xmlKeepBlanksDefault(1); | ^~~~~~~~~~~~~~~~~~~~ /usr/include/libxml2/libxml/parser.h:957:17: note: declared here 957 | xmlKeepBlanksDefault (int val); | ^~~~~~~~~~~~~~~~~~~~ utilities.c: In function ‘lost_find_service_request’: utilities.c:1671:9: warning: ‘xmlKeepBlanksDefault’ is deprecated [-Wdeprecated-declarations] 1671 | xmlKeepBlanksDefault(1); | ^~~~~~~~~~~~~~~~~~~~ /usr/include/libxml2/libxml/parser.h:957:17: note: declared here 957 | xmlKeepBlanksDefault (int val); | ^~~~~~~~~~~~~~~~~~~~ utilities.c: In function ‘lost_parse_geo’: utilities.c:1050:41: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] 1050 | snprintf(loc->latitude, len, "%s", (char *)bufLat); | ^ utilities.c:1050:9: note: ‘snprintf’ output between 1 and 128 bytes into a destination of size 127 1050 | snprintf(loc->latitude, len, "%s", (char *)bufLat); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ utilities.c:1060:42: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] 1060 | snprintf(loc->longitude, len, "%s", (char *)bufLon); | ^ utilities.c:1060:9: note: ‘snprintf’ output between 1 and 128 bytes into a destination of size 127 1060 | snprintf(loc->longitude, len, "%s", (char *)bufLon); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ utilities.c:1074:49: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] 1074 | snprintf(loc->altitude, len, "%s", (char *)bufAlt); | ^ utilities.c:1074:17: note: ‘snprintf’ output between 1 and 128 bytes into a destination of size 127 1074 | snprintf(loc->altitude, len, "%s", (char *)bufAlt); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LD (gcc) [M lost.so] lost.so ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4038 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4038(a)github.com>

2 2

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev