sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
372 discussions

git:5.7:b0864208: tm: Emit request event when cancel is called
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Module: kamailio Branch: 5.7 Commit: b0864208cc818ee6ed568485c9f25640fad9e620 URL: https://github.com/kamailio/kamailio/commit/b0864208cc818ee6ed568485c9f2564… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-11-14T16:35:21Z tm: Emit request event when cancel is called (cherry picked from commit faca8e7a20255d90a4786fd4043005ead9dfc5df) --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/b0864208cc818ee6ed568485c9f2564… Patch: https://github.com/kamailio/kamailio/commit/b0864208cc818ee6ed568485c9f2564… --- diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index 18452a46967..f9a0951603e 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:5.8:701ebefa: tm: Fix log level
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Module: kamailio Branch: 5.8 Commit: 701ebefaf630cb7f6039f0030f66f736f384af69 URL: https://github.com/kamailio/kamailio/commit/701ebefaf630cb7f6039f0030f66f73… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-11-14T16:32:48Z tm: Fix log level (cherry picked from commit af0f0000c4755d01f668570bc6db71f2f534a5c0) --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/701ebefaf630cb7f6039f0030f66f73… Patch: https://github.com/kamailio/kamailio/commit/701ebefaf630cb7f6039f0030f66f73… --- diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index 61ca959a1bf..2bc0101112b 100644 --- a/src/modules/tm/t_cancel.c +++ b/src/modules/tm/t_cancel.c @@ -359,7 +359,7 @@ int cancel_branch( set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); if(rt >= 0) { - LM_ALERT("tm:local-request found [%d]\n", rt); + LM_DBG("tm:local-request found [%d]\n", rt); run_top_route(event_rt.rlist[rt], &msg, 0); } else { if(keng != NULL) {

1 0

git:5.8:67c09d2e: tm: move local-request event route to the right location to access CANCEL
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Module: kamailio Branch: 5.8 Commit: 67c09d2e470797deb0ac1b28f38293afe3f8c074 URL: https://github.com/kamailio/kamailio/commit/67c09d2e470797deb0ac1b28f38293a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-11-14T16:32:00Z tm: move local-request event route to the right location to access CANCEL (cherry picked from commit ccc106922802213253f03f181d10fe83aa93da94) --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/67c09d2e470797deb0ac1b28f38293a… Patch: https://github.com/kamailio/kamailio/commit/67c09d2e470797deb0ac1b28f38293a… --- diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index f9a0951603e..61ca959a1bf 100644 --- a/src/modules/tm/t_cancel.c +++ b/src/modules/tm/t_cancel.c @@ -89,11 +89,6 @@ 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; @@ -103,49 +98,6 @@ 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); } @@ -261,6 +213,11 @@ int cancel_branch( struct cancel_info tmp_cd; void *pcbuf; int reply_status; + 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"); crb = &t->uac[branch].local_cancel; irb = &t->uac[branch].request; @@ -377,6 +334,46 @@ int cancel_branch( crb->buffer_len = len; LM_DBG("sending cancel...\n"); + + rt = -1; + if(tm_event_callback.s == NULL || tm_event_callback.len <= 0) { + rt = route_lookup(&event_rt, evname.s); + if(rt < 0 || event_rt.rlist[rt] == NULL) { + LM_DBG("tm:local-request not found\n"); + } + } else { + keng = sr_kemi_eng_get(); + if(keng == NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + tm_event_callback.s); + } + } + + // /* Check if msg is null */ + if(build_sip_msg_from_buf(&msg, crb->buffer, crb->buffer_len, 0) < 0) { + LM_ERR("fail to parse msg\n"); + } + + /* Call event */ + backup_rt = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + if(rt >= 0) { + LM_ALERT("tm:local-request found [%d]\n", rt); + 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); + if(SEND_BUFFER(crb) >= 0) { if(unlikely(has_tran_tmcbs(t, TMCB_REQUEST_OUT))) run_trans_callbacks_with_buf(

1 0

git:5.8:c08bade8: tm: Emit request event when cancel is called
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Module: kamailio Branch: 5.8 Commit: c08bade8f570e0505a2498131faded9785c7fae0 URL: https://github.com/kamailio/kamailio/commit/c08bade8f570e0505a2498131faded9… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-11-14T16:31:43Z tm: Emit request event when cancel is called (cherry picked from commit faca8e7a20255d90a4786fd4043005ead9dfc5df) --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/c08bade8f570e0505a2498131faded9… Patch: https://github.com/kamailio/kamailio/commit/c08bade8f570e0505a2498131faded9… --- diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index 18452a46967..f9a0951603e 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:af0f0000: tm: Fix log level
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Module: kamailio Branch: master Commit: af0f0000c4755d01f668570bc6db71f2f534a5c0 URL: https://github.com/kamailio/kamailio/commit/af0f0000c4755d01f668570bc6db71f… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-11-14T16:10:38Z tm: Fix log level --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/af0f0000c4755d01f668570bc6db71f… Patch: https://github.com/kamailio/kamailio/commit/af0f0000c4755d01f668570bc6db71f… --- diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index 5f733d71cc1..832fdf89dc1 100644 --- a/src/modules/tm/t_cancel.c +++ b/src/modules/tm/t_cancel.c @@ -360,7 +360,7 @@ int cancel_branch(struct cell *t, int branch, sip_msg_t *cancel_msg, set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); if(rt >= 0) { - LM_ALERT("tm:local-request found [%d]\n", rt); + LM_DBG("tm:local-request found [%d]\n", rt); run_top_route(event_rt.rlist[rt], &msg, 0); } else { if(keng != NULL) {

1 0

git:master:2d745d21: pkg/kamailio: packaged jwt module
by Sergey Safarov 14 Nov '24

14 Nov '24

Module: kamailio Branch: master Commit: 2d745d21764485c725e2beea91b67cbda83c96f3 URL: https://github.com/kamailio/kamailio/commit/2d745d21764485c725e2beea91b67cb… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2024-11-14T17:50:33+02:00 pkg/kamailio: packaged jwt module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2d745d21764485c725e2beea91b67cb… Patch: https://github.com/kamailio/kamailio/commit/2d745d21764485c725e2beea91b67cb… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index bf1d35bc50c..04eb6ba9076 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -232,6 +232,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-http_client < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver +Conflicts: kamailio-jwt < %ver Conflicts: kamailio-kazoo < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver Conflicts: kamailio-nats < %ver @@ -583,6 +584,17 @@ JSON string handling and RPC modules for Kamailio. %endif +%package jwt +Summary: JWT (JSON Web Token) functions module for Kamailio +Group: %{PKGGROUP} +Requires: libjwt, kamailio = %ver +BuildRequires: libjwt-devel + +%description jwt +This module provides JWT (JSON Web Token) functions to be used in Kamailio configuration file. +It relies on libjwt (at least v1.12.0) library (https://github.com/benmcollins/libjwt). + + %if %{with kazoo} %package kazoo Summary: Kazoo middle layer connector support for Kamailio @@ -1235,6 +1247,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kjson \ %endif kjsonrpcs \ + kjwt \ %if %{with kazoo} kkazoo \ %endif @@ -1345,6 +1358,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kjson \ %endif kjsonrpcs \ + kjwt \ %if %{with kazoo} kkazoo \ %endif @@ -2007,6 +2021,12 @@ fi %endif +%files jwt +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.jwt +%{_libdir}/kamailio/modules/jwt.so + + %if %{with kazoo} %files kazoo %defattr(-,root,root)

1 0

Re: [kamailio/kamailio] Create .mergify.yml (819e1c4)
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Thanks! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4016f60f63/149088755(a)github.com>

1 0

Re: [kamailio/kamailio] Create .mergify.yml (819e1c4)
by Victor Seva 14 Nov '24

14 Nov '24

I force push master to remove it -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4016f60f63/149088713(a)github.com>

1 0

Re: [kamailio/kamailio] Create .mergify.yml (819e1c4)
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Hmm this was intended for my personal repo and testing... Can we revert it somehow? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4016f60f63/149087912(a)github.com>

1 0

git:master:819e1c4a: Create .mergify.yml
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Module: kamailio Branch: master Commit: 819e1c4a68e5c9fd500e129eccc6dd4016f60f63 URL: https://github.com/kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-11-14T13:58:50Z Create .mergify.yml --- Added: .github/mergify.yml --- Diff: https://github.com/kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4… Patch: https://github.com/kamailio/kamailio/commit/819e1c4a68e5c9fd500e129eccc6dd4… --- diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 00000000000..6f8704aba32 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,14 @@ +pull_request_rules: + - name: backport patches to the stable branch + conditions: + - label=backport + actions: + backport: + body: | + {{ body }} + + {% for c in commits %} + (cherry picked from commit {{ c.sha }}) + {% endfor %} + branches: + - "5.8"

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024