- sr-dev - kamailio.org

git:master:6a81d90c: kafka: export statistics for total/err messages
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 6a81d90c8c0ec0ca7a3c1823c53efb51b0556ed0 URL: https://github.com/kamailio/kamailio/commit/6a81d90c8c0ec0ca7a3c1823c53efb5… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: export statistics for total/err messages --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/6a81d90c8c0ec0ca7a3c1823c53efb5… Patch: https://github.com/kamailio/kamailio/commit/6a81d90c8c0ec0ca7a3c1823c53efb5… --- diff --git a/src/modules/kafka/kafka_mod.c b/src/modules/kafka/kafka_mod.c index 43504c7b7cc..108ff3c126b 100644 --- a/src/modules/kafka/kafka_mod.c +++ b/src/modules/kafka/kafka_mod.c @@ -45,6 +45,7 @@ #include "../../core/kemi.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/counters.h" #include "kfk.h" @@ -64,6 +65,8 @@ static int w_kafka_send_key( /* * Variables and functions to deal with module parameters. */ +stat_var *total_messages; +stat_var *total_messages_err; int child_init_ok = 0; int init_without_kafka = 0; int log_without_overflow = 0; @@ -105,6 +108,10 @@ struct module_exports exports = { mod_destroy /* destroy function */ }; +/*! \brief We expose internal variables via the statistic framework below.*/ +stat_export_t mod_stats[] = {{"total_messages", 0, &total_messages}, + {"total_messages_err", 0, &total_messages_err}, {0, 0, 0}}; + static int mod_init(void) { /* Register RPC commands. */ @@ -119,6 +126,14 @@ static int mod_init(void) return -1; } +#ifdef STATISTICS + /* register statistics */ + if(register_module_stats("kafka", mod_stats) != 0) { + LM_ERR("Failed to register core statistics\n"); + return -1; + } +#endif + return 0; } diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index ed406385e5e..eb9b166d28c 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -35,7 +35,10 @@ #include "../../core/mem/pkg.h" #include "../../core/mem/shm_mem.h" #include "../../core/locking.h" +#include "../../core/counters.h" +extern stat_var *total_messages; +extern stat_var *total_messages_err; extern int child_init_ok; extern int init_without_kafka; extern int log_without_overflow; @@ -1045,9 +1048,11 @@ static int kfk_stats_add(const char *topic, rd_kafka_resp_err_t err) lock_get(stats_lock); stats_general->total++; + update_stat(total_messages, 1); if(err) { stats_general->error++; + update_stat(total_messages_err, 1); } LM_DBG("General stats: total = %" PRIu64 " error = %" PRIu64 "\n",

1 0

git:master:d104324e: kafka: add modparam metadata_timeout
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: d104324ec86190d8ce0886f11fea9b131f46a877 URL: https://github.com/kamailio/kamailio/commit/d104324ec86190d8ce0886f11fea9b1… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: add modparam metadata_timeout --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/d104324ec86190d8ce0886f11fea9b1… Patch: https://github.com/kamailio/kamailio/commit/d104324ec86190d8ce0886f11fea9b1… --- diff --git a/src/modules/kafka/kafka_mod.c b/src/modules/kafka/kafka_mod.c index 89f3fcd3c42..43504c7b7cc 100644 --- a/src/modules/kafka/kafka_mod.c +++ b/src/modules/kafka/kafka_mod.c @@ -67,6 +67,7 @@ static int w_kafka_send_key( int child_init_ok = 0; int init_without_kafka = 0; int log_without_overflow = 0; +int metadata_timeout = 2000; char *brokers_param = NULL; /**< List of brokers. */ static int kafka_conf_param(modparam_t type, void *val); static int kafka_topic_param(modparam_t type, void *val); @@ -88,7 +89,8 @@ static param_export_t params[] = {{"brokers", PARAM_STRING, &brokers_param}, (void *)kafka_conf_param}, {"topic", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_topic_param}, {"init_without_kafka", PARAM_INT, &init_without_kafka}, - {"log_without_overflow", PARAM_INT, &log_without_overflow}, {0, 0, 0}}; + {"log_without_overflow", PARAM_INT, &log_without_overflow}, + {"metadata_timeout", PARAM_INT, &metadata_timeout}, {0, 0, 0}}; /** * \brief Kafka :: Module interface diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index 68014b8b4fb..ed406385e5e 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -39,6 +39,7 @@ extern int child_init_ok; extern int init_without_kafka; extern int log_without_overflow; +extern int metadata_timeout; /** * \brief data type for a configuration property. @@ -730,11 +731,6 @@ static int kfk_topic_list_configure() return 0; } -/* -1 means RD_POLL_INFINITE */ -/* 100000 means 100 seconds */ -#define METADATA_TIMEOUT \ - 100000 /**< Timeout when asking for metadata in milliseconds. */ - /** * \brief check that a topic exists in cluster. * @@ -756,7 +752,7 @@ static int kfk_topic_exist(str *topic_name) /* Get metadata for all topics. */ rd_kafka_resp_err_t res; - res = rd_kafka_metadata(rk, 1, NULL, &metadatap, METADATA_TIMEOUT); + res = rd_kafka_metadata(rk, 1, NULL, &metadatap, metadata_timeout); if(res != RD_KAFKA_RESP_ERR_NO_ERROR) { LM_ERR("Failed to get metadata: %s\n", rd_kafka_err2str(res)); goto error;

1 0

git:master:a544b14e: kafka: add modparam log_without_overflow
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: a544b14e0bdc331820a505517a52477879734e7c URL: https://github.com/kamailio/kamailio/commit/a544b14e0bdc331820a505517a52477… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: add modparam log_without_overflow --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/a544b14e0bdc331820a505517a52477… Patch: https://github.com/kamailio/kamailio/commit/a544b14e0bdc331820a505517a52477… --- diff --git a/src/modules/kafka/kafka_mod.c b/src/modules/kafka/kafka_mod.c index e88bd37384b..89f3fcd3c42 100644 --- a/src/modules/kafka/kafka_mod.c +++ b/src/modules/kafka/kafka_mod.c @@ -66,6 +66,7 @@ static int w_kafka_send_key( */ int child_init_ok = 0; int init_without_kafka = 0; +int log_without_overflow = 0; char *brokers_param = NULL; /**< List of brokers. */ static int kafka_conf_param(modparam_t type, void *val); static int kafka_topic_param(modparam_t type, void *val); @@ -86,7 +87,8 @@ static param_export_t params[] = {{"brokers", PARAM_STRING, &brokers_param}, {"configuration", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_conf_param}, {"topic", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_topic_param}, - {"init_without_kafka", PARAM_INT, &init_without_kafka}, {0, 0, 0}}; + {"init_without_kafka", PARAM_INT, &init_without_kafka}, + {"log_without_overflow", PARAM_INT, &log_without_overflow}, {0, 0, 0}}; /** * \brief Kafka :: Module interface diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index 76a5fea75d9..68014b8b4fb 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -38,6 +38,7 @@ extern int child_init_ok; extern int init_without_kafka; +extern int log_without_overflow; /** * \brief data type for a configuration property. @@ -124,6 +125,12 @@ static void kfk_logger( const rd_kafka_t *rk, int level, const char *fac, const char *buf) { + if(log_without_overflow && strstr(buf, "Connection refused") != NULL) { + // libkafka will keep retrying to connect if kafka server is down + // FIX: ignore these types of errors not to get overflowed + return; + } + switch(level) { case LOG_EMERG: LM_NPRL("RDKAFKA fac: %s : %s : %s\n", fac, @@ -190,8 +197,14 @@ static void kfk_msg_delivered( kfk_stats_add(topic_name, rkmessage->err); if(rkmessage->err) { - LM_ERR("RDKAFKA Message delivery failed: %s\n", - rd_kafka_err2str(rkmessage->err)); + if(log_without_overflow) { + // libkafka will log all undelivered msgs as ERR + // FIX: ignore these types of errors not to get overflowed; check stats instead + ; + } else { + LM_ERR("RDKAFKA Message delivery failed: %s\n", + rd_kafka_err2str(rkmessage->err)); + } } else { LM_DBG("RDKAFKA Message delivered (%zd bytes, offset %" PRId64 ", " "partition %" PRId32 "): %.*s\n", @@ -865,7 +878,11 @@ int kfk_message_send(str *topic_name, str *message, str *key) NULL) == -1) { rd_kafka_resp_err_t err = rd_kafka_last_error(); - LM_ERR("Error sending message: %s\n", rd_kafka_err2str(err)); + if(!log_without_overflow) { + LM_ERR("Error sending message: %s\n", rd_kafka_err2str(err)); + } else { + return 0; + } return -1; }

1 0

git:master:741bb148: kafka: add modparam init_without_kafka
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 741bb148ddf4311679cfa6e379fa8bdbc8fac5e5 URL: https://github.com/kamailio/kamailio/commit/741bb148ddf4311679cfa6e379fa8bd… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: add modparam init_without_kafka --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/741bb148ddf4311679cfa6e379fa8bd… Patch: https://github.com/kamailio/kamailio/commit/741bb148ddf4311679cfa6e379fa8bd… --- diff --git a/src/modules/kafka/kafka_mod.c b/src/modules/kafka/kafka_mod.c index 26369d6ca31..e88bd37384b 100644 --- a/src/modules/kafka/kafka_mod.c +++ b/src/modules/kafka/kafka_mod.c @@ -64,6 +64,8 @@ static int w_kafka_send_key( /* * Variables and functions to deal with module parameters. */ +int child_init_ok = 0; +int init_without_kafka = 0; char *brokers_param = NULL; /**< List of brokers. */ static int kafka_conf_param(modparam_t type, void *val); static int kafka_topic_param(modparam_t type, void *val); @@ -84,7 +86,7 @@ static param_export_t params[] = {{"brokers", PARAM_STRING, &brokers_param}, {"configuration", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_conf_param}, {"topic", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_topic_param}, - {0, 0, 0}}; + {"init_without_kafka", PARAM_INT, &init_without_kafka}, {0, 0, 0}}; /** * \brief Kafka :: Module interface @@ -125,9 +127,15 @@ static int child_init(int rank) if(rank == PROC_INIT || rank == PROC_TCP_MAIN) return 0; + child_init_ok = 1; if(kfk_init(brokers_param)) { - LM_ERR("Failed to initialize Kafka\n"); - return -1; + child_init_ok = 0; + if(init_without_kafka) { + LM_ERR("Failed to initialize Kafka - continue\n"); + } else { + LM_ERR("Failed to initialize Kafka\n"); + return -1; + } } return 0; } diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index c6dc8398da2..76a5fea75d9 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -36,6 +36,9 @@ #include "../../core/mem/shm_mem.h" #include "../../core/locking.h" +extern int child_init_ok; +extern int init_without_kafka; + /** * \brief data type for a configuration property. */ @@ -587,7 +590,9 @@ static int kfk_topic_configure(kfk_topic_t *ktopic) } int topic_found = kfk_topic_exist(ktopic->topic_name); - if(topic_found == -1) { + if(init_without_kafka) { + ; + } else if(topic_found == -1) { LM_ERR("Failed to search for topic %.*s in cluster\n", ktopic->topic_name->len, ktopic->topic_name->s); goto error; @@ -828,6 +833,12 @@ int kfk_message_send(str *topic_name, str *message, str *key) /* Get topic from name. */ rd_kafka_topic_t *rkt = kfk_topic_get(topic_name); + if(!child_init_ok) { + LM_ERR("kafka module is unusable: child init NOT ok! Skip sending " + "message, message lost!"); + return -1; + } + if(!rkt) { LM_ERR("Topic not found: %.*s\n", topic_name->len, topic_name->s); return -1;

1 0

[kamailio/kamailio] topos_redis : show redis error for post mortem analysis (PR #3965)
by ThomasSevestre 18 Sep '24

18 Sep '24

#### 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) - [ ] 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 Small log improvement, in order to make easier to find the origin of redis errors. Log sample : ``` WARNING: topos_redis [topos_redis_storage.c:834]: tps_redis_load_branch(): invalid redis result type: 6 WARNING: topos [tps_storage.c:626]: tps_storage_record(): no local address - do record routing for all initial requests ERROR: topos [tps_storage.c:637]: tps_storage_record(): failed to store ``` The root cause is probaly in redis error message and it whould be nice to log it You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3965 -- Commit Summary -- * topos_redis : show redis error for post mortem analysis -- File Changes -- M src/modules/topos_redis/topos_redis_storage.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3965.patch https://github.com/kamailio/kamailio/pull/3965.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3965 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3965(a)github.com>

2 3

git:master:72889e94: topos_redis : show redis error for post mortem analysis
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 72889e945041b6475a43c371aa4e20e99f5d1240 URL: https://github.com/kamailio/kamailio/commit/72889e945041b6475a43c371aa4e20e… Author: Thomas <1258170+ThomasSevestre(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T09:57:55+02:00 topos_redis : show redis error for post mortem analysis --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/72889e945041b6475a43c371aa4e20e… Patch: https://github.com/kamailio/kamailio/commit/72889e945041b6475a43c371aa4e20e… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 8009d8a006d..dd4ce1b7674 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -677,6 +677,9 @@ int tps_redis_load_initial_method_branch( if(rrpl->type != REDIS_REPLY_ARRAY) { LM_WARN("invalid redis result type: %d\n", rrpl->type); + if(rrpl->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%s\n", rrpl->str); + } freeReplyObject(rrpl); return -1; } @@ -832,6 +835,9 @@ int tps_redis_load_branch( if(rrpl->type != REDIS_REPLY_ARRAY) { LM_WARN("invalid redis result type: %d\n", rrpl->type); + if(rrpl->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%s\n", rrpl->str); + } freeReplyObject(rrpl); return -1; } @@ -1037,6 +1043,9 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if(rrpl->type != REDIS_REPLY_ARRAY) { LM_WARN("invalid redis result type: %d\n", rrpl->type); + if(rrpl->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%s\n", rrpl->str); + } freeReplyObject(rrpl); return -1; }

1 0

git:master:abaf42a7: core: use advertise port only when set for via header
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: abaf42a735b00af8cbfec90888d2ef3397e5040d URL: https://github.com/kamailio/kamailio/commit/abaf42a735b00af8cbfec90888d2ef3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T09:52:32+02:00 core: use advertise port only when set for via header --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/abaf42a735b00af8cbfec90888d2ef3… Patch: https://github.com/kamailio/kamailio/commit/abaf42a735b00af8cbfec90888d2ef3… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4f88150e11b..f74e4ce3258 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2940,12 +2940,17 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, } } if(port_str == NULL) { - if(hp && hp->port->len) + if(hp && hp->port->len) { port_str = hp->port; - else if(send_sock->useinfo.port_no > 0) - port_str = &(send_sock->useinfo.port_no_str); - else - port_str = &(send_sock->port_no_str); + } else if(send_sock->useinfo.name.len > 0) { + if(send_sock->useinfo.port_no > 0) { + port_str = &(send_sock->useinfo.port_no_str); + } + } else { + if(send_sock->port_no != SIP_PORT) { + port_str = &(send_sock->port_no_str); + } + } } proto = PROTO_NONE; if(msg && (msg->msg_flags & FL_USE_XAVP_VIA_FIELDS) @@ -2989,7 +2994,7 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, via_prefix_len = MY_VIA_LEN + (proto == PROTO_SCTP); max_len = via_prefix_len + address_str->len /* space in MY_VIA */ + 2 /* just in case it is a v6 address ... [ ] */ - + 1 /*':'*/ + port_str->len + + 1 /*':'*/ + (port_str ? port_str->len : 0) + (branch ? (MY_BRANCH_LEN + branch->len) : 0) + (extra_params ? extra_params->len : 0) + comp_len + comp_name_len + CRLF_LEN + 1; @@ -3074,8 +3079,7 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, } memcpy(line_buf + via_prefix_len + extra_len, address_str->s, address_str->len); - if((send_sock->port_no != SIP_PORT) - || (port_str != &send_sock->port_no_str)) { + if(port_str != NULL && port_str->len > 0) { line_buf[via_len] = ':'; via_len++; memcpy(line_buf + via_len, port_str->s, port_str->len);

1 0

git:master:d9ae203c: pkg/kamailio/deb: remove geoip package
by Victor Seva 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: d9ae203c637f53725556fea0ba82f7ae014ee508 URL: https://github.com/kamailio/kamailio/commit/d9ae203c637f53725556fea0ba82f7a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-18T08:54:01+02:00 pkg/kamailio/deb: remove geoip package related #3886 --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/noble/control Modified: pkg/kamailio/deb/noble/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/d9ae203c637f53725556fea0ba82f7a… Patch: https://github.com/kamailio/kamailio/commit/d9ae203c637f53725556fea0ba82f7a…

1 0

[kamailio/kamailio] Pseudo-variables are erroneous for tm.cancel function. (Issue #3977)
by JuanPascual2 17 Sep '24

17 Sep '24

Hello Following the correction of issue #383, pseudo-variables are erroneous for tm.cancel function. The pseudo variables in “tm:local-request” correspond to the INVITE equest and not to the CANCEL request. Example: $rm = INVITE BR Juan -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3977 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3977(a)github.com>

1 2

git:master:1d2b4d5e: core: relocate core rpc, cfg locks and shutdown var initialization
by Daniel-Constantin Mierla 17 Sep '24

17 Sep '24

Module: kamailio Branch: master Commit: 1d2b4d5ed6cd31c5cd6d6a60d80b86a1f66fac79 URL: https://github.com/kamailio/kamailio/commit/1d2b4d5ed6cd31c5cd6d6a60d80b86a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-17T10:16:25+02:00 core: relocate core rpc, cfg locks and shutdown var initialization - done now after shm initialization, shm being used for rpc reload delta, the locks need also shm --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1d2b4d5ed6cd31c5cd6d6a60d80b86a… Patch: https://github.com/kamailio/kamailio/commit/1d2b4d5ed6cd31c5cd6d6a60d80b86a… --- diff --git a/src/main.c b/src/main.c index 993181c7326..c91908baed6 100644 --- a/src/main.c +++ b/src/main.c @@ -2761,17 +2761,17 @@ int main(int argc, char **argv) listen_field_count = 0; /* split listen arguments */ tbuf = pkg_char_dup(optarg); - if (tbuf == NULL) { + if(tbuf == NULL) { fprintf(stderr, "error during processing -l parameter\n"); } tbuf_tmp = tbuf; - while ((p = strsep(&tbuf, "/")) != NULL && listen_field_count < 3) { + while((p = strsep(&tbuf, "/")) != NULL + && listen_field_count < 3) { listen_fields[listen_field_count++] = p; } /* empty advertise only allowed with a name field */ - if (listen_field_count == 2 && strlen(listen_fields[1]) <= 0) { - fprintf(stderr, - "listen value with invalid advertise: %s\n", + if(listen_field_count == 2 && strlen(listen_fields[1]) <= 0) { + fprintf(stderr, "listen value with invalid advertise: %s\n", optarg); pkg_free(tbuf_tmp); goto error; @@ -2779,9 +2779,10 @@ int main(int argc, char **argv) ahost = NULL; aport = 0; aproto = PROTO_NONE; - if (listen_field_count > 1 && strlen(listen_fields[1]) > 0) { + if(listen_field_count > 1 && strlen(listen_fields[1]) > 0) { /* advertise not empty */ - if(parse_phostport(listen_fields[1], &ahost, &tmp_len, &aport, &aproto) + if(parse_phostport(listen_fields[1], &ahost, &tmp_len, + &aport, &aproto) < 0) { fprintf(stderr, "listen value with invalid advertise: %s\n", @@ -2794,9 +2795,9 @@ int main(int argc, char **argv) } } /* socket name */ - if (listen_field_count == 3 && listen_fields[2] != NULL) { - if (strlen(listen_fields[2]) > 0) { - socket_name=listen_fields[2]; + if(listen_field_count == 3 && listen_fields[2] != NULL) { + if(strlen(listen_fields[2]) > 0) { + socket_name = listen_fields[2]; } else { fprintf(stderr, "listen value with invalid socket name: %s\n", @@ -2817,8 +2818,8 @@ int main(int argc, char **argv) goto error; } /* add a new addr. to our address list */ - if(add_listen_advertise_iface_name(n_lst->name, n_lst->next, port, - proto, aproto, ahost, aport, socket_name, + if(add_listen_advertise_iface_name(n_lst->name, n_lst->next, + port, proto, aproto, ahost, aport, socket_name, n_lst->flags) != 0) { fprintf(stderr, "failed to add new listen address: %s\n", @@ -2962,14 +2963,6 @@ int main(int argc, char **argv) if(pv_reinit_buffer() < 0) goto error; - if(register_core_rpcs() != 0) - goto error; - - if(ksr_route_locks_set_init() < 0) - goto error; - - ksr_shutdown_phase_init(); - /* init lookup for core event routes */ sr_core_ert_init(); @@ -3127,6 +3120,15 @@ int main(int argc, char **argv) goto error; pkg_print_manager(); shm_print_manager(); + + if(register_core_rpcs() != 0) + goto error; + + if(ksr_route_locks_set_init() < 0) + goto error; + + ksr_shutdown_phase_init(); + if(init_atomic_ops() == -1) goto error; if(init_basex() != 0) {

1 0

[kamailio/kamailio] app_jsdt: add support for loong64 arch (Issue #3976)
by Victor Seva 16 Sep '24

16 Sep '24

From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060901 It has a patch like: ``` diff -ruN kamailio-5.7.3-bk/src/modules/app_jsdt/duk_config.h kamailio-5.7.3/src/modules/app_jsdt/duk_config.h --- kamailio-5.7.3-bk/src/modules/app_jsdt/duk_config.h 2023-11-17 19:30:23.000000000 +0800 +++ kamailio-5.7.3/src/modules/app_jsdt/duk_config.h 2024-01-16 17:22:10.659716319 +0800 @@ -304,6 +304,10 @@ #endif #endif /* __riscv */ +#if defined(__loongarch64) +#define DUK_F_LOONGARCH64 +#endif + /* SuperH */ #if defined(__sh__) || defined(__sh1__) || defined(__SH1__) \ || defined(__sh2__) || defined(__SH2__) || defined(__sh3__) \ @@ -979,6 +983,11 @@ /* SPARC byte order varies so rely on autodetection. */ #undef DUK_USE_PACKED_TVAL #define DUK_F_PACKED_TVAL_PROVIDED +#elif defined(DUK_F_LOONGARCH64) +#define DUK_USE_ARCH_STRING "loongarch64" +#define DUK_USE_BYTEORDER 1 +#define DUK_USE_PACKED_TVAL +#define DUK_F_PACKED_TVAL_PROVIDED #elif defined(DUK_F_RISCV32) /* --- RISC-V 32-bit --- */ #define DUK_USE_ARCH_STRING "riscv32" ``` I imagine that is coming from https://github.com/svaarala/duktape/commit/1dcb1c23429208de8d6693dec55f2cbf… merged upstream -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3976 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3976(a)github.com>

1 1

git:master:5746db1c: app_jsdt: add support for loong64
by Victor Seva 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 5746db1c5a99eaeaf7f97d520232f014548c912d URL: https://github.com/kamailio/kamailio/commit/5746db1c5a99eaeaf7f97d520232f01… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-16T19:39:09+02:00 app_jsdt: add support for loong64 From: liuxiang <liuxiang(a)loongson.cn> > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060901 fixes #3976 --- Modified: src/modules/app_jsdt/duk_config.h --- Diff: https://github.com/kamailio/kamailio/commit/5746db1c5a99eaeaf7f97d520232f01… Patch: https://github.com/kamailio/kamailio/commit/5746db1c5a99eaeaf7f97d520232f01… --- diff --git a/src/modules/app_jsdt/duk_config.h b/src/modules/app_jsdt/duk_config.h index 690f7019912..331d778684b 100644 --- a/src/modules/app_jsdt/duk_config.h +++ b/src/modules/app_jsdt/duk_config.h @@ -304,6 +304,11 @@ #endif #endif /* __riscv */ +/* LOONGARCH64, https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html */ +#if defined(__loongarch64) +#define DUK_F_LOONGARCH64 +#endif + /* SuperH */ #if defined(__sh__) || defined(__sh1__) || defined(__SH1__) \ || defined(__sh2__) || defined(__SH2__) || defined(__sh3__) \ @@ -979,6 +984,11 @@ /* SPARC byte order varies so rely on autodetection. */ #undef DUK_USE_PACKED_TVAL #define DUK_F_PACKED_TVAL_PROVIDED +#elif defined(DUK_F_LOONGARCH64) +#define DUK_USE_ARCH_STRING "loongarch64" +#define DUK_USE_BYTEORDER 1 +#undef DUK_USE_PACKED_TVAL +#define DUK_F_PACKED_TVAL_PROVIDED #elif defined(DUK_F_RISCV32) /* --- RISC-V 32-bit --- */ #define DUK_USE_ARCH_STRING "riscv32"

1 0

git:master:99710daa: core: proper condition for bind_ipv6_link_local modes
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 99710daa8b05a0a37ef3bb35e2ffd723908037f4 URL: https://github.com/kamailio/kamailio/commit/99710daa8b05a0a37ef3bb35e2ffd72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T15:28:14+02:00 core: proper condition for bind_ipv6_link_local modes --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/99710daa8b05a0a37ef3bb35e2ffd72… Patch: https://github.com/kamailio/kamailio/commit/99710daa8b05a0a37ef3bb35e2ffd72… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index ae1c9ec4b0b..8bb77351230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1001,7 +1001,7 @@ assign_stm: | IPV6_HEX_STYLE error { yyerror("string value expected"); } | BIND_IPV6_LINK_LOCAL EQUAL NUMBER { sr_bind_ipv6_link_local = $3; - if(sr_bind_ipv6_link_local && (KSR_IPV6_LINK_LOCAL_BIND|KSR_IPV6_LINK_LOCAL_SKIP)) { + if(!(sr_bind_ipv6_link_local && (KSR_IPV6_LINK_LOCAL_BIND|KSR_IPV6_LINK_LOCAL_SKIP))) { yyerror("incompatible modes set"); } }

1 0

[kamailio/kamailio] tm: Emit request event when tm.cancel is called (PR #3962)
by Xenofon Karamanos 16 Sep '24

16 Sep '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 #3831 #### Description  The `tm` currently does not trigger the `tm:local-request` event for CANCEL requests that are created by the tm.cancel RPC function. This pull request adds support for triggering the tm:local-request event for CANCEL requests. According to [docs](https://www.kamailio.org/docs/modules/devel/modules/tm#tm.e.local-req… an event `tm:local-request` should be created for every request that is originates from kamailio and creates a transaction. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3962 -- Commit Summary -- * tm: Emit request event when cancel is called -- File Changes -- M src/modules/tm/t_cancel.c (62) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3962.patch https://github.com/kamailio/kamailio/pull/3962.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3962 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3962(a)github.com>

3 7

git:master:faca8e7a: tm: Emit request event when cancel is called
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: faca8e7a20255d90a4786fd4043005ead9dfc5df URL: https://github.com/kamailio/kamailio/commit/faca8e7a20255d90a4786fd4043005e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T15:21:51+02:00 tm: Emit request event when cancel is called --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/faca8e7a20255d90a4786fd4043005e… Patch: https://github.com/kamailio/kamailio/commit/faca8e7a20255d90a4786fd4043005e… --- diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index 68dae04fbc8..03e919f6abe 100644 --- a/src/modules/tm/t_cancel.c +++ b/src/modules/tm/t_cancel.c @@ -29,6 +29,7 @@ #include "t_funcs.h" #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/kemi.h" #include "t_reply.h" #include "t_cancel.h" #include "t_msgbuilder.h" @@ -36,6 +37,8 @@ #include "t_hooks.h" +extern str tm_event_callback; + typedef struct cancel_reason_map { int code; @@ -86,6 +89,11 @@ void prepare_to_cancel( int i; int branches_no; branch_bm_t mask; + int rt, backup_rt; + struct run_act_ctx ctx; + sip_msg_t msg; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("tm:local-request"); *cancel_bm = 0; branches_no = t->nr_of_outgoings; @@ -95,6 +103,49 @@ void prepare_to_cancel( *cancel_bm |= ((mask & (1 << i)) && prepare_cancel_branch(t, i, 1)) << i; } + + rt = -1; + if(tm_event_callback.s == NULL || tm_event_callback.len <= 0) { + rt = route_lookup(&event_rt, "tm:local-request"); + if(rt < 0 || event_rt.rlist[rt] == NULL) { + LM_DBG("tm:local-request not found\n"); + return; + } + } else { + keng = sr_kemi_eng_get(); + if(keng == NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + tm_event_callback.s); + return; + } + } + + /* Check if msg is null */ + if(build_sip_msg_from_buf( + &msg, t->uac->request.buffer, t->uac->request.buffer_len, 0) + < 0) { + LM_ERR("fail to parse msg\n"); + return; + } + + /* Call event */ + backup_rt = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + if(rt >= 0) { + run_top_route(event_rt.rlist[rt], &msg, 0); + } else { + if(keng != NULL) { + + if(sr_kemi_route( + keng, &msg, EVENT_ROUTE, &tm_event_callback, &evname) + < 0) { + LM_ERR("error running event route kemi callback\n"); + } + } + } + set_route_type(backup_rt); + free_sip_msg(&msg); }

1 0

git:master:45a93b46: sst: small white space change in docs after dialog flag removal (commit 7e139951dc)
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 45a93b46f0845867fdc1fd07a798eda6a9480816 URL: https://github.com/kamailio/kamailio/commit/45a93b46f0845867fdc1fd07a798eda… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T11:45:11Z sst: small white space change in docs after dialog flag removal (commit 7e139951dc) --- Modified: src/modules/sst/doc/sst_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/45a93b46f0845867fdc1fd07a798eda… Patch: https://github.com/kamailio/kamailio/commit/45a93b46f0845867fdc1fd07a798eda… --- diff --git a/src/modules/sst/doc/sst_admin.xml b/src/modules/sst/doc/sst_admin.xml index 751dd3a2f49..6b44916ab78 100644 --- a/src/modules/sst/doc/sst_admin.xml +++ b/src/modules/sst/doc/sst_admin.xml @@ -54,7 +54,7 @@ All of this happens with a properly configured dialog and sst module. You need to call the dlg_manage() function and set the sst flag at the time any INVITE sip message is seen. - There is no &kamailioconfig; script function call required to + There is no &kamailioconfig; script function call required to set the dialog expire timeout value. See the <quote>dialog module</quote> users guide for more information. @@ -312,7 +312,7 @@ modparam("sst", "sst_flag", 6) route { ... if (method=="INVITE") { - dlg_manage(); # Track the dialog + dlg_manage(); # Track the dialog setflag(6); # set the sst flag } ...

1 0

[kamailio/kamailio] Dialog flag (PR #3961)
by Xenofon Karamanos 16 Sep '24

16 Sep '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 - [ ] 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 - [x] Tested changes locally - [x] Related to issue #2593 #### Description  This PR removes the `dlg_flag` from the dialog module and recommends `dlg_manage()` instead in the docs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3961 -- Commit Summary -- * dialog: Drop support for dlg_flag parameter * dialog/doc: Remove dlg_flag docs and suggest dlg_manage() instead. -- File Changes -- M src/modules/dialog/dialog.c (13) M src/modules/dialog/dlg_handlers.c (22) M src/modules/dialog/dlg_handlers.h (3) M src/modules/dialog/doc/dialog_admin.xml (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3961.patch https://github.com/kamailio/kamailio/pull/3961.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3961 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3961(a)github.com>

4 13

git:master:30a362bd: nat_traversal: Remove dlg_flag and update docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 30a362bd5d91205135721bf8bce129e41cef9651 URL: https://github.com/kamailio/kamailio/commit/30a362bd5d91205135721bf8bce129e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 nat_traversal: Remove dlg_flag and update docs --- Modified: src/modules/nat_traversal/doc/nat_traversal_admin.xml Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/30a362bd5d91205135721bf8bce129e… Patch: https://github.com/kamailio/kamailio/commit/30a362bd5d91205135721bf8bce129e…

1 0

git:master:60a5ea45: mediaproxy: Remove dlg_flag and update docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 60a5ea45c5cc18b7074330da52ed1944cfbf3fbb URL: https://github.com/kamailio/kamailio/commit/60a5ea45c5cc18b7074330da52ed194… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 mediaproxy: Remove dlg_flag and update docs --- Modified: src/modules/mediaproxy/doc/mediaproxy_admin.xml Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/60a5ea45c5cc18b7074330da52ed194… Patch: https://github.com/kamailio/kamailio/commit/60a5ea45c5cc18b7074330da52ed194… --- diff --git a/src/modules/mediaproxy/doc/mediaproxy_admin.xml b/src/modules/mediaproxy/doc/mediaproxy_admin.xml index d89207b33a3..c75ed86e629 100644 --- a/src/modules/mediaproxy/doc/mediaproxy_admin.xml +++ b/src/modules/mediaproxy/doc/mediaproxy_admin.xml @@ -349,7 +349,6 @@ modparam("mediaproxy", "ice_candidate_avp", "$avp(ice_candidate)") called internally on dialog callbacks, so for this function to work, the dialog module must be loaded and configured. </para> - <para> This function is an advanced mechanism to use a media relay without having to manually call a function on each message that @@ -371,6 +370,11 @@ modparam("mediaproxy", "ice_candidate_avp", "$avp(ice_candidate)") This function can be used from REQUEST_ROUTE. </para> + <note> + The <emphasis>dlg_manage()</emphasis> function must be called + in the configuration file before using this function. + </note> + <example> <title>Using the <function>engage_media_proxy</function> function</title> <programlisting format="linespecific"> @@ -378,6 +382,7 @@ modparam("mediaproxy", "ice_candidate_avp", "$avp(ice_candidate)") if (method==INVITE && !has_totag()) { # We can also use a specific media relay if we need to #$avp(media_relay) = "1.2.3.4"; + dlg_manage() engage_media_proxy(); } ... @@ -466,4 +471,3 @@ if (method==BYE) { </section> </chapter> - diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 7b4e301bdc7..c7ccd901a1d 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -207,7 +207,6 @@ static MediaproxySocket mediaproxy_socket = { struct dlg_binds dlg_api; Bool have_dlg_api = False; -static int dialog_flag = -1; // The AVP where the caller signaling IP is stored (if defined) static AVP_Param signaling_ip_avp = {str_init(SIGNALING_IP_AVP_SPEC), {0}, 0}; @@ -1996,7 +1995,6 @@ static int EngageMediaProxy(struct sip_msg *msg) return -1; } msg->msg_flags |= FL_USE_MEDIA_PROXY; - setflag(msg, dialog_flag); // have the dialog module trace this dialog return 1; } @@ -2049,9 +2047,6 @@ static int w_EndMediaSession(struct sip_msg *msg, char *p1, char *p2) static int mod_init(void) { pv_spec_t avp_spec; - int *param; - modparam_t type; - // initialize the signaling_ip_avp structure if(!signaling_ip_avp.spec.s || signaling_ip_avp.spec.len <= 0) { LM_WARN("missing/empty signaling_ip_avp parameter. will use " @@ -2130,21 +2125,6 @@ static int mod_init(void) if(load_dlg_api(&dlg_api) == 0) { have_dlg_api = True; - // load dlg_flag and default_timeout parameters from the dialog module - param = find_param_export( - find_module_by_name("dialog"), "dlg_flag", INT_PARAM, &type); - if(!param) { - LM_CRIT("cannot find dlg_flag parameter in the dialog module\n"); - return -1; - } - - if(type != INT_PARAM) { - LM_CRIT("dlg_flag parameter found but with wrong type: %d\n", type); - return -1; - } - - dialog_flag = *param; - // register dialog creation callback if(dlg_api.register_dlgcb( NULL, DLGCB_CREATED, __dialog_created, NULL, NULL)

1 0

git:master:013c3f1c: cnxcc: Remove dlg_flag and update docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 013c3f1cc52d4ae2c68496cddf0f1122ffc079e1 URL: https://github.com/kamailio/kamailio/commit/013c3f1cc52d4ae2c68496cddf0f112… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 cnxcc: Remove dlg_flag and update docs --- Modified: src/modules/cnxcc/cnxcc_mod.c Modified: src/modules/cnxcc/cnxcc_mod.h Modified: src/modules/cnxcc/doc/cnxcc_admin.xml Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg --- Diff: https://github.com/kamailio/kamailio/commit/013c3f1cc52d4ae2c68496cddf0f112… Patch: https://github.com/kamailio/kamailio/commit/013c3f1cc52d4ae2c68496cddf0f112…

1 0

git:master:5115ea20: call_control: Remove dlg_flag and update docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 5115ea20322ef32d581c1dd8f581dfd780a5094c URL: https://github.com/kamailio/kamailio/commit/5115ea20322ef32d581c1dd8f581dfd… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 call_control: Remove dlg_flag and update docs --- Modified: src/modules/call_control/call_control.c Modified: src/modules/call_control/doc/call_control_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5115ea20322ef32d581c1dd8f581dfd… Patch: https://github.com/kamailio/kamailio/commit/5115ea20322ef32d581c1dd8f581dfd… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index f1614b04254..41b36eeedd6 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -146,7 +146,6 @@ static AVP_Param sip_application_avp = { struct dlg_binds dlg_api; -static int dialog_flag = -1; AVP_List *cc_init_avps = NULL, *cc_start_avps = NULL, *cc_stop_avps = NULL; @@ -1080,7 +1079,6 @@ static int ki_call_control(sip_msg_t *msg) if(result == 1) { // A call with a time limit that will be traced by callcontrol msg->msg_flags |= FL_USE_CALL_CONTROL; - setflag(msg, dialog_flag); // have the dialog module trace this dialog } return result; @@ -1171,20 +1169,6 @@ static int mod_init(void) return -1; } - // load dlg_flag and default_timeout parameters from the dialog module - param = find_param_export( - find_module_by_name("dialog"), "dlg_flag", INT_PARAM, &type); - if(!param) { - LOG(L_CRIT, "cannot find dlg_flag parameter in the dialog module\n"); - return -1; - } - if(type != INT_PARAM) { - LOG(L_CRIT, "dlg_flag parameter found but with wrong type: %d\n", type); - return -1; - } - - dialog_flag = *param; - // register dialog creation callback if(dlg_api.register_dlgcb(NULL, DLGCB_CREATED, __dialog_created, NULL, NULL) != 0) { diff --git a/src/modules/call_control/doc/call_control_admin.xml b/src/modules/call_control/doc/call_control_admin.xml index f673413ed0b..01d56ebe0d4 100644 --- a/src/modules/call_control/doc/call_control_admin.xml +++ b/src/modules/call_control/doc/call_control_admin.xml @@ -410,6 +410,10 @@ route { This function can be used from REQUEST_ROUTE. </para> + <note> + The <emphasis>dlg_manage()</emphasis> (dialog module) function must be called in the configuration file before using this function. + </note> + <example> <title>Using the <function>call_control</function> function</title> <programlisting format="linespecific"> @@ -424,6 +428,7 @@ if (is_avp_set("$avp(i:805)")) { if (method==INVITE && !has_totag() && is_domain_local("$avp(s:billing_party_domain)")) { + dlg_manage(); call_control(); switch ($retcode) { case 2: @@ -460,4 +465,3 @@ t_relay(); </section> </chapter> -

1 0

git:master:7e139951: sst: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 7e139951dc925f60bdd37ce699b38188cb223888 URL: https://github.com/kamailio/kamailio/commit/7e139951dc925f60bdd37ce699b3818… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 sst: Remove dlg_flag docs --- Modified: src/modules/sst/doc/sst_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7e139951dc925f60bdd37ce699b3818… Patch: https://github.com/kamailio/kamailio/commit/7e139951dc925f60bdd37ce699b3818… --- diff --git a/src/modules/sst/doc/sst_admin.xml b/src/modules/sst/doc/sst_admin.xml index 9c905f9e3c0..751dd3a2f49 100644 --- a/src/modules/sst/doc/sst_admin.xml +++ b/src/modules/sst/doc/sst_admin.xml @@ -50,12 +50,15 @@ request the use of session timers if the UAC does not request it.</para> - <para>All of this happens with a properly configured dialog - and sst module and setting the dialog flag and the sst flag at - the time any INVITE sip message is seen. There is no - &kamailioconfig; script function call required to set the dialog - expire timeout value. See the <quote>dialog module</quote> users guide for - more information.</para> + <para> + All of this happens with a properly configured dialog and sst + module. You need to call the dlg_manage() function and set the + sst flag at the time any INVITE sip message is seen. + There is no &kamailioconfig; script function call required to + set the dialog expire timeout value. + See the <quote>dialog module</quote> users guide for + more information. + </para> <para>The <quote>sstCheckMin()</quote> script function can be used to verify that the Session-expires / MIN-SE header field values are not too @@ -287,9 +290,9 @@ modparam("sst", "reject_to_small", 0) need to tell the sst module which flag value you are assigning to sst.</para> - <para>In most cases whenever you set the dialog flag - you will want to set the sst flag. If the dialog flag - is not set and the sst flag is set, it will not have + <para>In most cases whenever you call dlg_manage() function + you will want to set the sst flag. If the dialog is not tracked + and the sst flag is set, it will not have any effect.</para> <para><emphasis>This parameter must be set or the module will @@ -304,13 +307,12 @@ modparam("sst", "reject_to_small", 0) <title>Set <varname>sst_flag</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "dlg_flag", 5) modparam("sst", "sst_flag", 6) ... route { ... if (method=="INVITE") { - setflag(5); # set the dialog flag + dlg_manage(); # Track the dialog setflag(6); # set the sst flag } ... @@ -353,7 +355,6 @@ route { ... modparam("dialog", "timeout_avp", "$avp(i:4242)") -modparam("dialog", "dlg_flag", 5) ... modparam("sst", "sst_flag", 6) modparam("sst", "timeout_avp", "$avp(i:4242)") @@ -367,7 +368,7 @@ route { exit; } # track the session timers via the dialog module - setflag(5); + dlg_manage(); setflag(6); } } @@ -381,7 +382,7 @@ route { exit; } # track the session timers via the dialog module - setflag(5); + dlg_manage(); setflag(6); } } @@ -407,4 +408,3 @@ route { <para>Just load the module and remember to set the timeout_avp and sst_flag values.</para> </section> </chapter> -

1 0

git:master:435fa668: pua_dialoginfo: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 435fa668e1709df8c3025961fa7a38224483914e URL: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 pua_dialoginfo: Remove dlg_flag docs --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… Patch: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index 6093c3516b6..ac5d3ba41d3 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -165,8 +165,8 @@ <para>This module is directly coupled with the dialog module. Thus, if the module is loaded, it is automatically active for all calls tracked by the dialog module. Thus, make sure that you activate the dialog module for a certain call if you want dialog-state - to be PUBLISHED. This means, the dlg_flag of the dialog module must be configured - and the respective flag must be set during call processing. + to be PUBLISHED. This means, use the <emphasis>dlg_manage()</emphasis> function of the dialog + module to have it tracked. </para> </section> <section>

1 0

git:master:f612c958: qos: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: f612c9583072eb22dc477c11d000541ab8b944ad URL: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 qos: Remove dlg_flag docs --- Modified: src/modules/qos/doc/qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… Patch: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… --- diff --git a/src/modules/qos/doc/qos_admin.xml b/src/modules/qos/doc/qos_admin.xml index 38d33a99f00..908ab5d5f84 100644 --- a/src/modules/qos/doc/qos_admin.xml +++ b/src/modules/qos/doc/qos_admin.xml @@ -32,12 +32,10 @@ </para> <para> - All of this happens with a properly configured dialog - and qos module and setting the dialog flag and the qos flag at - the time any INVITE SIP message is seen. There is no - config script function call required to set the SDP session - tracking mechanism. See the dialog module users guide for - more information. + All of this happens with a properly configured dialog and qos + module. You need to call the dlg_manage() function and set the + qos flag at the time any INVITE sip message is seen. + See the <quote>dialog module</quote> users guide for information. </para> <para> @@ -126,9 +124,9 @@ before you can do that, you need to tell the qos module which flag value you are assigning to qos.</para> - <para>In most cases when ever you set the dialog flag - you will want to set the qos flag. If the dialog flag - is not set and the qos flag is set, it will not have + <para>In most cases when ever you call dlg_manage() function + you will want to set the qos flag. If the dialog is not tracked + and the qos flag is set, it will not have any effect.</para> <para><emphasis>This parameter must be set or the module will @@ -143,13 +141,12 @@ <title>Set <varname>qos_flag</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "dlg_flag", 5) modparam("qos", "qos_flag", 7) ... route { ... if (method=="INVITE") { - setflag(5); # set the dialog flag + dlg_manage(); # Track the dialog setflag(7); # Set the qos flag } ... @@ -182,4 +179,3 @@ route { </para> </section> </chapter> -

1 0

git:master:fbe3aede: acc: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: fbe3aedee492ceb23ef53c967f1fe256a94d876f URL: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 acc: Remove dlg_flag docs --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… Patch: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 37a1365627e..493ae6323f3 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -327,7 +327,7 @@ if (uri=~"sip:+40") /* calls to Romania */ { <para> The dialog module needs to be engaged on the dialogs that should be accounted, that they will be tracked by the server. This is usally done by calling the function - <emphasis>dlg_manage()</emphasis> or setting the <emphasis>dlg_flag</emphasis>. + <emphasis>dlg_manage()</emphasis>. Refer to the documentation of the dialog module for more information. </para> @@ -1611,4 +1611,3 @@ acc_db_request("$var(code) $avp(reason)", "acc"); </section> </section> </chapter> -

1 0

git:master:81f96617: dialog/doc: Remove dlg_flag docs and suggest dlg_manage() instead.
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 81f966174275b715608f50aae606d40a791dd67c URL: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 dialog/doc: Remove dlg_flag docs and suggest dlg_manage() instead. --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… Patch: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 07116e70a63..d1547b367a6 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -46,9 +46,8 @@ <title>How it works</title> <para> To create the dialog associated with an initial INVITE request, execute - the function <quote>dlg_manage()</quote> or set the flag specified by - parameter <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) - before creating the corresponding transaction. + the function <quote>dlg_manage()</quote> before creating the + corresponding transaction. </para> <para> The dialog is automatically destroyed when a <quote>BYE</quote> is @@ -253,28 +252,17 @@ modparam("dialog", "rr_param", "xyz") <section id="dialog.p.flag"> <title><varname>dlg_flag</varname> (integer)</title> <para> - Flag to be used for marking if a dialog should be constructed for the - current request (this makes sense only for initial requests). - </para> - <para> - Note: it is not needed to set this parameter and its corresponding flag + Note: This flag has beed deprecated and not used anyymore. + it is not needed to set this parameter and its corresponding flag for initial request in case the <quote>dlg_manage()</quote> function - is used. In other words, using <quote>dlg_manage()</quote> alone is - enough. + is used. + In other words, use <quote>dlg_manage()</quote>. </para> <para> <emphasis> Default value is <quote>none</quote>. </emphasis> </para> - <example> - <title>Set <varname>dlg_flag</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("dialog", "dlg_flag", 4) -... -</programlisting> - </example> </section> <section id="dialog.p.timeout_avp">

1 0

git:master:e60a0646: dialog: Drop support for dlg_flag parameter
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: e60a06469503c566d40437e69cf3374aad361251 URL: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 dialog: Drop support for dlg_flag parameter --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_handlers.h --- Diff: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374… Patch: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374…

1 0

[kamailio/kamailio] cdp: export all functions in KEMI module (PR #3949)
by bazrafshan.m.h 16 Sep '24

16 Sep '24

- Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings.   #### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - The cdp functions are exported to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3949 -- Commit Summary -- * cdp: export all functions in KEMI module -- File Changes -- M src/modules/cdp/cdp_mod.c (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3949.patch https://github.com/kamailio/kamailio/pull/3949.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3949 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3949(a)github.com>

2 3

git:master:11f20730: cdp: export all functions in KEMI module
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 11f207306a1da400f4252a1fafd456cda015fb3b URL: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… Author: Moheb <bazrafshan.m.h(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:35:01+02:00 cdp: export all functions in KEMI module - Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings. --- Modified: src/modules/cdp/cdp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… Patch: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… --- diff --git a/src/modules/cdp/cdp_mod.c b/src/modules/cdp/cdp_mod.c index 4685d2af511..b32e4ea7bf4 100644 --- a/src/modules/cdp/cdp_mod.c +++ b/src/modules/cdp/cdp_mod.c @@ -57,6 +57,7 @@ #include "cdp_functions.h" #include "cdp_tls.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -301,7 +302,10 @@ int w_cdp_check_peer(sip_msg_t *msg, char *peer, char *p2) } return -1; } - +int ki_cdp_check_peer(sip_msg_t *msg, str *peer) +{ + return w_cdp_check_peer(msg, peer->s, "NULL"); +} static int w_cdp_has_app(sip_msg_t *msg, char *appid, char *param) { unsigned int app_flags; @@ -324,6 +328,10 @@ static int w_cdp_has_app(sip_msg_t *msg, char *appid, char *param) return check_application(-1, a); } +static int ki_cdp_has_app(sip_msg_t *msg, str *appid) +{ + return w_cdp_has_app(msg, appid->s, "NULL"); +} static int w_cdp_has_app2(sip_msg_t *msg, char *vendor, char *appid) { unsigned int vendor_flags, app_flags; @@ -359,3 +367,42 @@ static int w_cdp_has_app2(sip_msg_t *msg, char *vendor, char *appid) } return check_application(v, a); } +static int ki_cdp_has_app2(sip_msg_t *msg, str *vendor, str *appid) +{ + return w_cdp_has_app2(msg, vendor->s, appid->s); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_cdp_exports[] = { + { str_init("cdp"), str_init("cdp_check_peer"), + SR_KEMIP_INT, ki_cdp_check_peer, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cdp"), str_init("cdp_has_app"), + SR_KEMIP_INT, ki_cdp_has_app, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cdp"), str_init("cdp_has_app2"), + SR_KEMIP_INT, ki_cdp_has_app2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_cdp_exports); + return 0; +}

1 0

git:master:15d81a01: core: use macro to check send_port_str value
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 15d81a0151aa46a20f95fb8c6dc2665d03e741aa URL: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T12:18:54+02:00 core: use macro to check send_port_str value --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… Patch: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bc68a920ef6..4f88150e11b 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -728,7 +728,7 @@ static inline int lumps_len( }; \ break; \ case SUBST_SND_PORT: \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ new_len += send_port_str->len; \ } else { \ LM_CRIT("null send sock port\n"); \ @@ -772,7 +772,7 @@ static inline int lumps_len( send_address_str->len) \ != NULL)) \ new_len += 2; \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ /* add :port_no */ \ new_len += 1 + send_port_str->len; \ } \ @@ -1175,7 +1175,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, }; \ break; \ case SUBST_SND_PORT: \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ memcpy(new_buf + offset, send_port_str->s, \ send_port_str->len); \ offset += send_port_str->len; \ @@ -1205,7 +1205,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, offset++; \ } \ /* :port */ \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ new_buf[offset] = ':'; \ offset++; \ memcpy(new_buf + offset, send_port_str->s, \

1 0

git:master:c09a2936: core: use advertised port for recv socket only when set
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: c09a29369f03f6c5e621a94b5b853047490568aa URL: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T10:42:19+02:00 core: use advertised port for recv socket only when set --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… Patch: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 19713e1b1cc..bc68a920ef6 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -631,7 +631,7 @@ static inline int lumps_len( }; \ break; \ case SUBST_RCV_PORT: \ - if(msg->rcv.bind_address && STR_WITHVAL(recv_port_str)) { \ + if(STR_WITHVAL(recv_port_str)) { \ new_len += recv_port_str->len; \ } else { \ LM_CRIT(" rcv port - null bind_address\n"); \ @@ -864,9 +864,11 @@ static inline int lumps_len( recv_address_str = &(msg->rcv.bind_address->address_str); recv_af = msg->rcv.bind_address->address.af; } - if(msg->rcv.bind_address->useinfo.port_no > 0) { - recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); - recv_port_no = msg->rcv.bind_address->useinfo.port_no; + if(msg->rcv.bind_address->useinfo.name.len > 0) { + if(msg->rcv.bind_address->useinfo.port_no > 0) { + recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); + recv_port_no = msg->rcv.bind_address->useinfo.port_no; + } } else { recv_port_str = &(msg->rcv.bind_address->port_no_str); recv_port_no = msg->rcv.bind_address->port_no; @@ -1055,7 +1057,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, }; \ break; \ case SUBST_RCV_PORT: \ - if(msg->rcv.bind_address && STR_WITHVAL(recv_port_str)) { \ + if(STR_WITHVAL(recv_port_str)) { \ memcpy(new_buf + offset, recv_port_str->s, \ recv_port_str->len); \ offset += recv_port_str->len; \ @@ -1396,9 +1398,11 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, recv_address_str = &(msg->rcv.bind_address->address_str); recv_af = msg->rcv.bind_address->address.af; } - if(msg->rcv.bind_address->useinfo.port_no > 0) { - recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); - recv_port_no = msg->rcv.bind_address->useinfo.port_no; + if(msg->rcv.bind_address->useinfo.name.len > 0) { + if(msg->rcv.bind_address->useinfo.port_no > 0) { + recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); + recv_port_no = msg->rcv.bind_address->useinfo.port_no; + } } else { recv_port_str = &(msg->rcv.bind_address->port_no_str); recv_port_no = msg->rcv.bind_address->port_no;

1 0

git:master:0f423f97: core: use advertised port only when explicitely set
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 0f423f97607416edcff8d0f1612fad7af29b6064 URL: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T09:17:09+02:00 core: use advertised port only when explicitely set - do not fallback to socket port --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7… Patch: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7…

1 0

[kamailio/kamailio] move app_mono to archive (PR #3964)
by Victor Seva 16 Sep '24

16 Sep '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #3963 #### Description steps to remove app_mono You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3964 -- Commit Summary -- * Makefile.groups: remove app_mono * app_mono: module relocated to archive -- File Changes -- M src/Makefile.groups (8) D src/modules/app_mono/Makefile (17) D src/modules/app_mono/README (223) D src/modules/app_mono/app_mono_api.c (907) D src/modules/app_mono/app_mono_api.h (63) D src/modules/app_mono/app_mono_mod.c (203) D src/modules/app_mono/doc/Makefile (4) D src/modules/app_mono/doc/app_mono.xml (41) D src/modules/app_mono/doc/app_mono_admin.xml (231) D src/modules/app_mono/lib/SR.cs (41) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3964.patch https://github.com/kamailio/kamailio/pull/3964.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3964 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3964(a)github.com>

2 3

[kamailio/kamailio] app_mono: maybe time to move it to archive repo? (Issue #3963)
by Victor Seva 16 Sep '24

16 Sep '24

### Description From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1079882 ``` From: "Chris Hofstaedtler" <zeha(a)debian.org> Source: kamailio Priority: wishlist Control: block 1010445 by -1 Hi, kamailio currently (build-)depends on mono libraries. Please drop these relations, probably turning off mono support altogether. The mono stack in Debian is not maintained in any way, so we'd like to reduce packages relying on it. Chris ``` I'll remove app_mono from sid and >= trixie builds -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3963 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3963(a)github.com>

2 2

git:master:6cf255de: app_mono: module relocated to archive
by Victor Seva 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 6cf255dee8620ffa1a5be1bb23a1b767015218fa URL: https://github.com/kamailio/kamailio/commit/6cf255dee8620ffa1a5be1bb23a1b76… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-16T09:13:02+02:00 app_mono: module relocated to archive fixes #3963 --- Removed: src/modules/app_mono/Makefile Removed: src/modules/app_mono/README Removed: src/modules/app_mono/app_mono_api.c Removed: src/modules/app_mono/app_mono_api.h Removed: src/modules/app_mono/app_mono_mod.c Removed: src/modules/app_mono/doc/Makefile Removed: src/modules/app_mono/doc/app_mono.xml Removed: src/modules/app_mono/doc/app_mono_admin.xml Removed: src/modules/app_mono/lib/SR.cs --- Diff: https://github.com/kamailio/kamailio/commit/6cf255dee8620ffa1a5be1bb23a1b76… Patch: https://github.com/kamailio/kamailio/commit/6cf255dee8620ffa1a5be1bb23a1b76…

1 0

git:master:f0dbb620: Makefile.groups: remove app_mono
by Victor Seva 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: f0dbb620c1de59732b5f379af16b37713afffc56 URL: https://github.com/kamailio/kamailio/commit/f0dbb620c1de59732b5f379af16b377… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-16T09:13:02+02:00 Makefile.groups: remove app_mono related #3963 --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/f0dbb620c1de59732b5f379af16b377… Patch: https://github.com/kamailio/kamailio/commit/f0dbb620c1de59732b5f379af16b377… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index bda4f36a258..83c4bdb2a47 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -163,9 +163,6 @@ mod_list_jansson_event=janssonrpcc # - modules depending on redis library mod_list_redis=db_redis ndb_redis topos_redis -# - modules depending on mono library -mod_list_mono=app_mono - # - modules related to IMS extensions mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos ims_qos_npn \ ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ @@ -263,7 +260,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_geoip) $(mod_list_sqlite) \ $(mod_list_json) $(mod_list_json_event) \ $(mod_list_redis) \ - $(mod_list_mono) $(mod_list_ims) \ + $(mod_list_ims) \ $(mod_list_cassandra) $(mod_list_oracle) \ $(mod_list_outbound) \ $(mod_list_java) $(mod_list_dnssec) \ @@ -465,9 +462,6 @@ module_group_kjansson=$(mod_list_jansson) $(mod_list_jansson_event) # pkg redis module module_group_kredis=$(mod_list_redis) -# pkg mono module -module_group_kmono=$(mod_list_mono) - # pkg IMS modules module_group_kims=$(mod_list_ims)

1 0

git:master:fa17af66: core: skip interfaces with index over max iface limit
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: fa17af660dc754cd46c747ec8c3216ef52fd4fcc URL: https://github.com/kamailio/kamailio/commit/fa17af660dc754cd46c747ec8c3216e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T08:29:59+02:00 core: skip interfaces with index over max iface limit --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/fa17af660dc754cd46c747ec8c3216e… Patch: https://github.com/kamailio/kamailio/commit/fa17af660dc754cd46c747ec8c3216e… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 446878d6b23..281defecffc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1493,6 +1493,7 @@ static int build_iface_list(void) int families[] = {AF_INET, AF_INET6}; char name[MAX_IF_LEN]; int is_link_local = 0; + int num = 0; if(ifaces == NULL) { if((ifaces = (struct idxlist *)pkg_malloc( @@ -1554,9 +1555,11 @@ static int build_iface_list(void) rtl = IFA_PAYLOAD(nlp); index = ifi->ifa_index; + num++; if(index >= MAX_IFACE_NO) { - LM_ERR("Invalid interface index returned: %d\n", index); - goto error; + LM_ERR("Invalid interface index returned: %d (n: %d) - skip\n", + index, num); + continue; } entry = (struct idx *)pkg_malloc(sizeof(struct idx)); @@ -1564,6 +1567,7 @@ static int build_iface_list(void) PKG_MEM_ERROR; goto error; } + LM_DBG("trying network interface index: %d (n: %d)\n", index, num); entry->next = 0; entry->family = families[i];

1 0

git:5.7:bb770156: pkg/kamailio: fixed python module build on RHEL based dists
by Sergey Safarov 14 Sep '24

14 Sep '24

Module: kamailio Branch: 5.7 Commit: bb770156f7f73485fb523576cc6639b334da4aa5 URL: https://github.com/kamailio/kamailio/commit/bb770156f7f73485fb523576cc6639b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-14T17:52:02+03:00 pkg/kamailio: fixed python module build on RHEL based dists (cherry picked from commit b1c9dac2c382a98997d5771921af5aa3235876c0) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/bb770156f7f73485fb523576cc6639b… Patch: https://github.com/kamailio/kamailio/commit/bb770156f7f73485fb523576cc6639b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9ee068b9900..7e15f95fdc8 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1343,7 +1343,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 0

git:5.7:58732164: app_python3: bump to 3.12 for el8/el9
by Sergey Safarov 14 Sep '24

14 Sep '24

Module: kamailio Branch: 5.7 Commit: 58732164c199ed6c565ea650998d6e34e5dcb451 URL: https://github.com/kamailio/kamailio/commit/58732164c199ed6c565ea650998d6e3… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-14T17:51:47+03:00 app_python3: bump to 3.12 for el8/el9 (cherry picked from commit 4d87f29248d36d873784827204f272116050343d) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/58732164c199ed6c565ea650998d6e3… Patch: https://github.com/kamailio/kamailio/commit/58732164c199ed6c565ea650998d6e3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 814de137d9a..9ee068b9900 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -847,9 +847,9 @@ Requires: python2, kamailio = %ver BuildRequires: python2, python2-devel %endif %if %{with python3} -%if 0%{?rhel} == 8 -Requires: python39, kamailio = %ver -BuildRequires: python39, python39-devel +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 +Requires: python3.12, kamailio = %ver +BuildRequires: python3.12, python3.12-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1236,7 +1236,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 0

git:5.8:ab3530e7: pkg/kamailio: fixed python module build on RHEL based dists
by Sergey Safarov 13 Sep '24

13 Sep '24

Module: kamailio Branch: 5.8 Commit: ab3530e753dece24e7b2851b0943fa23154d62ef URL: https://github.com/kamailio/kamailio/commit/ab3530e753dece24e7b2851b0943fa2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-13T23:32:04+03:00 pkg/kamailio: fixed python module build on RHEL based dists (cherry picked from commit b1c9dac2c382a98997d5771921af5aa3235876c0) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ab3530e753dece24e7b2851b0943fa2… Patch: https://github.com/kamailio/kamailio/commit/ab3530e753dece24e7b2851b0943fa2… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 30aa2f2f1c4..22d577d1d79 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1325,7 +1325,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif WOLFSSL_INTERNAL=no \ group_include="kstandard kautheph kberkeley kcarrierroute \

1 0

git:5.8:98e09433: app_python3: bump to 3.12 for el8/el9
by Sergey Safarov 13 Sep '24

13 Sep '24

Module: kamailio Branch: 5.8 Commit: 98e094331d09b573985e98a54ff442166bc86594 URL: https://github.com/kamailio/kamailio/commit/98e094331d09b573985e98a54ff4421… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-13T23:31:53+03:00 app_python3: bump to 3.12 for el8/el9 (cherry picked from commit 4d87f29248d36d873784827204f272116050343d) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/98e094331d09b573985e98a54ff4421… Patch: https://github.com/kamailio/kamailio/commit/98e094331d09b573985e98a54ff4421… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 17a91dde0f2..30aa2f2f1c4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -812,9 +812,9 @@ Requires: python2, kamailio = %ver BuildRequires: python2, python2-devel %endif %if %{with python3} -%if 0%{?rhel} == 8 -Requires: python39, kamailio = %ver -BuildRequires: python39, python39-devel +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 +Requires: python3.12, kamailio = %ver +BuildRequires: python3.12, python3.12-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1212,7 +1212,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif WOLFSSL_INTERNAL=no \ group_include="kstandard kautheph kberkeley kcarrierroute \

1 0

[kamailio/kamailio] build: unused-variable (Issue #3974)
by sergey-safarov 13 Sep '24

13 Sep '24

``` ldap_mod.c: In function 'child_init': ldap_mod.c:156:13: warning: unused variable 'ret' [-Wunused-variable] 156 | int ret = 0; | ^~~ LD (gcc) [M ldap.so] ldap.so which: no lua-config in (/root/.local/bin:/root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) which: no lua-config in (/root/.local/bin:/root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o LD (gcc) [M app_lua.so] app_lua.so CC (gcc) [M lwsc.so] lwsc_mod.o LD (gcc) [M lwsc.so] lwsc.so ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3974 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3974(a)github.com>

2 1

git:master:a078f140: ldap: remove unused variable in child_init
by Victor Seva 13 Sep '24

13 Sep '24

Module: kamailio Branch: master Commit: a078f14050b6d31bfbcd3562306923c0c4ad73e3 URL: https://github.com/kamailio/kamailio/commit/a078f14050b6d31bfbcd3562306923c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-13T22:07:26+02:00 ldap: remove unused variable in child_init fixes #3974 > ldap_mod.c: In function ��child_init��: > ldap_mod.c:156:13: warning: unused variable ��ret�� [-Wunused-variable] > 156 | int ret = 0; --- Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a078f14050b6d31bfbcd3562306923c… Patch: https://github.com/kamailio/kamailio/commit/a078f14050b6d31bfbcd3562306923c… --- diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index de0e25b1545..27d44b9d88b 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -153,7 +153,6 @@ static int child_init(int rank) { int i = 0, ld_count = 0; char *ld_name; - int ret = 0; /* don't do anything for non-worker processes */ if(rank == PROC_INIT || rank == PROC_MAIN || rank == PROC_TCP_MAIN)

1 0

git:master:8257f042: pkg/kamailio: RPM packaged ims_qos_npn
by Sergey Safarov 13 Sep '24

13 Sep '24

Module: kamailio Branch: master Commit: 8257f042f6bc7b59955b3d103cad55f8be4dac26 URL: https://github.com/kamailio/kamailio/commit/8257f042f6bc7b59955b3d103cad55f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-13T22:43:43+03:00 pkg/kamailio: RPM packaged ims_qos_npn --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8257f042f6bc7b59955b3d103cad55f… Patch: https://github.com/kamailio/kamailio/commit/8257f042f6bc7b59955b3d103cad55f… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8917bf1c045..c182edb28a7 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1980,6 +1980,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_isc %doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos +%doc %{_docdir}/kamailio/modules/README.ims_qos_npn %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf @@ -1995,6 +1996,7 @@ fi %{_libdir}/kamailio/modules/ims_isc.so %{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so +%{_libdir}/kamailio/modules/ims_qos_npn.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so

1 0

git:master:b1c9dac2: pkg/kamailio: fixed python module build on RHEL based dists
by Sergey Safarov 13 Sep '24

13 Sep '24

Module: kamailio Branch: master Commit: b1c9dac2c382a98997d5771921af5aa3235876c0 URL: https://github.com/kamailio/kamailio/commit/b1c9dac2c382a98997d5771921af5aa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-13T22:08:17+03:00 pkg/kamailio: fixed python module build on RHEL based dists --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b1c9dac2c382a98997d5771921af5aa… Patch: https://github.com/kamailio/kamailio/commit/b1c9dac2c382a98997d5771921af5aa… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f642623b4eb..8917bf1c045 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1325,7 +1325,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif WOLFSSL_INTERNAL=no \ group_include="kstandard kautheph kberkeley kcarrierroute \

1 0

git:master:86770d20: core: check for incompatible modes for bind_ipv6_link_local
by Daniel-Constantin Mierla 13 Sep '24

13 Sep '24

Module: kamailio Branch: master Commit: 86770d203bde6859284ec8862be66d78efd2715a URL: https://github.com/kamailio/kamailio/commit/86770d203bde6859284ec8862be66d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-13T08:50:35+02:00 core: check for incompatible modes for bind_ipv6_link_local - a few more debug messages --- Modified: src/core/cfg.y Modified: src/core/socket_info.c Modified: src/core/tcp_main.c Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/86770d203bde6859284ec8862be66d7… Patch: https://github.com/kamailio/kamailio/commit/86770d203bde6859284ec8862be66d7… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index a6ad69b3148..ae1c9ec4b0b 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -999,7 +999,12 @@ assign_stm: ksr_ipv6_hex_style.len = strlen(ksr_ipv6_hex_style.s); } | IPV6_HEX_STYLE error { yyerror("string value expected"); } - | BIND_IPV6_LINK_LOCAL EQUAL NUMBER {sr_bind_ipv6_link_local = $3;} + | BIND_IPV6_LINK_LOCAL EQUAL NUMBER { + sr_bind_ipv6_link_local = $3; + if(sr_bind_ipv6_link_local && (KSR_IPV6_LINK_LOCAL_BIND|KSR_IPV6_LINK_LOCAL_SKIP)) { + yyerror("incompatible modes set"); + } + } | BIND_IPV6_LINK_LOCAL error { yyerror("number expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLOCKLIST(dst_blocklist_init=$3); } | DST_BLST_INIT error { yyerror("boolean value expected"); } diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 4cf1693560a..446878d6b23 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1609,11 +1609,15 @@ static int build_iface_list(void) if(is_link_local) { if(sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_SKIP) { /* skip - config option */ + LM_DBG("skip binding on '%s' (bind mode: %d)\n", + entry->addr, sr_bind_ipv6_link_local); pkg_free(entry); continue; } if(!(sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_BIND)) { /* skip - link local addresses are not bindable without scope */ + LM_DBG("not set to on '%s' (bind mode: %d)\n", entry->addr, + sr_bind_ipv6_link_local); pkg_free(entry); continue; } diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index f5ca2d9ad55..9daaf1ce641 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3148,7 +3148,8 @@ int tcp_init(struct socket_info *sock_info) if((addr->s.sa_family == AF_INET6) && (sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_SKIP) && IN6_IS_ADDR_LINKLOCAL(&addr->sin6.sin6_addr)) { - LM_DBG("skip binding on %s\n", sock_info->address_str.s); + LM_DBG("skip binding on %s (bind mode: %d)\n", sock_info->address_str.s, + sr_bind_ipv6_link_local); return 0; } /* sock_info->proto=PROTO_TCP; */ @@ -3219,7 +3220,8 @@ int tcp_init(struct socket_info *sock_info) /* continue since this is not critical */ } if(sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_BIND) { - LM_INFO("setting scope of %s\n", sock_info->address_str.s); + LM_INFO("setting scope of %s (bind mode: %d)\n", + sock_info->address_str.s, sr_bind_ipv6_link_local); addr->sin6.sin6_scope_id = ipv6_get_netif_scope(sock_info->address_str.s); } diff --git a/src/core/udp_server.c b/src/core/udp_server.c index ef7d2894d0d..476ff0fd9e9 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -418,7 +418,8 @@ int udp_init(struct socket_info *sock_info) if((addr->s.sa_family == AF_INET6) && (sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_SKIP) && IN6_IS_ADDR_LINKLOCAL(&addr->sin6.sin6_addr)) { - LM_DBG("skip binding on %s\n", sock_info->address_str.s); + LM_DBG("skip binding on %s (mode: %d)\n", sock_info->address_str.s, + sr_bind_ipv6_link_local); return 0; } @@ -465,7 +466,8 @@ int udp_init(struct socket_info *sock_info) /* continue since this is not critical */ } if(sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_BIND) { - LM_INFO("setting scope of %s\n", sock_info->address_str.s); + LM_INFO("setting scope of %s (bind mode: %d)\n", + sock_info->address_str.s, sr_bind_ipv6_link_local); addr->sin6.sin6_scope_id = ipv6_get_netif_scope(sock_info->address_str.s); }

1 0

git:master:fd95b950: core: socket info - set address also for link local items
by Daniel-Constantin Mierla 12 Sep '24

12 Sep '24

Module: kamailio Branch: master Commit: fd95b95035a7da088a94888132326d463191da83 URL: https://github.com/kamailio/kamailio/commit/fd95b95035a7da088a94888132326d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-12T16:23:02+02:00 core: socket info - set address also for link local items - updates to log messages --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/fd95b95035a7da088a94888132326d4… Patch: https://github.com/kamailio/kamailio/commit/fd95b95035a7da088a94888132326d4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 120f99b1e49..4cf1693560a 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1574,24 +1574,24 @@ static int build_iface_list(void) for(; RTA_OK(rtap, rtl); rtap = RTA_NEXT(rtap, rtl)) { switch(rtap->rta_type) { case IFA_ADDRESS: + inet_ntop(families[i], RTA_DATA(rtap), entry->addr, + MAX_IF_LEN); if((*(int *)RTA_DATA(rtap)) == htons(0xfe80)) { - LM_DBG("Link Local Address, ignoring ...\n"); + LM_DBG("Link Local Address is '%s'\n", entry->addr); is_link_local = 1; - break; } - inet_ntop(families[i], RTA_DATA(rtap), entry->addr, - MAX_IF_LEN); - LM_DBG("iface <IFA_ADDRESS> addr is %s\n", + LM_DBG("iface <IFA_ADDRESS> address is '%s'\n", entry->addr); break; case IFA_LOCAL: + inet_ntop(families[i], RTA_DATA(rtap), entry->addr, + MAX_IF_LEN); if((*(int *)RTA_DATA(rtap)) == htons(0xfe80)) { - LM_DBG("Link Local Address, ignoring ...\n"); + LM_DBG("Link Local Address is '%s'\n", entry->addr); is_link_local = 1; } - inet_ntop(families[i], RTA_DATA(rtap), entry->addr, - MAX_IF_LEN); - LM_DBG("iface <IFA_LOCAL> addr is %s\n", entry->addr); + LM_DBG("iface <IFA_LOCAL> address is '%s'\n", + entry->addr); break; case IFA_LABEL: LM_DBG("iface name is %s\n", (char *)RTA_DATA(rtap)); @@ -1691,7 +1691,7 @@ int add_interfaces_via_netlink(char *if_name, int family, unsigned short port, if(family && family == tmp->family) { /* check if loopback */ if(ifaces[i].flags & IFF_LOOPBACK) { - LM_DBG("INTERFACE '%s' is loopback", ifaces[i].name); + LM_DBG("INTERFACE '%s' is loopback\n", ifaces[i].name); flags |= SI_IS_LO; } /* save the info */

1 0

git:master:bd4c068e: core: check for items with emtpy address when discovering the network interfaces
by Daniel-Constantin Mierla 12 Sep '24

12 Sep '24

Module: kamailio Branch: master Commit: bd4c068ee9c8e18dc76f8154d3fa4c438972b79c URL: https://github.com/kamailio/kamailio/commit/bd4c068ee9c8e18dc76f8154d3fa4c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-12T10:34:55+02:00 core: check for items with emtpy address when discovering the network interfaces - it may be returned on some OSes, preventing to start --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/bd4c068ee9c8e18dc76f8154d3fa4c4… Patch: https://github.com/kamailio/kamailio/commit/bd4c068ee9c8e18dc76f8154d3fa4c4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a181e43dad8..120f99b1e49 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -207,6 +207,10 @@ static int init_addr_info(struct addr_info *a, char *name, enum si_flags flags) memset(a, 0, sizeof(*a)); a->name.len = strlen(name); + if(a->name.len <= 0) { + LM_ERR("invalid or empty name value\n"); + return -1; + } a->name.s = pkg_malloc(a->name.len + 1); /* include \0 */ if(a->name.s == 0) goto error; @@ -224,16 +228,15 @@ static inline struct addr_info *new_addr_info(char *name, enum si_flags gf) { struct addr_info *al; - al = pkg_malloc(sizeof(*al)); - if(al == 0) + al = pkg_mallocxz(sizeof(*al)); + if(al == 0) { + PKG_MEM_ERROR; goto error; - al->next = 0; - al->prev = 0; + } if(init_addr_info(al, name, gf) != 0) goto error; return al; error: - PKG_MEM_ERROR; if(al) { if(al->name.s) pkg_free(al->name.s); @@ -1677,13 +1680,18 @@ int add_interfaces_via_netlink(char *if_name, int family, unsigned short port, //if(! (ifaces[i].flags & IFF_UP) ) continue; for(tmp = ifaces[i].addresses; tmp; tmp = tmp->next) { - LM_DBG("in add_iface_via_netlink Name %s Address %s\n", + LM_DBG("in add_iface_via_netlink Name '%s' Address '%s'\n", ifaces[i].name, tmp->addr); + if(strlen(tmp->addr) == 0) { + LM_DBG("interface '%s' - skip item with empty address\n", + ifaces[i].name); + continue; + } /* match family */ if(family && family == tmp->family) { /* check if loopback */ if(ifaces[i].flags & IFF_LOOPBACK) { - LM_DBG("INTERFACE %s is loopback", ifaces[i].name); + LM_DBG("INTERFACE '%s' is loopback", ifaces[i].name); flags |= SI_IS_LO; } /* save the info */

1 0

git:master:15823c3e: core: log message about interface flags made info
by Daniel-Constantin Mierla 12 Sep '24

12 Sep '24

Module: kamailio Branch: master Commit: 15823c3eda3a332d22d9132a873d755aa024892f URL: https://github.com/kamailio/kamailio/commit/15823c3eda3a332d22d9132a873d755… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-12T10:10:33+02:00 core: log message about interface flags made info - small updates to a couple of error messages --- Modified: src/core/resolve.c Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/15823c3eda3a332d22d9132a873d755… Patch: https://github.com/kamailio/kamailio/commit/15823c3eda3a332d22d9132a873d755… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index da247952fd9..19b05db90ff 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1792,7 +1792,8 @@ int str2ipbuf(str *st, ip_addr_t *ipb) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { - LM_ERR("invalid name, no conversion to IP address possible\n"); + LM_ERR("invalid name (%p,%d), no conversion to IP address possible\n", + st->s, st->len); return -1; } s = (unsigned char *)st->s; @@ -1902,7 +1903,8 @@ int str2ip6buf(str *st, ip_addr_t *ipb) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { - LM_ERR("invalid name, no conversion to IP address possible\n"); + LM_ERR("invalid name (%p,%d), no conversion to IP address possible\n", + st->s, st->len); return -1; } /* init */ diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a2b3c05c641..a181e43dad8 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1443,7 +1443,7 @@ static int get_flags(int family) if(nlp->nlmsg_len < NLMSG_LENGTH(sizeof(ifi))) goto error; - LM_ERR("Interface with index %d has flags %d\n", ifi->ifi_index, + LM_INFO("Interface with index %d has flags %d\n", ifi->ifi_index, ifi->ifi_flags); if(ifaces == NULL) { LM_ERR("get_flags must not be called on empty interface list"); @@ -1769,7 +1769,7 @@ static int fix_hostname(str *name, struct ip_addr *address, str *address_str, /* get "official hostnames", all the aliases etc. */ he = resolvehost(name->s); if(he == 0) { - LM_ERR("could not resolve %s\n", name->s); + LM_ERR("could not resolve '%s'\n", name->s); goto error; } /* check if we got the official name */

1 0

[kamaillio/kamaillio] Option to create a domain via RPC
by auke＠noppe.nl 12 Sep '24

12 Sep '24

Hi, We want our multi-tenant system to integrate with Kamaillio, and we are trying to use json-rpc to interact with Kamaillio. However, it seems that it is not possible to create a domain using a rpc call, according to the docs it's only possible to issue a reload or dump command. Is it possible to create a domain remotely, preferably using json-RPC? Regards, Auke Noppe

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev