- sr-dev - kamailio.org

git:master:569b5364: tm: mark request with final reply flag
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 569b536404afd855742a42320d7c858a8bb4952b URL: https://github.com/kamailio/kamailio/commit/569b536404afd855742a42320d7c858… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T14:11:29+01:00 tm: mark request with final reply flag - send error function checks flag and returns if set to avoid sending more than one final reply in case of failure --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/569b536404afd855742a42320d7c858… Patch: https://github.com/kamailio/kamailio/commit/569b536404afd855742a42320d7c858… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index f52ecc7d3ad..e012dc29c28 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -640,6 +640,11 @@ static int _reply_light(struct cell *trans, char *buf, unsigned int len, * (timer_allow_del()) (there's no chance of having the wait handler * executed while we still need t) --andrei */ put_on_wait(trans); + + /* mark the request with final reply flag */ + if(trans->uas.request != NULL) { + trans->uas.request->msg_flags |= FL_FINAL_REPLY; + } } pkg_free(buf); LM_DBG("finished\n"); diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 0be958a0848..0147bf44579 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1608,6 +1608,11 @@ int ki_t_reply_error(sip_msg_t *msg) int sip_err; int ret; + if(msg->msg_flags & FL_FINAL_REPLY) { + LM_INFO("message marked with final-reply flag\n"); + return -2; + } + ret = err2reason_phrase( prev_ser_error, &sip_err, err_buffer, sizeof(err_buffer), "TM"); if(ret > 0) {

1 0

git:master:1a2477ba: sl: mark request with final reply flag
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 1a2477ba348928e6bdff15be765cb907e32cffc4 URL: https://github.com/kamailio/kamailio/commit/1a2477ba348928e6bdff15be765cb90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T14:02:47+01:00 sl: mark request with final reply flag - send error function checks flag and returns if set to avoid sending more than one final reply in case of failures --- Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/1a2477ba348928e6bdff15be765cb90… Patch: https://github.com/kamailio/kamailio/commit/1a2477ba348928e6bdff15be765cb90… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 2a8f49fe78c..83eb8bac0d3 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -335,6 +335,12 @@ static int w_send_reply(struct sip_msg *msg, char *p1, char *p2) static int ki_send_reply_error(sip_msg_t *msg) { int ret; + + if(msg->msg_flags & FL_FINAL_REPLY) { + LM_INFO("message marked with final-reply flag\n"); + return -2; + } + if(sl_bind_tm != 0 && tmb.t_reply_error != NULL) { ret = tmb.t_reply_error(msg); if(ret > 0) { diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 253686a4a77..29ef6835e22 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -337,6 +337,10 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) goto error; } + if(code >= 200) { + msg->msg_flags |= FL_FINAL_REPLY; + } + update_sl_stats(code); return 1; @@ -408,6 +412,11 @@ int sl_reply_error(struct sip_msg *msg) return -2; } + if(msg->msg_flags & FL_FINAL_REPLY) { + LM_INFO("message marked with final-reply flag\n"); + return -2; + } + ret = err2reason_phrase( prev_ser_error, &sip_error, err_buf, sizeof(err_buf), "SL"); if(ret > 0) {

1 0

git:master:c3b47e0c: core: parser - flag to mark request when a local final reply is sent
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: c3b47e0c5cf4ed405b02aa2d0d4cb31073bab0aa URL: https://github.com/kamailio/kamailio/commit/c3b47e0c5cf4ed405b02aa2d0d4cb31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T13:50:08+01:00 core: parser - flag to mark request when a local final reply is sent --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/c3b47e0c5cf4ed405b02aa2d0d4cb31… Patch: https://github.com/kamailio/kamailio/commit/c3b47e0c5cf4ed405b02aa2d0d4cb31… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 67650523451..303c8c04248 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -133,6 +133,8 @@ typedef enum request_method /* WARNING: Value (1 << 31) is reserved for use in kamailio * nat_traversal module (flag FL_DO_KEEPALIVE)! */ +#define FL_FINAL_REPLY (1ULL << 32) /* final reply sent */ + #define FL_MTU_FB_MASK (FL_MTU_TCP_FB | FL_MTU_TLS_FB | FL_MTU_SCTP_FB)

1 0

git:master:15aafe49: presence: prefix short global variables
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 15aafe49a6a022809f278f596812c97dc5404982 URL: https://github.com/kamailio/kamailio/commit/15aafe49a6a022809f278f596812c97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T13:25:04+01:00 presence: prefix short global variables --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/subscribe.c Modified: src/modules/presence/utils_func.c --- Diff: https://github.com/kamailio/kamailio/commit/15aafe49a6a022809f278f596812c97… Patch: https://github.com/kamailio/kamailio/commit/15aafe49a6a022809f278f596812c97…

1 0

git:master:7da07508: presence: removed unused external variable
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 7da07508bc74a6a0c87e1dc7993d0061b65e2faa URL: https://github.com/kamailio/kamailio/commit/7da07508bc74a6a0c87e1dc7993d006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T13:18:15+01:00 presence: removed unused external variable --- Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/7da07508bc74a6a0c87e1dc7993d006… Patch: https://github.com/kamailio/kamailio/commit/7da07508bc74a6a0c87e1dc7993d006… --- diff --git a/src/modules/presence/publish.c b/src/modules/presence/publish.c index 2399ff43e10..fa39498d986 100644 --- a/src/modules/presence/publish.c +++ b/src/modules/presence/publish.c @@ -46,8 +46,6 @@ #include "publish.h" #include "presentity.h" -extern gen_lock_set_t *set; - static str pu_400a_rpl = str_init("Bad request"); static str pu_400b_rpl = str_init("Invalid request"); static str pu_500_rpl = str_init("Server Internal Error"); @@ -713,4 +711,4 @@ int update_hard_presentity( } return ret; -} \ No newline at end of file +}

1 0

git:master:05076041: lib: presence - remove old commented code and adjust comments
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 050760411bac006c1e6351f179fab7ea6333b3e5 URL: https://github.com/kamailio/kamailio/commit/050760411bac006c1e6351f179fab7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T09:29:31+01:00 lib: presence - remove old commented code and adjust comments --- Modified: src/lib/presence/notifier_domain.c Modified: src/lib/presence/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/050760411bac006c1e6351f179fab7e… Patch: https://github.com/kamailio/kamailio/commit/050760411bac006c1e6351f179fab7e… --- diff --git a/src/lib/presence/notifier_domain.c b/src/lib/presence/notifier_domain.c index 56773d13c1c..8f03828c119 100644 --- a/src/lib/presence/notifier_domain.c +++ b/src/lib/presence/notifier_domain.c @@ -223,33 +223,6 @@ static void free_subscription(qsa_subscription_t *s) cds_free(s); } -/*static void add_server_subscription(notifier_t *n, qsa_subscription_t *s) -{ - server_subscription_t server_s; - - server_s.notifier_data = NULL; - if (n->subscribe(n, &s->record_id, s, &server_s.notifier_data) == 0) { - server_s.notifier = n; - vector_add(&s->server_subscriptions, &server_s); - } - else ERROR_LOG("subscription not accepted by notifier %p\n", n); -} - -static void remove_notifier_from_subscription(qsa_subscription_t *s, notifier_t *n) -{ - int cnt,i; - - cnt = vector_size(&s->server_subscriptions); - for (i = 0; i < cnt; i++) { - ss = vector_get_ptr(&s->server_subscriptions, i); - if (!ss) continue; - / * FIXME: call n->unsubscribe ??? - * NO this is called from unregister which is initiated - * by the notifier (may be synchronized there!) * / - if (ss->notifier == n) ss->notifier = NULL; / * "zombie" * / - } -} -*/ /* -------- Domain initialization/destruction functions -------- */ diff --git a/src/lib/presence/pidf.c b/src/lib/presence/pidf.c index d875ce974c4..3f00314a5fa 100644 --- a/src/lib/presence/pidf.c +++ b/src/lib/presence/pidf.c @@ -170,9 +170,9 @@ static void doc_add_presentity( DEBUG_LOG("doc_add_presentity()\n"); if(use_cpim_pidf_ns) - dstr_append_zt( - buf, "<presence xmlns=\"urn:ietf:params:xml:ns:cpim-pidf\" " - "entity=\""); + dstr_append_zt(buf, + "<presence xmlns=\"urn:ietf:params:xml:ns:cpim-pidf\" " + "entity=\""); else dstr_append_zt(buf, "<presence xmlns=\"urn:ietf:params:xml:ns:pidf\" entity=\""); @@ -402,7 +402,7 @@ static int read_tuple(xmlNode *tuple, presence_tuple_info_t **dst, status = presence_tuple_open; if(strcasecmp(s, "closed") == 0) status = presence_tuple_closed; - /* FIXME: handle not standardized variants too (add note to basic status) */ + /* NOTE: handle not standardized variants too (add note to basic status) */ /* get ID from tuple node attribute? */ id.s = (char *)get_attr_value(find_attr(tuple->properties, "id")); @@ -433,7 +433,7 @@ static int read_tuple(xmlNode *tuple, presence_tuple_info_t **dst, } else if(cmp_node(n, "status", ns) >= 0) { /* skip, already processed */ } else if(cmp_node(n, "timestamp", ns) >= 0) { - /* FIXME: process */ + /* TODO: process */ } else { /* PIDF extensions - only from non-PIDF namespace? */ res = read_extension(n, &ex, doc); if((res == 0) && ex)

1 0

git:master:0a11489d: lib/srdb2: review and adapt old comments
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 0a11489d4b699a62596b2c4626171e8d92e966fd URL: https://github.com/kamailio/kamailio/commit/0a11489d4b699a62596b2c4626171e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-21T10:20:39+01:00 lib/srdb2: review and adapt old comments --- Modified: src/lib/srdb2/db_cmd.c Modified: src/lib/srdb2/db_gen.h --- Diff: https://github.com/kamailio/kamailio/commit/0a11489d4b699a62596b2c4626171e8… Patch: https://github.com/kamailio/kamailio/commit/0a11489d4b699a62596b2c4626171e8… --- diff --git a/src/lib/srdb2/db_cmd.c b/src/lib/srdb2/db_cmd.c index 2782f4dc7c5..9ba1d22ee66 100644 --- a/src/lib/srdb2/db_cmd.c +++ b/src/lib/srdb2/db_cmd.c @@ -58,7 +58,7 @@ db_cmd_t *db_cmd(enum db_cmd_type type, db_ctx_t *ctx, char *table, newp->type = type; - /** FIXME: it is not clear now that this is necessary + /** NOTE: it is not clear now that this is necessary * when we have match and value separate arrays */ if(result) { newp->result = db_fld_copy(result); @@ -78,7 +78,7 @@ db_cmd_t *db_cmd(enum db_cmd_type type, db_ctx_t *ctx, char *table, goto err; } - /* FIXME: This should be redesigned so that we do not need to connect + /* NOTE: This should be redesigned so that we do not need to connect * connections in context before commands are created, this takes splitting * the command initialization sequence in two steps, one would be creating * all the data structures and the second would be checking corresponding @@ -242,7 +242,6 @@ int db_exec(db_res_t **res, db_cmd_t *cmd) return -1; } - /* FIXME */ db_payload_idx = 0; ret = cmd->exec[0](r, cmd); if(ret < 0) { diff --git a/src/lib/srdb2/db_gen.h b/src/lib/srdb2/db_gen.h index eca24c76046..f8dd483b87a 100644 --- a/src/lib/srdb2/db_gen.h +++ b/src/lib/srdb2/db_gen.h @@ -95,7 +95,7 @@ extern "C" */ /* - * FIXME: We should find some other way of doing this than just copying + * NOTE: We should find some other way of doing this than just copying * and pasting the code from STAILQ_FOREACH */ #define DBLIST_FOREACH(var, head) \ @@ -111,7 +111,7 @@ extern "C" */ /* - * FIXME: We should find some other way of doing this than just copying + * NOTE: We should find some other way of doing this than just copying * and pasting the code from STAILQ_FOREACH_SAFE */ #define DBLIST_FOREACH_SAFE(var, head, tvar) \

1 0

git:master:67f71d1b: lib/xcap: reviewed and removed old comments and disabled code
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 67f71d1b7c44a7d3ef1ba2917272e2ba36608cd7 URL: https://github.com/kamailio/kamailio/commit/67f71d1b7c44a7d3ef1ba2917272e2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-20T12:37:12+01:00 lib/xcap: reviewed and removed old comments and disabled code --- Modified: src/lib/xcap/common_policy.c Modified: src/lib/xcap/parse_common_rules.c Modified: src/lib/xcap/resource_list.c Modified: src/lib/xcap/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/67f71d1b7c44a7d3ef1ba2917272e2b… Patch: https://github.com/kamailio/kamailio/commit/67f71d1b7c44a7d3ef1ba2917272e2b… --- diff --git a/src/lib/xcap/common_policy.c b/src/lib/xcap/common_policy.c index a7d33d95d5d..0f887aa7ce7 100644 --- a/src/lib/xcap/common_policy.c +++ b/src/lib/xcap/common_policy.c @@ -175,7 +175,7 @@ int is_rule_for_uri(cp_rule_t *rule, const str_t *uri) if(!rule) return 0; if(!rule->conditions) - return 1; /* FIXME: ??? */ + return 1; id = rule->conditions->identity; if(!id) return 0; diff --git a/src/lib/xcap/parse_common_rules.c b/src/lib/xcap/parse_common_rules.c index 0e46ace7161..ca3f4599c06 100644 --- a/src/lib/xcap/parse_common_rules.c +++ b/src/lib/xcap/parse_common_rules.c @@ -211,13 +211,11 @@ static int read_conditions(xmlNode *cn, cp_conditions_t **dst) while(n) { if(n->type == XML_ELEMENT_NODE) { if(cmp_node(n, "validity", common_policy_ns) >= 0) { - /* FIXME: free existing validity */ res = read_validity(n, &(*dst)->validity); if(res != 0) break; } else { if(cmp_node(n, "identity", common_policy_ns) >= 0) { - /* FIXME: free existing identity */ res = read_identity(n, &(*dst)->identity); if(res != 0) break; diff --git a/src/lib/xcap/resource_list.c b/src/lib/xcap/resource_list.c index cb7d111057f..928c133df51 100644 --- a/src/lib/xcap/resource_list.c +++ b/src/lib/xcap/resource_list.c @@ -169,9 +169,9 @@ void free_traversed_list(traversed_list_t *list) /* ------- helper functions (doing flat list) ------- */ +/* absolute uri from ref (RFC 3986, section 5.2) */ static char *relative2absolute_uri(const str_t *xcap_root, const char *relative) { - /* FIXME: do absolute uri from ref (RFC 3986, section 5.2) */ int len; int root_len = 0; int rel_len = 0; diff --git a/src/lib/xcap/xcap_client.c b/src/lib/xcap/xcap_client.c index c633f3c7f5f..2fe6e41d1d6 100644 --- a/src/lib/xcap/xcap_client.c +++ b/src/lib/xcap/xcap_client.c @@ -284,13 +284,8 @@ int xcap_query( /* follow redirects (needed for apache mod_speling - case insesitive names) */ curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1); - /* curl_easy_setopt(handle, CURLOPT_TCP_NODELAY, 1); - curl_easy_setopt(handle, CURLOPT_CONNECTTIMEOUT, 10);*/ - /* Accept headers */ - res = curl_easy_perform(handle); - /* curl_easy_cleanup(handle); */ /* FIXME: experimental */ } else ERROR_LOG("can't initialize curl handle\n"); if(res == 0) {

1 0

git:master:e8ee31f6: lib/cds: reviewed and removed old comments
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: e8ee31f6bce32050f8caaa8d053ddaea8d99cc1d URL: https://github.com/kamailio/kamailio/commit/e8ee31f6bce32050f8caaa8d053ddae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-20T12:16:13+01:00 lib/cds: reviewed and removed old comments --- Modified: src/lib/cds/dbid.c Modified: src/lib/cds/simple_profile.c Modified: src/lib/cds/sstr.c --- Diff: https://github.com/kamailio/kamailio/commit/e8ee31f6bce32050f8caaa8d053ddae… Patch: https://github.com/kamailio/kamailio/commit/e8ee31f6bce32050f8caaa8d053ddae… --- diff --git a/src/lib/cds/dbid.c b/src/lib/cds/dbid.c index 5eb2ab20edc..fc4a47deb6d 100644 --- a/src/lib/cds/dbid.c +++ b/src/lib/cds/dbid.c @@ -9,7 +9,6 @@ void generate_dbid_ptr(dbid_t dst, void *data_ptr) { /* TODO: add cluster distinctive member */ - /* FIXME: replace sprintf by something more effective */ snprintf(dst, MAX_DBID_LEN, "%px%xx%x", data_ptr, (int)time(NULL), rand()); } @@ -26,7 +25,6 @@ void generate_dbid(dbid_t dst) } /* TODO: add cluster distinctive member */ - /* FIXME: replace sprintf by something more effective */ snprintf(dst, MAX_DBID_LEN, "%xy%xy%xy%x", my_pid, cntr++, (int)time(NULL), rand()); } diff --git a/src/lib/cds/simple_profile.c b/src/lib/cds/simple_profile.c index f166ec8b0db..f20211776a0 100644 --- a/src/lib/cds/simple_profile.c +++ b/src/lib/cds/simple_profile.c @@ -4,9 +4,6 @@ #include <sys/time.h> #include <string.h> -/* FIXME: only for testing */ -/*#include "dprint.h"*/ - #define trace_signal SIGTRAP typedef void (*_sig_t)(int); diff --git a/src/lib/cds/sstr.c b/src/lib/cds/sstr.c index 5b065fdcbe5..a342fbb26dc 100644 --- a/src/lib/cds/sstr.c +++ b/src/lib/cds/sstr.c @@ -263,7 +263,6 @@ char *str_strchr(const str_t *s, char c) char *str_str(const str_t *s, const str_t *search_for) { int i, j; - /* FIXME: reimplement using better algorithm */ if(is_str_empty(search_for)) return s->s;

1 0

[kamailio/kamailio] ASYNC functions in event_route[xhttp:request] don't work (Issue #3720)
by vsaranov 21 Jan '24

21 Jan '24

### Description When calling the async_route() from event_route[xhttp:request], an error occurs. ERROR: tm [t_lookup.c:769]: t_lookup_request(): too few headers ERROR: async [async_sleep.c:238]: async_sleep(): cannot create the transaction #### Reproduction The problem is reproducible. Below is a fragment of the configuration file. ... listen=tcp:192.168.3.115:8080 loadmodule "xhttp.so" loadmodule "async.so" ... event_route[xhttp:request] { async_route("TEST", "2"); exit; } route[TEST] { xhttp_reply("200", "OK", "text/html", "<html><body>URL $hu</body></html>\r\n"); exit; } Making a HTTP-request: curl -X POST http://192.168.3.115:8080/test \ -H "Content-Type: application/json" \ -d '{"test": 1}' #### Log Messages [messages.zip](https://github.com/kamailio/kamailio/files/13994226/messages.… ### Additional Information #kamailio -v version: kamailio 5.7.3 (x86_64/linux) e4d96b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e4d96b compiled on 12:59:36 Nov 17 2023 with gcc 4.8.5 * **Operating System**: #cat /etc/redhat-release CentOS Linux release 7.9.2009 (Core) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3720 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3720(a)github.com>

4 9

[kamailio/kamailio] failed to open database connection (Issue #3721)
by faratell 20 Jan '24

20 Jan '24

Hello. I have installed Kamailio version devel on Ubuntu 22.04 and use the mysql database on the same machine. when i run systemctl status kamailio.service ● kamailio.service - LSB: Start the Kamailio SIP proxy server Loaded: loaded (/etc/init.d/kamailio; generated) Active: active (exited) since Sat 2024-01-20 11:35:09 +0330; 21min ago Docs: man:systemd-sysv-generator(8) CPU: 48ms faraz /usr/local/sbin/kamailio[173481]: ERROR: usrloc [dlist.c:846]: register_udomain(): failed to open database connection faraz /usr/local/sbin/kamailio[173481]: ERROR: registrar [registrar.c:767]: domain_fixup(): failed to register domain faraz /usr/local/sbin/kamailio[173481]: ERROR: <core> [core/route.c:1193]: fix_actions(): fixing failed (code=-1) at cfg:/usr/local/etc/kamailio/kamailio.cfg:717 faraz /usr/local/sbin/kamailio[173481]: ERROR: <core> [core/rvalue.c:3818]: fix_rval_expr(): failure in cfg at line: 717 col: 22 faraz /usr/local/sbin/kamailio[173481]: ERROR: <core> [core/rvalue.c:3818]: fix_rval_expr(): failure in cfg at line: 717 col: 22 faraz /usr/local/sbin/kamailio[173481]: ERROR: <core> [core/route.c:1193]: fix_actions(): fixing failed (code=-1) at cfg:/usr/local/etc/kamailio/kamailio.cfg:720 faraz /usr/local/sbin/kamailio[173481]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized faraz kamailio[173463]: * already running faraz kamailio[173463]: ...done. faraz systemd[1]: Started LSB: Start the Kamailio SIP proxy server. In /usr/local/etc/kamailio/kamctlrc, I uncomment these lines: SIP_DOMAIN=ims.mnc55.mcc999.farazNET.org DBENGINE=MYSQL DBHOST=localhost in /usr/local/etc/kamailio/kamailio.cfg i apply this changes: auto_aliases=no alias="ims.mnc55.mcc999.farazNET.org" listen=udp:192.168.75.185:5060 listen=tcp:192.168.75.185:5060 how can i solved it? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3721 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3721(a)github.com>

2 2

[kamailio/kamailio] error in install tls-wolfssh modul (Issue #3712)
by faratell 20 Jan '24

20 Jan '24

Hello. I am trying to install Kamailio branch devel for using Volte on open5gs. when compiled have this error: /bin/sh: 3: ./autogen.sh: not found env: ‘./configure’: No such file or directory make[2]: *** [Makefile:28: ../../../misc/external/wolfssl/build/include/wolfssl/options.h] Error 127 make[2]: Leaving directory '/usr/local/src/kamailio-devel/kamailio/src/modules/tls_wolfssl' make[1]: *** [Makefile:508: modules] Error 1 make[1]: Leaving directory '/usr/local/src/kamailio-devel/kamailio/src' make: *** [Makefile:34: all] Error 2 I answer my question also on the user mailing list but no one reply me. It is noticeable that I installed libwolfssl-dev. Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3712 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3712(a)github.com>

2 2

[kamailio/kamailio] dialog: failover database loading behaviour in shared DB scenario, expiration of dialogs (#2080)
by Henning Westerholt 20 Jan '24

20 Jan '24

The dialog module will expire dialogs that don't actually belong to the particular proxy. Scenario: 2 proxies on 5.2.4 with a loadbalancer in front. Call was routed over proxy1, dialog timeout on proxy2 was shorter (to make it easier to reproduce it). The results: * Dialog synchronized with DMQ: proxy 2 would timeout the dialog * Dialog entry synchronized to proxy2 DB and proxy2 restarted: Proxy2 would timeout the dialog * Dialog entry synchronized to proxy2 DB and proxy2 not restarted: Proxy2 would _not_ timeout the dialog (I’ve tried both db_mode 1 and 2) So the proxy2 would load the dialog into memory and then later expire it. So timeout routes, send_bye on timeout would not work correctly. One idea to solve this would be to check e.g. over the existing socket data if the dialog belongs to this proxy and skip loading it in this case. This could be also made configurable e.g. with a module parameter. Any comments? Better ideas how to solve it? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2080

5 9

git:master:2f7b7a57: github: remove cleanup workflow [skip ci]
by Victor Seva 19 Jan '24

19 Jan '24

Module: kamailio Branch: master Commit: 2f7b7a5750815814bedb4b2a6b3716ea72e4d904 URL: https://github.com/kamailio/kamailio/commit/2f7b7a5750815814bedb4b2a6b3716e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-19T15:41:15+01:00 github: remove cleanup workflow [skip ci] it's removing untagged images that are layers of the tagged ones --- Removed: .github/workflows/cleanup.yml --- Diff: https://github.com/kamailio/kamailio/commit/2f7b7a5750815814bedb4b2a6b3716e… Patch: https://github.com/kamailio/kamailio/commit/2f7b7a5750815814bedb4b2a6b3716e… --- diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml deleted file mode 100644 index 47818602368..00000000000 --- a/.github/workflows/cleanup.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: cleanup packages -on: - schedule: - - cron: '0 5 * * *' - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: -jobs: - x86_64: - runs-on: ubuntu-latest - permissions: - packages: write - strategy: - matrix: - image_name: - - kamailio - - kamailio-ci - - kamailio-master-devcontainer - - pkg-kamailio-docker - steps: - - name: Delete untagged images - uses: camargo/delete-untagged-action@v1 - with: - github-token: ${{ secrets.CLEAN_PACKAGES }} - package-name: ${{ matrix.image_name }}

1 0

git:master:f59dacf7: p_usrloc: Add missing api function get_udomain()
by Stefan-Cristian Mititelu 19 Jan '24

19 Jan '24

Module: kamailio Branch: master Commit: f59dacf7993da83553cd67de516fc31f493d2a7d URL: https://github.com/kamailio/kamailio/commit/f59dacf7993da83553cd67de516fc31… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-01-19T15:54:24+02:00 p_usrloc: Add missing api function get_udomain() When registrar kemi save()/save_uri() function is called, then usrloc api function get_udomain() is called. This usrloc api function is missing in p_usrloc module and results in a segfault. --- Modified: src/modules/p_usrloc/dlist.c Modified: src/modules/p_usrloc/dlist.h Modified: src/modules/p_usrloc/usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/f59dacf7993da83553cd67de516fc31… Patch: https://github.com/kamailio/kamailio/commit/f59dacf7993da83553cd67de516fc31… --- diff --git a/src/modules/p_usrloc/dlist.c b/src/modules/p_usrloc/dlist.c index fa66b20b9a7..0a7080e2c63 100644 --- a/src/modules/p_usrloc/dlist.c +++ b/src/modules/p_usrloc/dlist.c @@ -171,3 +171,42 @@ int synchronize_all_udomains(void) LM_INFO("not available with partitioned interface\n"); return res; } + +/*! + * \brief Registers a new domain with usrloc + * + * Find and return a usrloc domain (location table) + * \param _n domain name + * \param _d usrloc domain + * \return 0 on success, -1 on failure + */ +int get_udomain(const char *_n, udomain_t **_d) +{ + struct domain_list_item *item; + str s; + + if(_n == NULL) { + LM_ERR("null location table name\n"); + goto notfound; + } + + s.s = (char *)_n; + s.len = strlen(_n); + if(s.len <= 0) { + LM_ERR("empty location table name\n"); + goto notfound; + } + + item = find_dlist(&s); + if(item == NULL) { + LM_ERR("domain %s not found.\n", _n); + goto notfound; + } + + *_d = &item->domain; + return 0; + +notfound: + *_d = NULL; + return -1; +} diff --git a/src/modules/p_usrloc/dlist.h b/src/modules/p_usrloc/dlist.h index 20152694f4f..662847fb131 100644 --- a/src/modules/p_usrloc/dlist.h +++ b/src/modules/p_usrloc/dlist.h @@ -118,5 +118,13 @@ int get_all_ucontacts(void *, int, unsigned int, unsigned int part_idx, */ int find_domain(str *_d, udomain_t **_p); +/*! + * \brief Find and return usrloc domain + * + * \param _n domain name + * \param _d usrloc domain (location table) + * \return 0 on success, -1 on failure + */ +int get_udomain(const char *_n, udomain_t **_d); #endif diff --git a/src/modules/p_usrloc/usrloc.c b/src/modules/p_usrloc/usrloc.c index 6de32f2eeda..221f2d68262 100644 --- a/src/modules/p_usrloc/usrloc.c +++ b/src/modules/p_usrloc/usrloc.c @@ -79,5 +79,6 @@ int bind_usrloc(usrloc_api_t *api) api->db_mode = db_mode; api->nat_flag = nat_bflag; + api->get_udomain = get_udomain; return 0; }

1 0

git:5.6:5fea7e17: xlog: add kemi xlog_facility function
by Stefan-Cristian Mititelu 19 Jan '24

19 Jan '24

Module: kamailio Branch: 5.6 Commit: 5fea7e17389dfc71efee7caff215668335867699 URL: https://github.com/kamailio/kamailio/commit/5fea7e17389dfc71efee7caff215668… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-01-19T15:39:14+02:00 xlog: add kemi xlog_facility function (cherry-picked from commit e506b60c1045cfbd4485434165305fbc2fb57aa9) --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/5fea7e17389dfc71efee7caff215668… Patch: https://github.com/kamailio/kamailio/commit/5fea7e17389dfc71efee7caff215668… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index a6fe9e9aace..94920ca421d 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -877,8 +877,9 @@ static int xlog_log_colors_param(modparam_t type, void *val) /** * write message after evaluation of lmsg for pseudo-variables */ -int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) +int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) { + int lf = xlog_facility; pv_elem_t *xmodel = NULL; str txt = {0, 0}; @@ -895,13 +896,23 @@ int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) pv_elem_free_all(xmodel); return -1; } - LOG_FN(xlog_facility, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); + + if(lfacility != NULL) { + lfacility->s[lfacility->len] = '\0'; + lf = str2facility(lfacility->s); + if(lf == -1) { + LM_WARN("invalid syslog facility %.*s, using default\n", + lfacility->len, lfacility->s); + lf = xlog_facility; + } + } + LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); ; pv_elem_free_all(xmodel); return 1; } -int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +int ki_xlog_get_level(str *slevel) { int llevel; @@ -926,42 +937,55 @@ int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) } else { llevel = L_ERR; } - return ki_xlog_ex(msg, llevel, lmsg); + + return llevel; +} + +int ki_xlog_facility(sip_msg_t *msg, str *lfacility, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, lfacility, llevel, lmsg); +} + +int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, NULL, llevel, lmsg); } int ki_xdbg(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_DBG, lmsg); + return ki_xlog_ex(msg, NULL, L_DBG, lmsg); } int ki_xerr(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ERR, lmsg); + return ki_xlog_ex(msg, NULL, L_ERR, lmsg); } int ki_xinfo(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_INFO, lmsg); + return ki_xlog_ex(msg, NULL, L_INFO, lmsg); } int ki_xnotice(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_NOTICE, lmsg); + return ki_xlog_ex(msg, NULL, L_NOTICE, lmsg); } int ki_xwarn(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_WARN, lmsg); + return ki_xlog_ex(msg, NULL, L_WARN, lmsg); } int ki_xalert(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ALERT, lmsg); + return ki_xlog_ex(msg, NULL, L_ALERT, lmsg); } int ki_xcrit(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_CRIT, lmsg); + return ki_xlog_ex(msg, NULL, L_CRIT, lmsg); } /** @@ -1009,6 +1033,11 @@ static sr_kemi_t sr_kemi_xlog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("xlog"), str_init("xlog_facility"), + SR_KEMIP_INT, ki_xlog_facility, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:5.7:306b4b09: xlog: add kemi xlog_facility function
by Stefan-Cristian Mititelu 19 Jan '24

19 Jan '24

Module: kamailio Branch: 5.7 Commit: 306b4b09e3cb46a0fe8bc2d25344e5cfa52941e0 URL: https://github.com/kamailio/kamailio/commit/306b4b09e3cb46a0fe8bc2d25344e5c… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-01-19T15:38:26+02:00 xlog: add kemi xlog_facility function (cherry picked from commit e506b60c1045cfbd4485434165305fbc2fb57aa9) --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/306b4b09e3cb46a0fe8bc2d25344e5c… Patch: https://github.com/kamailio/kamailio/commit/306b4b09e3cb46a0fe8bc2d25344e5c… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index 03063bbfb1f..c7d239ea299 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -878,8 +878,9 @@ static int xlog_log_colors_param(modparam_t type, void *val) /** * write message after evaluation of lmsg for pseudo-variables */ -int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) +int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) { + int lf = xlog_facility; pv_elem_t *xmodel = NULL; str txt = {0, 0}; @@ -896,13 +897,23 @@ int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) pv_elem_free_all(xmodel); return -1; } - LOG_FN(xlog_facility, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); + + if(lfacility != NULL) { + lfacility->s[lfacility->len] = '\0'; + lf = str2facility(lfacility->s); + if(lf == -1) { + LM_WARN("invalid syslog facility %.*s, using default\n", + lfacility->len, lfacility->s); + lf = xlog_facility; + } + } + LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); ; pv_elem_free_all(xmodel); return 1; } -int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +int ki_xlog_get_level(str *slevel) { int llevel; @@ -927,42 +938,55 @@ int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) } else { llevel = L_ERR; } - return ki_xlog_ex(msg, llevel, lmsg); + + return llevel; +} + +int ki_xlog_facility(sip_msg_t *msg, str *lfacility, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, lfacility, llevel, lmsg); +} + +int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, NULL, llevel, lmsg); } int ki_xdbg(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_DBG, lmsg); + return ki_xlog_ex(msg, NULL, L_DBG, lmsg); } int ki_xerr(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ERR, lmsg); + return ki_xlog_ex(msg, NULL, L_ERR, lmsg); } int ki_xinfo(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_INFO, lmsg); + return ki_xlog_ex(msg, NULL, L_INFO, lmsg); } int ki_xnotice(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_NOTICE, lmsg); + return ki_xlog_ex(msg, NULL, L_NOTICE, lmsg); } int ki_xwarn(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_WARN, lmsg); + return ki_xlog_ex(msg, NULL, L_WARN, lmsg); } int ki_xalert(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ALERT, lmsg); + return ki_xlog_ex(msg, NULL, L_ALERT, lmsg); } int ki_xcrit(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_CRIT, lmsg); + return ki_xlog_ex(msg, NULL, L_CRIT, lmsg); } /** @@ -1010,6 +1034,11 @@ static sr_kemi_t sr_kemi_xlog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("xlog"), str_init("xlog_facility"), + SR_KEMIP_INT, ki_xlog_facility, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] xlog: add kemi xlog_facility function (PR #3708)
by Stefan Mititelu 19 Jan '24

19 Jan '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) - [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  Add kemi xlog function to be able to log in other facilities other than the default one. Can this be backported to 5.6 and 5.7? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3708 -- Commit Summary -- * xlog: add kemi xlog_facility function -- File Changes -- M src/modules/xlog/xlog.c (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3708.patch https://github.com/kamailio/kamailio/pull/3708.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3708 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3708(a)github.com>

2 4

git:master:e506b60c: xlog: add kemi xlog_facility function
by Stefan Mititelu 19 Jan '24

19 Jan '24

Module: kamailio Branch: master Commit: e506b60c1045cfbd4485434165305fbc2fb57aa9 URL: https://github.com/kamailio/kamailio/commit/e506b60c1045cfbd4485434165305fb… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2024-01-19T15:34:37+02:00 xlog: add kemi xlog_facility function --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/e506b60c1045cfbd4485434165305fb… Patch: https://github.com/kamailio/kamailio/commit/e506b60c1045cfbd4485434165305fb… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index 03063bbfb1f..c7d239ea299 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -878,8 +878,9 @@ static int xlog_log_colors_param(modparam_t type, void *val) /** * write message after evaluation of lmsg for pseudo-variables */ -int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) +int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) { + int lf = xlog_facility; pv_elem_t *xmodel = NULL; str txt = {0, 0}; @@ -896,13 +897,23 @@ int ki_xlog_ex(sip_msg_t *msg, int llevel, str *lmsg) pv_elem_free_all(xmodel); return -1; } - LOG_FN(xlog_facility, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); + + if(lfacility != NULL) { + lfacility->s[lfacility->len] = '\0'; + lf = str2facility(lfacility->s); + if(lf == -1) { + LM_WARN("invalid syslog facility %.*s, using default\n", + lfacility->len, lfacility->s); + lf = xlog_facility; + } + } + LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); ; pv_elem_free_all(xmodel); return 1; } -int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +int ki_xlog_get_level(str *slevel) { int llevel; @@ -927,42 +938,55 @@ int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) } else { llevel = L_ERR; } - return ki_xlog_ex(msg, llevel, lmsg); + + return llevel; +} + +int ki_xlog_facility(sip_msg_t *msg, str *lfacility, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, lfacility, llevel, lmsg); +} + +int ki_xlog(sip_msg_t *msg, str *slevel, str *lmsg) +{ + int llevel = ki_xlog_get_level(slevel); + return ki_xlog_ex(msg, NULL, llevel, lmsg); } int ki_xdbg(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_DBG, lmsg); + return ki_xlog_ex(msg, NULL, L_DBG, lmsg); } int ki_xerr(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ERR, lmsg); + return ki_xlog_ex(msg, NULL, L_ERR, lmsg); } int ki_xinfo(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_INFO, lmsg); + return ki_xlog_ex(msg, NULL, L_INFO, lmsg); } int ki_xnotice(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_NOTICE, lmsg); + return ki_xlog_ex(msg, NULL, L_NOTICE, lmsg); } int ki_xwarn(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_WARN, lmsg); + return ki_xlog_ex(msg, NULL, L_WARN, lmsg); } int ki_xalert(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_ALERT, lmsg); + return ki_xlog_ex(msg, NULL, L_ALERT, lmsg); } int ki_xcrit(sip_msg_t *msg, str *lmsg) { - return ki_xlog_ex(msg, L_CRIT, lmsg); + return ki_xlog_ex(msg, NULL, L_CRIT, lmsg); } /** @@ -1010,6 +1034,11 @@ static sr_kemi_t sr_kemi_xlog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("xlog"), str_init("xlog_facility"), + SR_KEMIP_INT, ki_xlog_facility, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:4a2665a8: pv: increase the number of slots for transformations
by Daniel-Constantin Mierla 19 Jan '24

19 Jan '24

Module: kamailio Branch: master Commit: 4a2665a8c5ff31d50468bd998ef0853c3ff510cc URL: https://github.com/kamailio/kamailio/commit/4a2665a8c5ff31d50468bd998ef0853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-19T10:18:33+01:00 pv: increase the number of slots for transformations - safer handling of chained transformations --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/4a2665a8c5ff31d50468bd998ef0853… Patch: https://github.com/kamailio/kamailio/commit/4a2665a8c5ff31d50468bd998ef0853… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 92aa7b6be61..0cc6f8f2e2c 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -59,7 +59,7 @@ static param_t *_tr_uri_params = NULL; /*! transformation buffer size */ #define TR_BUFFER_SIZE 65536 -#define TR_BUFFER_SLOTS 8 +#define TR_BUFFER_SLOTS 16 /*! transformation buffer */ static char **_tr_buffer_list = NULL;

1 0

git:master:59104fe7: core: increase default pv buffer size to accomodate safer webrtc traffic
by Daniel-Constantin Mierla 19 Jan '24

19 Jan '24

Module: kamailio Branch: master Commit: 59104fe7d57bc8c75c835bbb75d5a1b7d01f6bda URL: https://github.com/kamailio/kamailio/commit/59104fe7d57bc8c75c835bbb75d5a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-19T10:09:46+01:00 core: increase default pv buffer size to accomodate safer webrtc traffic --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/59104fe7d57bc8c75c835bbb75d5a1b… Patch: https://github.com/kamailio/kamailio/commit/59104fe7d57bc8c75c835bbb75d5a1b… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 0bb20367ba5..34d0a9bcb3c 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2029,7 +2029,7 @@ void pv_destroy_api(void) * - buffer to print PVs */ static char **_pv_print_buffer = NULL; -#define PV_DEFAULT_PRINT_BUFFER_SIZE 8192 /* 8kB */ +#define PV_DEFAULT_PRINT_BUFFER_SIZE 32768 /* 32kB */ static int _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; static int _pv_print_buffer_size_active = 0; /* 6 mod params + 4 direct usage from mods */

1 0

git:master:cc26d25e: pv: convert pv value to long for ftime transformation
by Daniel-Constantin Mierla 19 Jan '24

19 Jan '24

Module: kamailio Branch: master Commit: cc26d25eefac40ec1c7e209e25312eed978cf348 URL: https://github.com/kamailio/kamailio/commit/cc26d25eefac40ec1c7e209e25312ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-19T09:49:55+01:00 pv: convert pv value to long for ftime transformation --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/cc26d25eefac40ec1c7e209e25312ee… Patch: https://github.com/kamailio/kamailio/commit/cc26d25eefac40ec1c7e209e25312ee… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 84c3a0c703f..92aa7b6be61 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1011,7 +1011,7 @@ int tr_eval_string( return -1; } if(!(val->flags & PV_VAL_INT) - && (str2int(&val->rs, (unsigned int *)&val->ri) != 0)) { + && (str2slong(&val->rs, &val->ri) != 0)) { LM_ERR("value is not numeric (cfg line: %d)\n", get_cfg_crt_line()); return -1; @@ -1036,6 +1036,8 @@ int tr_eval_string( memcpy(s, st.s, st.len); s[st.len] = '\0'; t = val->ri; + memset(&tmv, 0, sizeof(struct tm)); + _tr_buffer[0] = '\0'; localtime_r(&t, &tmv); val->rs.len = strftime(_tr_buffer, TR_BUFFER_SIZE - 1, s, &tmv); pkg_free(s);

1 0

git:master:a2bff77c: jansson: declare variables at the beginning of blocks
by Daniel-Constantin Mierla 19 Jan '24

19 Jan '24

Module: kamailio Branch: master Commit: a2bff77c3f7bfee8dae90c3ef20522d480f2e14d URL: https://github.com/kamailio/kamailio/commit/a2bff77c3f7bfee8dae90c3ef20522d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-19T09:44:33+01:00 jansson: declare variables at the beginning of blocks --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a2bff77c3f7bfee8dae90c3ef20522d… Patch: https://github.com/kamailio/kamailio/commit/a2bff77c3f7bfee8dae90c3ef20522d… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index dab15d488f3..4202cd56fe8 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -40,6 +40,9 @@ int janssonmod_get_helper( pv_value_t dst_val; json_t *json = NULL; json_error_t parsing_error; + char *path = NULL; + char *freeme = NULL; + STR_VTOZ(src_s->s[src_s->len], c); json = json_loads(src_s->s, JSON_REJECT_DUPLICATES, &parsing_error); STR_ZTOV(src_s->s[src_s->len], c); @@ -50,14 +53,13 @@ int janssonmod_get_helper( goto fail; } - char *path = path_s->s; + path = path_s->s; json_t *v = json_path_get(json, path, pmode); if(!v) { goto fail; } - char *freeme = NULL; if(jansson_to_val(&dst_val, &freeme, v) < 0) goto fail; @@ -149,6 +151,12 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, char c; pv_spec_t *result_pv; pv_value_t result_val; + json_t *result_json = NULL; + json_t *value = NULL; + char *freeme = NULL; + json_error_t parsing_error = {0}; + char *endptr; + char *path = NULL; if(fixup_get_svalue(msg, (gparam_p)type_in, &type_s) != 0) { ERR("cannot get type string value\n"); @@ -180,12 +188,6 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, LM_DBG("value is: %.*s\n", value_s.len, value_s.s); LM_DBG("result is: %.*s\n", result_val.rs.len, result_val.rs.s); - json_t *result_json = NULL; - json_t *value = NULL; - char *freeme = NULL; - json_error_t parsing_error = {0}; - char *endptr; - /* check the type */ if(STR_EQ_STATIC(type_s, "object") || STR_EQ_STATIC(type_s, "obj")) { STR_VTOZ(value_s.s[value_s.len], c); @@ -260,7 +262,8 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, goto fail; } - char *path = path_s.s; + path = path_s.s; + STR_VTOZ(result_val.rs.s[result_val.rs.len], c); result_json = json_loads(result_val.rs.s, JSON_REJECT_DUPLICATES, &parsing_error); @@ -300,6 +303,8 @@ int janssonmod_array_size( str path_s; pv_spec_t *dst_pv; pv_value_t dst_val; + char *path = NULL; + int size = 0; if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { ERR("cannot get json string value\n"); @@ -324,7 +329,7 @@ int janssonmod_array_size( goto fail; } - char *path = path_s.s; + path = path_s.s; json_t *v = json_path_get(json, path, 0); if(!v) { @@ -337,7 +342,7 @@ int janssonmod_array_size( goto fail; } - int size = json_array_size(v); + size = json_array_size(v); dst_val.ri = size; dst_val.flags = PV_TYPE_INT | PV_VAL_INT;

1 0

[kamailio/kamailio] ndb_redis doesn't use AUTH on a slave server in redis cluster. (Issue #3654)
by Dries De Gendt 19 Jan '24

19 Jan '24

### Description & troubleshooting I have defined a redis cluster as followed. The cluster consists of 3 masters (port 6379) and 3 slaves (port 6380). The password is identical on all nodes through redis option 'requirepass'. ``` modparam("ndb_redis", "server", "name=sbcredis;addr=SBCMASTERREDISIP;port=6379;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=PRIVATEIP;port=6380;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=ASTP5IP;port=6380;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=ASTP6IP;port=6379;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=ASTP3IP;port=6380;db=0;pass=REDACTED") modparam("ndb_redis", "server", "name=sbcredis;addr=ASTP4IP;port=6379;db=0;pass=REDACTED") modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "debug", 3) ``` When executing the redis_cmd command, most of the times an expected warning is shown due to another server providing the requested slot: `"(error) MOVED ... 192.168.136.241:6380"` Notice that I've enabled "allow_dynamic_nodes" to make sure there is an automated connection attempt to the indicated server. However, it appears that sometimes a "NOAUTH Authentication required." error is thrown when there is a redirection to a slave server serving that slot. I can authenticate succesfull on the redis-cli when using the identical password though. Also note that when a redis master is queried, the redis_cmd is successful. #### Reproduction Each simple redis command that needs authentication (GET, SET, ...) `redis_cmd("sbcredis", "SET TESTKEY TESTVALUE", "r");` #### Log Messages ``` ndb_redis [redis_client.c:1089]: redisc_exec(): Redis error:NOAUTH Authentication required. ``` ### Possible Solutions None for now except disabling the password on all nodes. ### Additional Information ``` kamailio 5.7.2 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3654 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3654(a)github.com>

2 2

git:master:8a161309: core: parser - check diversion pointer before accessing it
by Daniel-Constantin Mierla 18 Jan '24

18 Jan '24

Module: kamailio Branch: master Commit: 8a1613096ad86db125398e50d2ecced5d3ff1978 URL: https://github.com/kamailio/kamailio/commit/8a1613096ad86db125398e50d2ecced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-18T18:48:22+01:00 core: parser - check diversion pointer before accessing it --- Modified: src/core/parser/parse_diversion.c --- Diff: https://github.com/kamailio/kamailio/commit/8a1613096ad86db125398e50d2ecced… Patch: https://github.com/kamailio/kamailio/commit/8a1613096ad86db125398e50d2ecced… --- diff --git a/src/core/parser/parse_diversion.c b/src/core/parser/parse_diversion.c index 92690296935..557950052fa 100644 --- a/src/core/parser/parse_diversion.c +++ b/src/core/parser/parse_diversion.c @@ -210,17 +210,19 @@ int parse_diversion_header(struct sip_msg *msg) int free_diversion_body(diversion_body_t *div_b) { - int i = 0; + int i; + + if(div_b == NULL) { + return -1; + } for(i = 0; i < div_b->num_ids; i++) { /* Free to_body pointer parameters */ if(div_b->id[i].param_lst) { free_to_params(&(div_b->id[i])); } } + pkg_free(div_b); - if(div_b != NULL) { - pkg_free(div_b); - } return 0; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev