sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
249 discussions

git:5.8:b21a7aaa: smsops: reformat module exports structures

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: b21a7aaa467f2b76a52308557657c65274e34087 URL: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:55+02:00 smsops: reformat module exports structures (cherry picked from commit 9848d43cb367d6901a0b8c727759feb8a8fad930) --- Modified: src/modules/smsops/smsops.c --- Diff: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… Patch: https://github.com/kamailio/kamailio/commit/b21a7aaa467f2b76a52308557657c65… --- diff --git a/src/modules/smsops/smsops.c b/src/modules/smsops/smsops.c index 3e2cb88bc58..d8354af2319 100644 --- a/src/modules/smsops/smsops.c +++ b/src/modules/smsops/smsops.c @@ -30,31 +30,36 @@ MODULE_VERSION -static pv_export_t mod_pvs[] = {{{"smsack", sizeof("smsack") - 1}, PVT_OTHER, - pv_sms_ack, 0, 0, 0, 0, 0}, - {{"rpdata", sizeof("rpdata") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, - pv_parse_rpdata_name, 0, 0, 0}, - {{"tpdu", sizeof("tpdu") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, +/* clang-format off */ +static pv_export_t mod_pvs[] = { + {{"smsack", sizeof("smsack") - 1}, PVT_OTHER, pv_sms_ack, 0, 0, 0, 0, 0}, + {{"rpdata", sizeof("rpdata") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, + pv_parse_rpdata_name, 0, 0, 0}, + {{"tpdu", sizeof("tpdu") - 1}, PVT_OTHER, pv_get_sms, pv_set_sms, pv_parse_tpdu_name, 0, 0, 0}, - {{"smsbody", sizeof("smsbody") - 1}, PVT_OTHER, pv_sms_body, 0, 0, 0, 0, - 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"smsbody", sizeof("smsbody") - 1}, PVT_OTHER, pv_sms_body, 0, 0, 0, 0, 0}, + + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static cmd_export_t cmds[] = { - {"smsdump", (cmd_function)smsdump, 0, 0, 0, REQUEST_ROUTE}, - {"isRPDATA", (cmd_function)isRPDATA, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"smsdump", (cmd_function)smsdump, 0, 0, 0, REQUEST_ROUTE}, + {"isRPDATA", (cmd_function)isRPDATA, 0, 0, 0, REQUEST_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "smsops", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - 0, /* exported parameters */ - 0, /* exported rpc functions */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function*/ - 0, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "smsops", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + 0, /* exported parameters */ + 0, /* exported rpc functions */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function*/ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */

5 months, 1 week

git:5.8:3f3c1940: db_mysql: right position for define KSR_MYSQL_OPT_RECONNECT

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 3f3c1940788a4713705169f8d96ae9a13ee2bad1 URL: https://github.com/kamailio/kamailio/commit/3f3c1940788a4713705169f8d96ae9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:44+02:00 db_mysql: right position for define KSR_MYSQL_OPT_RECONNECT - follow up of previous commit (cherry picked from commit 14dc277e29a170b9ac51e7dda07fa25cbd9be048) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/3f3c1940788a4713705169f8d96ae9a… Patch: https://github.com/kamailio/kamailio/commit/3f3c1940788a4713705169f8d96ae9a… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 49f7f7e1f7e..4c756db66ff 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -48,10 +48,10 @@ extern char *db_mysql_opt_ssl_ca; #define KSR_MYSQL_OPT_RECONNECT #else #if MYSQL_VERSION_ID < 80034 -#endif #define KSR_MYSQL_OPT_RECONNECT #endif #endif +#endif /*! \brief * Create a new connection structure,

5 months, 1 week

git:5.8:557d7e83: db_mysql: MYSQL_OPT_RECONNECT is deprecated by MySQL 8.0.34

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 557d7e83c01c930df608b9d96791553d8f2bf724 URL: https://github.com/kamailio/kamailio/commit/557d7e83c01c930df608b9d96791553… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:34+02:00 db_mysql: MYSQL_OPT_RECONNECT is deprecated by MySQL 8.0.34 - https://dev.mysql.com/doc/c-api/8.0/en/c-api-auto-reconnect.html - MariaDB seems to still have it (cherry picked from commit da3d6e9a74b63fdb7b1c4063d6be017f1ce42bea) --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/557d7e83c01c930df608b9d96791553… Patch: https://github.com/kamailio/kamailio/commit/557d7e83c01c930df608b9d96791553…

5 months, 1 week

git:5.8:c9edb30f: keepalive: reformat module exports structures

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: c9edb30ffa0c9544a10d0e72aabe84a1b3b2a103 URL: https://github.com/kamailio/kamailio/commit/c9edb30ffa0c9544a10d0e72aabe84a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:25+02:00 keepalive: reformat module exports structures (cherry picked from commit dd221a6e5162838b979fd38ffdfb750663aef869) --- Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c9edb30ffa0c9544a10d0e72aabe84a… Patch: https://github.com/kamailio/kamailio/commit/c9edb30ffa0c9544a10d0e72aabe84a… --- diff --git a/src/modules/keepalive/keepalive_mod.c b/src/modules/keepalive/keepalive_mod.c index 6b49603c303..4757b4346d5 100644 --- a/src/modules/keepalive/keepalive_mod.c +++ b/src/modules/keepalive/keepalive_mod.c @@ -70,39 +70,45 @@ str ka_ping_from = str_init("sip:keepalive@kamailio.org"); int ka_counter_del = 5; -static cmd_export_t cmds[] = {{"ka_is_alive", (cmd_function)w_cmd_is_alive, 1, - fixup_spve_null, 0, ANY_ROUTE}, - // internal API - {"ka_add_destination", (cmd_function)w_add_destination, 2, - fixup_add_destination, 0, - REQUEST_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, - {"ka_del_destination", (cmd_function)w_del_destination, 2, - fixup_add_destination, 0, ANY_ROUTE}, - {"bind_keepalive", (cmd_function)bind_keepalive, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"ka_is_alive", (cmd_function)w_cmd_is_alive, 1, + fixup_spve_null, 0, ANY_ROUTE}, + // internal API + {"ka_add_destination", (cmd_function)w_add_destination, 2, + fixup_add_destination, 0, REQUEST_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, + {"ka_del_destination", (cmd_function)w_del_destination, 2, + fixup_add_destination, 0, ANY_ROUTE}, + {"bind_keepalive", (cmd_function)bind_keepalive, 0, 0, 0, 0}, + + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"ping_interval", PARAM_INT, &ka_ping_interval}, - {"destination", PARAM_STRING | USE_FUNC_PARAM, - (void *)ka_mod_add_destination}, - {"ping_from", PARAM_STR, &ka_ping_from}, - {"delete_counter", PARAM_INT, &ka_counter_del}, {0, 0, 0}}; + {"ping_interval", PARAM_INT, &ka_ping_interval}, + {"destination", PARAM_STRING | USE_FUNC_PARAM, + (void *)ka_mod_add_destination}, + {"ping_from", PARAM_STR, &ka_ping_from}, + {"delete_counter", PARAM_INT, &ka_counter_del}, + {0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "keepalive", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "keepalive", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

5 months, 1 week

git:5.8:3f44cabc: corex: fix conditions for dns_cache modparam srv attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 3f44cabcfc0abc83ae1971ac74fbb0bd36829ce4 URL: https://github.com/kamailio/kamailio/commit/3f44cabcfc0abc83ae1971ac74fbb0b… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:07:14+02:00 corex: fix conditions for dns_cache modparam srv attributes (cherry picked from commit 8114b2016d032484edafe4edd04fb02d52cfd058) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3f44cabcfc0abc83ae1971ac74fbb0b… Patch: https://github.com/kamailio/kamailio/commit/3f44cabcfc0abc83ae1971ac74fbb0b… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index ed37b22c757..4152fbf5df4 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -454,7 +454,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 8 && strncasecmp(pit->name.s, "priority", 8) == 0) { - if(dns_flags == 0) { + if(dns_priority == 0) { if(str2sint(&pit->body, &dns_priority) < 0) { LM_ERR("invalid priority: %.*s\n", pit->body.len, pit->body.s); @@ -463,7 +463,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "weight", 6) == 0) { - if(dns_flags == 0) { + if(dns_weight == 0) { if(str2sint(&pit->body, &dns_weight) < 0) { LM_ERR("invalid weight: %.*s\n", pit->body.len, pit->body.s); @@ -472,7 +472,7 @@ static int corex_dns_cache_param_add(str *pval) } } else if(pit->name.len == 4 && strncasecmp(pit->name.s, "port", 4) == 0) { - if(dns_flags == 0) { + if(dns_port == 0) { if(str2sint(&pit->body, &dns_port) < 0) { LM_ERR("invalid port: %.*s\n", pit->body.len, pit->body.s); return -1;

5 months, 1 week

git:5.8:dbf9208f: core: resolve/create_srv_pref_list() - insert at correct position in list

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: dbf9208f3a402844c9981fb7ed09493a1338dfdd URL: https://github.com/kamailio/kamailio/commit/dbf9208f3a402844c9981fb7ed09493… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:06:56+02:00 core: resolve/create_srv_pref_list() - insert at correct position in list (cherry picked from commit f35cf8904119dcf582ea2451648de5fef095466b) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/dbf9208f3a402844c9981fb7ed09493… Patch: https://github.com/kamailio/kamailio/commit/dbf9208f3a402844c9981fb7ed09493… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index b6ee8592697..6d581f4915f 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1526,8 +1526,8 @@ size_t create_srv_pref_list(char *proto, struct dns_srv_proto *list) if(naptr_proto_supported(i) == 0) { continue; } else { - list[i - 1].proto_pref = tmp.proto_pref; - list[i - 1].proto = i; + list[list_len].proto_pref = tmp.proto_pref; + list[list_len].proto = i; list_len++; } };

5 months, 1 week

git:5.8:0e00ae1d: core: socket info - parse advertise ip part to get address family

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 0e00ae1db0242fc01e6f8c332e3920fd9465b3f9 URL: https://github.com/kamailio/kamailio/commit/0e00ae1db0242fc01e6f8c332e3920f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:06:21+02:00 core: socket info - parse advertise ip part to get address family (cherry picked from commit 5f901c3557f9f875545d82a7ab00f6d0c5c1fe52) --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/0e00ae1db0242fc01e6f8c332e3920f… Patch: https://github.com/kamailio/kamailio/commit/0e00ae1db0242fc01e6f8c332e3920f… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index e048e0e2c4b..ab59df73dd6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -338,6 +338,11 @@ static inline struct socket_info *new_sock_info(char *name, p = si->useinfo.name.s + 1; si->useinfo.af = AF_INET6; } else { + ip_addr_t *ipv = NULL; + ipv = str2ipx(&si->useinfo.name); + if(ipv != NULL) { + si->useinfo.af = ipv->af; + } si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s; }

5 months, 1 week

git:master:baa17755: crupto: replace local fixup functions with core helpers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: baa177556514cd7cdb794740a1bfd6e47ea814d1 URL: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T07:56:26+02:00 crupto: replace local fixup functions with core helpers --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… Patch: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index b3fba9c005a..f3e644000f9 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -58,10 +58,8 @@ static void mod_destroy(void); static int w_crypto_aes_encrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_crypto_aes_encrypt(void **param, int param_no); static int w_crypto_aes_decrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_crypto_aes_decrypt(void **param, int param_no); static int w_crypto_nio_in(sip_msg_t *msg, char *p1, char *p2); static int w_crypto_nio_out(sip_msg_t *msg, char *p1, char *p2); @@ -86,9 +84,9 @@ str _crypto_netio_key = STR_NULL; static cmd_export_t cmds[] = { {"crypto_aes_encrypt", (cmd_function)w_crypto_aes_encrypt, 3, - fixup_crypto_aes_encrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"crypto_aes_decrypt", (cmd_function)w_crypto_aes_decrypt, 3, - fixup_crypto_aes_decrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"crypto_netio_in", (cmd_function)w_crypto_nio_in, 0, 0, 0, ANY_ROUTE}, {"crypto_netio_out", (cmd_function)w_crypto_nio_out, 0, 0, 0, ANY_ROUTE}, @@ -345,28 +343,6 @@ static int w_crypto_aes_encrypt( return ki_crypto_aes_encrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_crypto_aes_encrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - /** * */ @@ -590,29 +566,6 @@ static int w_crypto_aes_decrypt( return ki_crypto_aes_decrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_crypto_aes_decrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - - /** * testing function */

5 months, 1 week

git:5.8:c48fbea9: gcrypt: docs - module name used for section ids

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: c48fbea981c7b0bd281cd1fc2abedcda41d92c13 URL: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:05:20+02:00 gcrypt: docs - module name used for section ids (cherry picked from commit 68c69966c38b56775a3966d07c33ff94c2a8ba95) --- Modified: src/modules/gcrypt/doc/gcrypt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… Patch: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… --- diff --git a/src/modules/gcrypt/doc/gcrypt_admin.xml b/src/modules/gcrypt/doc/gcrypt_admin.xml index 533ec5c80f9..3fc03d3eabc 100644 --- a/src/modules/gcrypt/doc/gcrypt_admin.xml +++ b/src/modules/gcrypt/doc/gcrypt_admin.xml @@ -127,7 +127,7 @@ modparam("gcrypt", "register_callid", 1) <section> <title>Functions</title> - <section id="async.f.gcrypt_aes_encrypt"> + <section id="gcrypt.f.gcrypt_aes_encrypt"> <title> <function moreinfo="none">gcrypt_aes_encrypt(text, key, res)</function> </title> @@ -150,7 +150,7 @@ gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); </example> </section> - <section id="async.f.gcrypt_aes_decrypt"> + <section id="gcrypt.f.gcrypt_aes_decrypt"> <title> <function moreinfo="none">gcrypt_aes_decrypt(text, key, res)</function> </title>

5 months, 1 week

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024