sr-dev November 2024

sr-dev@lists.kamailio.org

17 participants
307 discussions

git:master:619b1f80: log_custom: add fixup_free* to exported functions

by Federico Cabiddu

Module: kamailio Branch: master Commit: 619b1f80d648e5869389b431e17c12f7b730634e URL: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-25T08:34:48+01:00 log_custom: add fixup_free* to exported functions --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… Patch: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index f7ae9a228c5..abb3ababd3b 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -47,25 +47,28 @@ static int w_log_udp(struct sip_msg *msg, char *txt, char *p2); void _lc_core_log_udp(int lpriority, const char *format, ...); +/* clang-format off */ static cmd_export_t cmds[] = { - {"log_udp", (cmd_function)w_log_udp, 1, fixup_spve_null, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"log_udp", (cmd_function)w_log_udp, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; struct module_exports exports = { - "log_custom", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "log_custom", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC functions */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; +/* clang-format on */ /** * init module function */

1 hour, 30 minutes

git:master:adffa9e2: ldap: add fixup_free* to exported functions

by Federico Cabiddu

Module: kamailio Branch: master Commit: adffa9e2b31bf0ad7070420ac821a914fc2bcd6b URL: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-25T08:32:48+01:00 ldap: add fixup_free* to exported functions --- Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… Patch: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… --- diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index 27d44b9d88b..8303885f6ba 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -59,6 +59,8 @@ static int child_init(int rank); static int ldap_result_fixup(void **param, int param_no); static int ldap_filter_url_encode_fixup(void **param, int param_no); static int ldap_result_check_fixup(void **param, int param_no); +static int ldap_fixup_free(void **param, int param_no); +static int ldap_filter_url_encode_fixup_free(void **param, int param_no); /* * exported functions @@ -94,25 +96,25 @@ static dictionary *config_vals = NULL; /* clang-format off */ static cmd_export_t cmds[] = { {"ldap_search", (cmd_function)w_ldap_search, 1, - fixup_spve_null, 0, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result1, 1, - ldap_result_fixup, 0, + ldap_result_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result2, 2, - ldap_result_fixup, 0, + ldap_result_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_next", (cmd_function)w_ldap_result_next, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_check", (cmd_function)w_ldap_result_check_1, 1, - ldap_result_check_fixup, 0, + ldap_result_check_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_check", (cmd_function)w_ldap_result_check_2, 2, - ldap_result_check_fixup, 0, + ldap_result_check_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_filter_url_encode", (cmd_function)w_ldap_filter_url_encode, 2, - ldap_filter_url_encode_fixup, 0, + ldap_filter_url_encode_fixup, ldap_filter_url_encode_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"load_ldap", (cmd_function)load_ldap, 0, 0, 0, 0}, @@ -374,6 +376,14 @@ static int ldap_result_fixup(void **param, int param_no) return 0; } +static int ldap_fixup_free(void **param, int param_no) +{ + if(param_no == 1) { + pkg_free(*param); + } + return 0; +} + static int ldap_result_check_fixup(void **param, int param_no) { struct ldap_result_check_params *lp; @@ -475,6 +485,14 @@ static int ldap_filter_url_encode_fixup(void **param, int param_no) return 0; } +static int ldap_filter_url_encode_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + pkg_free(*param); + } + return 0; +} + /** * */

1 hour, 31 minutes

[kamailio/kamailio] topoh: improve debug info for topoh crash (PR #4039)

by Souradeep Bera

- print entire socket address for ease of debugging with empty mask ip   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4039 -- Commit Summary -- * topoh: improve debug info for topoh crash -- File Changes -- M src/modules/topoh/topoh_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4039.patch https://github.com/kamailio/kamailio/pull/4039.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4039 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4039(a)github.com>

1 day

git:master:cdafda78: pkg/kamailio: added support for CentOS 10 [skip-ci]

by Sergey Safarov

Module: kamailio Branch: master Commit: cdafda78c9fc98d9d9fdb7f94e77c9bc60ebf4d1 URL: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2024-11-23T22:03:17+02:00 pkg/kamailio: added support for CentOS 10 [skip-ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… Patch: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 04eb6ba9076..9c32a293be2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -113,21 +113,21 @@ %bcond_without wolfssl %endif -%if 0%{?rhel} == 9 +%if 0%{?rhel} == 9 || 0%{?rhel} == 10 %if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} -%define dist .el9.centos +%define dist .el%{?centos_ver}.centos %endif %if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} -%define dist .el9.almalinux +%define dist .el%{?almalinux_ver}.almalinux %endif %if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} -%define dist .el9.rocky +%define dist .el%{?rocky_ver}.rocky %endif %if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 %define dist_name rhel

1 day, 13 hours

[kamailio/kamailio] lost: build warning on CentOS 10 (Issue #4038)

by sergey-safarov

``` 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>

1 day, 13 hours

[kamailio/kamailio] db_mongodb: build warning on CentOS 10 (Issue #4037)

by sergey-safarov

``` 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>

1 day, 13 hours

git:master:b1f9fc1d: corex: added $atkv(name) variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b1f9fc1d586975a12f6a6d56a76dbf2d3541124c URL: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:30:25+01:00 corex: added $atkv(name) variable - get async type-key-value attributes --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… Patch: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 0fdf35060ea..c5008bfb445 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -38,6 +38,7 @@ #include "../../core/forward.h" #include "../../core/dns_cache.h" #include "../../core/data_lump.h" +#include "../../core/async_task.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -101,12 +102,17 @@ static int corex_dns_cache_param_add(str *pval); static int corex_sip_reply_out(sr_event_param_t *evp); +static int pv_get_atkv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_atkv_name(pv_spec_t *sp, str *in); + /* clang-format off */ static pv_export_t mod_pvs[] = { {{"cfg", (sizeof("cfg") - 1)}, PVT_OTHER, pv_get_cfg, 0, pv_parse_cfg_name, 0, 0, 0}, {{"lsock", (sizeof("lsock") - 1)}, PVT_OTHER, pv_get_lsock, 0, pv_parse_lsock_name, 0, 0, 0}, + {{"atkv", (sizeof("atkv") - 1)}, PVT_OTHER, pv_get_atkv, 0, + pv_parse_atkv_name, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -1456,6 +1462,81 @@ static int corex_sip_reply_out(sr_event_param_t *evp) return 0; } +/** + * + */ +static int pv_get_atkv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + async_tkv_param_t *atkvp = NULL; + async_wgroup_t *awg = NULL; + + atkvp = ksr_async_tkv_param_get(); + + if(atkvp == NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 0: + return pv_get_sintval(msg, param, res, (long)atkvp->dtype); + case 1: + if(atkvp->skey.s == NULL || atkvp->skey.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &atkvp->skey); + case 2: + if(atkvp->sval.s == NULL || atkvp->sval.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &atkvp->sval); + case 3: + awg = async_task_workers_get_crt(); + if(awg == NULL || awg->name.s == NULL || awg->name.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &awg->name); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int pv_parse_atkv_name(pv_spec_t *sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + switch(in->len) { + case 3: + if(strncmp(in->s, "key", 3) == 0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else if(strncmp(in->s, "val", 3) == 0) { + sp->pvp.pvn.u.isname.name.n = 2; + } + break; + case 4: + if(strncmp(in->s, "type", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + break; + case 5: + if(strncmp(in->s, "gname", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 3; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + return -1; +} + /** *

2 days, 14 hours

git:master:88ca83a5: core: function to get current tkv param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 88ca83a5379dbaca3a87fdcb26dd2855b5ba871d URL: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:24:18+01:00 core: function to get current tkv param --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… Patch: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 17c385a51fd..e66205335fa 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -538,6 +538,14 @@ 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; +/** + * + */ +async_tkv_param_t *ksr_async_tkv_param_get(void) +{ + return _ksr_async_tkv_param; +} + /** * */ diff --git a/src/core/async_task.h b/src/core/async_task.h index b4276c2d27c..67df94d6169 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -65,8 +65,9 @@ typedef struct async_tkv_param str sval; } async_tkv_param_t; -#define KSR_ASYNC_TKV_SIZE 512 +#define KSR_ASYNC_TKV_SIZE 1024 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); #endif

2 days, 14 hours

git:master:d2c98b63: core: main - init async type-key-value framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d2c98b63d141a88f29a379f6b5f23122d4997e82 URL: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:17:44+01:00 core: main - init async type-key-value framework --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… Patch: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… --- diff --git a/src/main.c b/src/main.c index 6aacc523db8..870a334559b 100644 --- a/src/main.c +++ b/src/main.c @@ -3333,6 +3333,7 @@ int main(int argc, char **argv) #endif /* USE_TLS */ #endif /* USE_TCP */ + async_tkv_init(); sr_core_ert_run_xname("core:modinit-before"); if(init_modules() != 0) {

2 days, 14 hours

git:master:f4e04dac: pv: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: f4e04dac07bc11da08288a8a4a4957c5799c37e9 URL: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:48:18+01:00 pv: add fixup_free* to exported functions --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… Patch: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 3feedf66cda..e014cf37449 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -535,9 +535,9 @@ int pv_register_api(pv_api_t *); /* clang-format off */ static cmd_export_t cmds[] = { {"pv_isset", (cmd_function)pv_isset, 1, - fixup_pvar_null, 0, ANY_ROUTE}, + fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"pv_unset", (cmd_function)pv_unset, 1, - fixup_pvar_null, 0, ANY_ROUTE}, + fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE}, {"pv_xavu_print", (cmd_function)pv_xavu_print, 0, 0, 0, ANY_ROUTE}, {"pv_xavi_print", (cmd_function)pv_xavi_print, 0, 0, 0, ANY_ROUTE}, @@ -552,9 +552,9 @@ static cmd_export_t cmds[] = { {"not_empty", (cmd_function)pv_not_empty, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"xavp_copy", (cmd_function)w_xavp_copy, 3, - pv_xavp_copy_fixup, 0, ANY_ROUTE}, + pv_xavp_copy_fixup, fixup_free_fparam_all, ANY_ROUTE}, {"xavp_copy", (cmd_function)w_xavp_copy_dst, 4, - pv_xavp_copy_fixup, 0, ANY_ROUTE}, + pv_xavp_copy_fixup, fixup_free_fparam_all, ANY_ROUTE}, {"xavp_slist_explode", (cmd_function)w_xavp_slist_explode, 4, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"xavp_params_explode", (cmd_function)w_xavp_params_explode, 2,

2 days, 18 hours

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024