sr-dev September 2024

sr-dev@lists.kamailio.org

15 participants
169 discussions

git:master:72889e94: topos_redis : show redis error for post mortem analysis

by Daniel-Constantin Mierla

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

2 months

git:master:abaf42a7: core: use advertise port only when set for via header

by Daniel-Constantin Mierla

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

2 months

git:master:d9ae203c: pkg/kamailio/deb: remove geoip package

by Victor Seva

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…

2 months

[kamailio/kamailio] Pseudo-variables are erroneous for tm.cancel function. (Issue #3977)

by JuanPascual2

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>

2 months

git:master:1d2b4d5e: core: relocate core rpc, cfg locks and shutdown var initialization

by Daniel-Constantin Mierla

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) {

2 months

[kamailio/kamailio] app_jsdt: add support for loong64 arch (Issue #3976)

by Victor Seva

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>

2 months

git:master:5746db1c: app_jsdt: add support for loong64

by Victor Seva

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"

2 months

git:master:99710daa: core: proper condition for bind_ipv6_link_local modes

by Daniel-Constantin Mierla

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

2 months

[kamailio/kamailio] tm: Emit request event when tm.cancel is called (PR #3962)

by Xenofon Karamanos

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

2 months

git:master:faca8e7a: tm: Emit request event when cancel is called

by Henning Westerholt

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

2 months

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2024