- sr-dev - kamailio.org

git:5.8:b21a7aaa: smsops: reformat module exports structures
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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 */

1 0

git:5.8:3f3c1940: db_mysql: right position for define KSR_MYSQL_OPT_RECONNECT
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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,

1 0

git:5.8:557d7e83: db_mysql: MYSQL_OPT_RECONNECT is deprecated by MySQL 8.0.34
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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…

1 0

git:5.8:c9edb30f: keepalive: reformat module exports structures
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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 */ /**

1 0

git:5.8:3f44cabc: corex: fix conditions for dns_cache modparam srv attributes
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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;

1 0

git:5.8:dbf9208f: core: resolve/create_srv_pref_list() - insert at correct position in list
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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++; } };

1 0

git:5.8:0e00ae1d: core: socket info - parse advertise ip part to get address family
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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; }

1 0

git:master:baa17755: crupto: replace local fixup functions with core helpers
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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 */

1 0

git:5.8:c48fbea9: gcrypt: docs - module name used for section ids
by Daniel-Constantin Mierla 01 Apr '24

01 Apr '24

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>

1 0

git:master:022da99c: gcrypt: replace local fixups with core helpers
by Daniel-Constantin Mierla 30 Mar '24

30 Mar '24

Module: kamailio Branch: master Commit: 022da99ca22efbf226d89234edb3f9883bd89bb2 URL: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-30T18:24:35+01:00 gcrypt: replace local fixups with core helpers --- Modified: src/modules/gcrypt/gcrypt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… Patch: https://github.com/kamailio/kamailio/commit/022da99ca22efbf226d89234edb3f98… --- diff --git a/src/modules/gcrypt/gcrypt_mod.c b/src/modules/gcrypt/gcrypt_mod.c index 69be4432535..c75e6b905b4 100644 --- a/src/modules/gcrypt/gcrypt_mod.c +++ b/src/modules/gcrypt/gcrypt_mod.c @@ -45,10 +45,8 @@ static void mod_destroy(void); static int w_gcrypt_aes_encrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_gcrypt_aes_encrypt(void **param, int param_no); static int w_gcrypt_aes_decrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -static int fixup_gcrypt_aes_decrypt(void **param, int param_no); /* init vector value */ static str _gcrypt_init_vector = str_init("SIP/2.0 is RFC3261"); @@ -59,9 +57,9 @@ static int _gcrypt_aes_mode = GCRY_CIPHER_MODE_ECB; /* clang-format off */ static cmd_export_t cmds[] = { {"gcrypt_aes_encrypt", (cmd_function)w_gcrypt_aes_encrypt, 3, - fixup_gcrypt_aes_encrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"gcrypt_aes_decrypt", (cmd_function)w_gcrypt_aes_decrypt, 3, - fixup_gcrypt_aes_decrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -260,28 +258,6 @@ static int w_gcrypt_aes_encrypt( return ki_gcrypt_aes_encrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_gcrypt_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; -} - /** * */ @@ -422,28 +398,6 @@ static int w_gcrypt_aes_decrypt( return ki_gcrypt_aes_decrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_gcrypt_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; -} - /** *

1 0

git:master:1c3ae81d: http_client: replaced local fixup with core helpers
by Daniel-Constantin Mierla 30 Mar '24

30 Mar '24

Module: kamailio Branch: master Commit: 1c3ae81d904db99de9398d49af1bf6c5f47a4d74 URL: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-29T23:08:07+01:00 http_client: replaced local fixup with core helpers --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c… Patch: https://github.com/kamailio/kamailio/commit/1c3ae81d904db99de9398d49af1bf6c…

1 0

git:master:2063993c: core: added fixup_spve1_pvar() helper
by Daniel-Constantin Mierla 29 Mar '24

29 Mar '24

Module: kamailio Branch: master Commit: 2063993c1ae54c07b39ea9deb8f735a47785c0ee URL: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-29T11:13:48+01:00 core: added fixup_spve1_pvar() helper - comments to spveX pvar fixup helpers --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… Patch: https://github.com/kamailio/kamailio/commit/2063993c1ae54c07b39ea9deb8f735a… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 0947f788461..bba3a469028 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -728,7 +728,9 @@ int fixup_free_spve_spve_igp(void **param, int param_no) } /** - * + * - first params are dynamic strings (spve) + * - n - how many params are spve; n+1 is name of pv + * - if pvmode==1, the last param pv has to be r/w */ int fixup_spve_n_pvar(void **param, int n, int param_no, int pvmode) { @@ -768,6 +770,15 @@ int fixup_spve_pvar(void **param, int param_no) return fixup_spve_n_pvar(param, 1, param_no, 0); } +/** + * - first params are dynamic strings + * - last param pv has to be r/w + */ +int fixup_spve1_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 1, param_no, 1); +} + /** * */ @@ -777,7 +788,8 @@ int fixup_free_spve_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve2_pvar(void **param, int param_no) { @@ -793,7 +805,8 @@ int fixup_free_spve2_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve3_pvar(void **param, int param_no) { @@ -809,7 +822,8 @@ int fixup_free_spve3_pvar(void **param, int param_no) } /** - * + * - first params are dynamic strings + * - last param pv has to be r/w */ int fixup_spve4_pvar(void **param, int param_no) { diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a202c4ade2b..d3f954fb1c2 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -147,6 +147,7 @@ int fixup_free_igp_all(void **param, int param_no); int fixup_spve_igp(void **param, int param_no); int fixup_free_spve_igp(void **param, int param_no); int fixup_spve_pvar(void **param, int param_no); +int fixup_spve1_pvar(void **param, int param_no); int fixup_free_spve_pvar(void **param, int param_no); int fixup_spve2_pvar(void **param, int param_no); int fixup_free_spve2_pvar(void **param, int param_no);

1 0

git:5.8:613e2cdf: file_out: FIx âforâ loop initial declarations error
by Xenofon Karamanos 28 Mar '24

28 Mar '24

Module: kamailio Branch: 5.8 Commit: 613e2cdfc3ae9242d259bf8b67b6ed715c0c0ad8 URL: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-28T16:05:48Z file_out: FIx ��for�� loop initial declarations error (cherry picked from commit ae04ccac92225a1e7b573a28ded555789e8604cd) --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… Patch: https://github.com/kamailio/kamailio/commit/613e2cdfc3ae9242d259bf8b67b6ed7… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 886f01f944f..a13d3531dde 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -100,6 +100,7 @@ struct module_exports exports = { static int mod_init(void) { + int i = 0; LM_DBG("initializing\n"); LM_DBG("base_folder = %.*s\n", fo_base_folder.len, fo_base_folder.s); @@ -121,7 +122,7 @@ static int mod_init(void) *fo_number_of_files = fo_count_assigned_files(); /* Fixup the prefix */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { str s; s.s = fo_files[i].fo_prefix.s; s.len = fo_files[i].fo_prefix.len; @@ -139,7 +140,7 @@ static int mod_init(void) } /* Initialize per process vars */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_files[i].fo_stored_timestamp = time(NULL); } @@ -156,6 +157,7 @@ static int mod_init(void) static int child_init(int rank) { int pid; + int i = 0; if(rank != PROC_MAIN) { return 0; } @@ -172,7 +174,7 @@ static int child_init(int rank) return -1; /* Initialize and open files */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_init_file(i); } @@ -194,7 +196,8 @@ static int child_init(int rank) static void destroy(void) { int result = 0; - for(int i = 0; i < *fo_number_of_files; i++) { + int i = 0; + for(i = 0; i < *fo_number_of_files; i++) { result = fo_file_properties_destroy(&fo_files[i]); if(result < 0) { LM_ERR("Failed to destroy file properties\n");

1 0

git:5.8:f4d44a92: tls: Fix âforâ loop initial declarations error
by Xenofon Karamanos 28 Mar '24

28 Mar '24

Module: kamailio Branch: 5.8 Commit: f4d44a9201a79acf0620a005008f2594ff8d26ee URL: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-28T16:05:14Z tls: Fix ��for�� loop initial declarations error (cherry picked from commit 9f2abc69e27c4b3246628138ec81fced81d7bc7a) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… Patch: https://github.com/kamailio/kamailio/commit/f4d44a9201a79acf0620a005008f259… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index b4a2afb7818..83b86d99d58 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -345,7 +345,8 @@ static tls_domains_cfg_t* tls_use_modparams(void) */ static void fork_child(void) { - for(int k = 0; k < 16; k++) { + int k = 0; + for(k = 0; k < 16; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); }

1 0

[kamailio/kamailio] sipdump.enable will not dump (Issue #3798)
by 53c70r 28 Mar '24

28 Mar '24

While testing I noticed a strange behavior. Usually when activated, `sipdump.enable 1` for the specific interface will dump needed logs and captures to `/tmp/`. After stopping the dump with `sipdump.enable 0` deleting all captures starting with `kamailio.*` under `/tmp/` and reactivating the dump with `sipdump.enable 1` without restarting kamailio, the service will not create new captures under `/tmp/`. This behavior was reproducible. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3798 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3798(a)github.com>

2 4

git:master:44a876a6: modules: readme files regenerated - smsops ... [skip ci]
by Kamailio Dev 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: 44a876a6a832b0d6baf4e6ee183576684b91f0af URL: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-28T08:46:17+01:00 modules: readme files regenerated - smsops ... [skip ci] --- Modified: src/modules/smsops/README --- Diff: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… Patch: https://github.com/kamailio/kamailio/commit/44a876a6a832b0d6baf4e6ee1835766… --- diff --git a/src/modules/smsops/README b/src/modules/smsops/README index 65e410de6ba..0dc5edbd605 100644 --- a/src/modules/smsops/README +++ b/src/modules/smsops/README @@ -33,6 +33,8 @@ Carsten Bock 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + List of Examples 1.1. isRPDATA() usage @@ -57,6 +59,8 @@ Chapter 1. Admin Guide 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + 1. Overview This module collects the Transformations for 3GPP-SMS. @@ -115,3 +119,12 @@ if (isRPDATA()) ... smsdump(); ... + +5. Variables + + Several variables are exported by the module to access the attributes + of the SMS. + * $smsack + $smsbody + $rpdata(key) + $tpdu(key)

1 0

git:master:e39557c9: blst: reformat exported structures
by Daniel-Constantin Mierla 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: e39557c96d2f419184c826d779f1a3309acc4269 URL: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-28T08:31:05+01:00 blst: reformat exported structures --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… Patch: https://github.com/kamailio/kamailio/commit/e39557c96d2f419184c826d779f1a33… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 6a2c1d625b6..148a9a9d9d0 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -49,37 +49,44 @@ static int blst_rpl_set_ignore_f(struct sip_msg *, char *, char *); static int blst_rpl_clear_ignore_f(struct sip_msg *, char *, char *); -static cmd_export_t cmds[] = {{"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, - {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, +/* clang-format off */ +static cmd_export_t cmds[] = { + {"blst_add", blst_add0_f, 0, 0, 0, ANY_ROUTE}, + {"blst_add", blst_add1_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, + {"blst_add_retry_after", blst_add_retry_after_f, 2, fixup_var_int_12, 0, ANY_ROUTE}, - {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, - {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_del", blst_del_f, 0, 0, 0, ANY_ROUTE}, + {"blst_is_blocklisted", blst_is_blocklisted_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_set_ignore", blst_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, + {"blst_clear_ignore", blst_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_clear_ignore", blst_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_set_ignore", blst_rpl_set_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, - {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 0, 0, 0, ANY_ROUTE}, + {"blst_rpl_clear_ignore", blst_rpl_clear_ignore_f, 1, fixup_var_int_1, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; /* no params */ struct module_exports exports = { - "blst", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, params, 0, /* RPC methods */ - 0, /* pseudo-variables exports */ - 0, /* response function */ - 0, /* module initialization function */ - 0, /* per-child init function */ - 0 /* destroy function */ + "blst", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, + params, + 0, /* RPC methods */ + 0, /* pseudo-variables exports */ + 0, /* response function */ + 0, /* module initialization function */ + 0, /* per-child init function */ + 0 /* destroy function */ }; +/* clang-format on */ /**

1 0

git:master:9a94930a: smsops: short reference section about variables
by Daniel-Constantin Mierla 28 Mar '24

28 Mar '24

Module: kamailio Branch: master Commit: 9a94930ae1168d5df79e3dc1414841cdf23a2eba URL: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-28T08:31:05+01:00 smsops: short reference section about variables --- Modified: src/modules/smsops/doc/smsops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… Patch: https://github.com/kamailio/kamailio/commit/9a94930ae1168d5df79e3dc1414841c… --- diff --git a/src/modules/smsops/doc/smsops_admin.xml b/src/modules/smsops/doc/smsops_admin.xml index fa19ebfc79c..da95e37c012 100644 --- a/src/modules/smsops/doc/smsops_admin.xml +++ b/src/modules/smsops/doc/smsops_admin.xml @@ -95,5 +95,19 @@ smsdump(); </section> </section> + <section> + <title>Variables</title> + <para>Several variables are exported by the module to access the + attributes of the SMS.</para> + <itemizedlist> + <listitem> + <para><emphasis>$smsack</emphasis></para> + <para><emphasis>$smsbody</emphasis></para> + <para><emphasis>$rpdata(key)</emphasis></para> + <para><emphasis>$tpdu(key)</emphasis></para> + </listitem> + </itemizedlist> + </section> + </chapter>

1 0

[kamailio/kamailio] Kamailio 5.7 TLS fail to compile (Issue #3796)
by iliesh 27 Mar '24

27 Mar '24

### Description Unable to upgrade Kamailio 5.7 on CentOS7 Error: ``` tls_mod.c: In function ‘fork_child’: tls_mod.c:348:2: error: ‘for’ loop initial declarations are only allowed in C99 mode for(int k = 0; k < 16; k++) { ^ tls_mod.c:348:2: note: use option -std=c99 or -std=gnu99 to compile your code make[2]: *** [tls_mod.o] Error 1 make[1]: *** [modules] Error 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` Current installed version: ``` version: kamailio 5.7.4 (x86_64/linux) 2e6e87 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3796 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3796(a)github.com>

3 3

[kamailio/kamailio] Fix 'for' loop initial declarations error (PR #3797)
by Xenofon Karamanos 27 Mar '24

27 Mar '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3796 (replace XXXX with an open issue number) #### Description  This PR fixes the compiles error regarding initial declarations in `for` loops You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3797 -- Commit Summary -- * tls: Fix ‘for’ loop initial declarations error * file_out: FIx ‘for’ loop initial declarations error -- File Changes -- M src/modules/file_out/file_out.c (11) M src/modules/tls/tls_mod.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3797.patch https://github.com/kamailio/kamailio/pull/3797.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3797 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3797(a)github.com>

1 1

git:master:ae04ccac: file_out: FIx âforâ loop initial declarations error
by Xenofon Karamanos 27 Mar '24

27 Mar '24

Module: kamailio Branch: master Commit: ae04ccac92225a1e7b573a28ded555789e8604cd URL: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-27T18:08:20+02:00 file_out: FIx ��for�� loop initial declarations error --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… Patch: https://github.com/kamailio/kamailio/commit/ae04ccac92225a1e7b573a28ded5557… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 886f01f944f..a13d3531dde 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -100,6 +100,7 @@ struct module_exports exports = { static int mod_init(void) { + int i = 0; LM_DBG("initializing\n"); LM_DBG("base_folder = %.*s\n", fo_base_folder.len, fo_base_folder.s); @@ -121,7 +122,7 @@ static int mod_init(void) *fo_number_of_files = fo_count_assigned_files(); /* Fixup the prefix */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { str s; s.s = fo_files[i].fo_prefix.s; s.len = fo_files[i].fo_prefix.len; @@ -139,7 +140,7 @@ static int mod_init(void) } /* Initialize per process vars */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_files[i].fo_stored_timestamp = time(NULL); } @@ -156,6 +157,7 @@ static int mod_init(void) static int child_init(int rank) { int pid; + int i = 0; if(rank != PROC_MAIN) { return 0; } @@ -172,7 +174,7 @@ static int child_init(int rank) return -1; /* Initialize and open files */ - for(int i = 0; i < *fo_number_of_files; i++) { + for(i = 0; i < *fo_number_of_files; i++) { fo_init_file(i); } @@ -194,7 +196,8 @@ static int child_init(int rank) static void destroy(void) { int result = 0; - for(int i = 0; i < *fo_number_of_files; i++) { + int i = 0; + for(i = 0; i < *fo_number_of_files; i++) { result = fo_file_properties_destroy(&fo_files[i]); if(result < 0) { LM_ERR("Failed to destroy file properties\n");

1 0

git:master:9f2abc69: tls: Fix âforâ loop initial declarations error
by Xenofon Karamanos 27 Mar '24

27 Mar '24

Module: kamailio Branch: master Commit: 9f2abc69e27c4b3246628138ec81fced81d7bc7a URL: https://github.com/kamailio/kamailio/commit/9f2abc69e27c4b3246628138ec81fce… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-27T18:08:20+02:00 tls: Fix ��for�� loop initial declarations error --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9f2abc69e27c4b3246628138ec81fce… Patch: https://github.com/kamailio/kamailio/commit/9f2abc69e27c4b3246628138ec81fce… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index b4a2afb7818..83b86d99d58 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -345,7 +345,8 @@ static tls_domains_cfg_t* tls_use_modparams(void) */ static void fork_child(void) { - for(int k = 0; k < 16; k++) { + int k = 0; + for(k = 0; k < 16; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); }

1 0

[kamailio/kamailio] topos module breaks UPDATE (Issue #3437)
by Guybrush T. 27 Mar '24

27 Mar '24

### Description Kamailio v5.5.6 with topos module and postgres DB. UAC (A) -> Kamailio Registrar (B) -> Kamailio PSTN GW (C) -> PSTN (D) Call goes from A to D, PSTN sends UPDATE, UPDATE is routed from C to A instead to B and then to A. #### Reproduction Caller calls callee and receives an UPDATE from callee. In my case it was when the call was routed to voicemail. #### Log Messages ``` Kamailio takes the wrong route in UPDATE (upstream) case. May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: topos [tps_msg.c:882]: tps_request_received(): r-uri updated to: [sip:1234@<UAC-IP>;uniq=B0EB9A84A278626DA07219E2AE01C] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: topos [tps_msg.c:187]: tps_add_headers(): adding to headers(0) - [Route: sip:<<KamailioPSTNgwIP>>;lr=on;ftag=9945501E2B94B883;did=1fc.42f;nat=yes#015#012] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: topos [tps_msg.c:187]: tps_add_headers(): adding to headers(0) - [P-SR-XUID: atpsh-64527b0a-40362-1#015#012] The right one would be the x_rr (a_rr), but it takes only the s_rr: May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:234]: db_postgres_convert_rows(): PQgetvalue(0x7fcb4893db50,0,7)=[sip:<KamailioRegistrarIP>;lr=on;ftag=9945501E2B94B883;did=1fc.7b92] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:242]: db_postgres_convert_rows(): [0][7] Column[x_rr]=[sip:<KamailioRegistrarIP>;lr=on;ftag=9945501E2B94B883;did=1fc.7b92] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:234]: db_postgres_convert_rows(): PQgetvalue(0x7fcb4893db50,0,8)=[sip:<PSTNgw>:5060;transport=udp;lr;Hpt=8ef8_116;CxtId=3;TRC=ffffffff-ffffffff;X-HwB2bUaCookie=18614] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:242]: db_postgres_convert_rows(): [0][8] Column[y_rr]=[sip:<PSTNgw>:5060;transport=udp;lr;Hpt=8ef8_116;CxtId=3;TRC=ffffffff-ffffffff;X-HwB2bUaCookie=18614] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:234]: db_postgres_convert_rows(): PQgetvalue(0x7fcb4893db50,0,9)=[sip:<<KamailioPSTNgwIP>>;lr=on;ftag=9945501E2B94B883;did=1fc.42f;nat=yes] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263013]: DEBUG: db_postgres [km_res.c:242]: db_postgres_convert_rows(): [0][9] Column[s_rr]=[sip:<<KamailioPSTNgwIP>>;lr=on;ftag=9945501E2B94B883;did=1fc.42f;nat=yes] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263019]: DEBUG: db_postgres [km_res.c:242]: db_postgres_convert_rows(): [0][10] Column[a_rr]=[sip:<KamailioRegistrarIP>;lr=on;ftag=9945501E2B94B883;did=1fc.7b92] May 3 15:23:12 sipproxy /usr/sbin/kamailio[263019]: DEBUG: db_postgres [km_res.c:234]: db_postgres_convert_rows(): PQgetvalue(0x7fcb4893dbd8,0,11)=[] ``` ### Possible Solutions Respect Route headers for UPDATE messages. ### Additional Information Current running kamailio 5.5.6 but tried also latest 5.6.4 with same behavior. ``` version: kamailio 5.5.6 (x86_64/linux) 72dbb0 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 72dbb0 compiled on 05:48:21 Apr 27 2023 with gcc 11.3.0 ``` * **Operating System**: ``` Distributor ID: Ubuntu Description: Ubuntu 22.04.2 LTS Release: 22.04 Codename: jammy Linux sipproxy 5.15.0-70-generic #77-Ubuntu SMP Tue Mar 21 14:02:37 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux ``` Possibly related bug: https://github.com/kamailio/kamailio/issues/3090 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3437 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3437(a)github.com>

4 10

git:master:4137a8c6: pkg/kamailio: packaged pvtpl module into RPM
by Sergey Safarov 27 Mar '24

27 Mar '24

Module: kamailio Branch: master Commit: 4137a8c63a03a316a0fa0f37d518a09e68273309 URL: https://github.com/kamailio/kamailio/commit/4137a8c63a03a316a0fa0f37d518a09… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-03-27T09:57:29+02:00 pkg/kamailio: packaged pvtpl module into RPM --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/4137a8c63a03a316a0fa0f37d518a09… Patch: https://github.com/kamailio/kamailio/commit/4137a8c63a03a316a0fa0f37d518a09… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8bbe77b63dd..6d79bb8ec9f 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1585,6 +1585,7 @@ fi %doc %{_docdir}/kamailio/modules/README.print_lib %doc %{_docdir}/kamailio/modules/README.pv %doc %{_docdir}/kamailio/modules/README.pv_headers +%doc %{_docdir}/kamailio/modules/README.pvtpl %doc %{_docdir}/kamailio/modules/README.pua_rpc %doc %{_docdir}/kamailio/modules/README.qos %doc %{_docdir}/kamailio/modules/README.ratelimit @@ -1750,6 +1751,7 @@ fi %{_libdir}/kamailio/modules/pua_rpc.so %{_libdir}/kamailio/modules/pv.so %{_libdir}/kamailio/modules/pv_headers.so +%{_libdir}/kamailio/modules/pvtpl.so %{_libdir}/kamailio/modules/qos.so %{_libdir}/kamailio/modules/ratelimit.so %{_libdir}/kamailio/modules/registrar.so

1 0

git:master:9848d43c: smsops: reformat module exports structures
by Daniel-Constantin Mierla 26 Mar '24

26 Mar '24

Module: kamailio Branch: master Commit: 9848d43cb367d6901a0b8c727759feb8a8fad930 URL: https://github.com/kamailio/kamailio/commit/9848d43cb367d6901a0b8c727759feb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-26T19:17:23+01:00 smsops: reformat module exports structures --- Modified: src/modules/smsops/smsops.c --- Diff: https://github.com/kamailio/kamailio/commit/9848d43cb367d6901a0b8c727759feb… Patch: https://github.com/kamailio/kamailio/commit/9848d43cb367d6901a0b8c727759feb… --- 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 */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev