sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
372 discussions

git:5.8:d33e4bc5: pkg/kamailio: packaged jwt module [skip ci]
by Sergey Safarov 15 Nov '24

15 Nov '24

Module: kamailio Branch: 5.8 Commit: d33e4bc5fc8b8f482b740bb4fc63ff4c3d7e29ef URL: https://github.com/kamailio/kamailio/commit/d33e4bc5fc8b8f482b740bb4fc63ff4… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2024-11-15T14:30:56+02:00 pkg/kamailio: packaged jwt module [skip ci] (cherry picked from commit 2d745d21764485c725e2beea91b67cbda83c96f3) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d33e4bc5fc8b8f482b740bb4fc63ff4… Patch: https://github.com/kamailio/kamailio/commit/d33e4bc5fc8b8f482b740bb4fc63ff4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8f1863fc822..423f7f9f3de 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -237,6 +237,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 @@ -590,6 +591,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 @@ -1245,6 +1257,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kjson \ %endif kjsonrpcs \ + kjwt \ %if %{with kazoo} kkazoo \ %endif @@ -1358,6 +1371,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kjson \ %endif kjsonrpcs \ + kjwt \ %if %{with kazoo} kkazoo \ %endif @@ -2020,6 +2034,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

git:5.7:4ddd8de2: doc: update manpage with missing -B option [skip ci]
by Victor Seva 15 Nov '24

15 Nov '24

Module: kamailio Branch: 5.7 Commit: 4ddd8de2d6c6a02a5c156d0505feb9164a7d5a3e URL: https://github.com/kamailio/kamailio/commit/4ddd8de2d6c6a02a5c156d0505feb91… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-15T11:19:59+01:00 doc: update manpage with missing -B option [skip ci] (cherry picked from commit 77f03aabd871dbf86c5106a93eb32ce67d7762bf) (cherry picked from commit 6816f992696fe894b3a47cd511a59e1b5a0ed89b) --- Modified: doc/man/kamailio.8 --- Diff: https://github.com/kamailio/kamailio/commit/4ddd8de2d6c6a02a5c156d0505feb91… Patch: https://github.com/kamailio/kamailio/commit/4ddd8de2d6c6a02a5c156d0505feb91… --- diff --git a/doc/man/kamailio.8 b/doc/man/kamailio.8 index f4fc69ade7e..05460afbddc 100644 --- a/doc/man/kamailio.8 +++ b/doc/man/kamailio.8 @@ -8,7 +8,7 @@ kamailio \- a very fast and configurable SIP server .SH SYNOPSIS .B kamailio [ -.B \-hfcmMdVIhEeblLnvKrRDTNWwtugPGSQOaAxXY +.B \-hfcmMdVIhEebBlLnvKrRDTNWwtugPGSQOaAxXY ] [ .BI \-a " auto\-aliases\-mode" ] [ @@ -16,6 +16,8 @@ kamailio \- a very fast and configurable SIP server ] [ .BI \-b " max_rcv_buf_size" ] [ +.BI \-B " max_snd_buf_size" +] [ .BI \-f " config\-file" ] [ .BI \-g " gid" @@ -68,7 +70,10 @@ default is yes. Add config pre-processor define (e.g., -A WITH_AUTH, -A N=1, -A X='"Y"') .TP .BI \-b " max_rcv_buf_size" -Maximum receive buffer size which will not be exceeded by the auto-probing procedure even if the OS allows. +Maximum OS UDP receive buffer size which will not be exceeded by auto-probing-and-increase procedure even if OS allows. +.TP +.BI \-B " max_snd_buf_size" +Maximum OS UDP send buffer size which will not be exceeded by auto-probing-and-increase procedure even if OS allows. .TP .BI \-c Checks the config file and displays the aliases and listen interface list.

1 0

git:5.8:6816f992: doc: update manpage with missing -B option [skip ci]
by Victor Seva 15 Nov '24

15 Nov '24

Module: kamailio Branch: 5.8 Commit: 6816f992696fe894b3a47cd511a59e1b5a0ed89b URL: https://github.com/kamailio/kamailio/commit/6816f992696fe894b3a47cd511a59e1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-15T11:18:46+01:00 doc: update manpage with missing -B option [skip ci] (cherry picked from commit 77f03aabd871dbf86c5106a93eb32ce67d7762bf) --- Modified: doc/man/kamailio.8 --- Diff: https://github.com/kamailio/kamailio/commit/6816f992696fe894b3a47cd511a59e1… Patch: https://github.com/kamailio/kamailio/commit/6816f992696fe894b3a47cd511a59e1… --- diff --git a/doc/man/kamailio.8 b/doc/man/kamailio.8 index f4fc69ade7e..05460afbddc 100644 --- a/doc/man/kamailio.8 +++ b/doc/man/kamailio.8 @@ -8,7 +8,7 @@ kamailio \- a very fast and configurable SIP server .SH SYNOPSIS .B kamailio [ -.B \-hfcmMdVIhEeblLnvKrRDTNWwtugPGSQOaAxXY +.B \-hfcmMdVIhEebBlLnvKrRDTNWwtugPGSQOaAxXY ] [ .BI \-a " auto\-aliases\-mode" ] [ @@ -16,6 +16,8 @@ kamailio \- a very fast and configurable SIP server ] [ .BI \-b " max_rcv_buf_size" ] [ +.BI \-B " max_snd_buf_size" +] [ .BI \-f " config\-file" ] [ .BI \-g " gid" @@ -68,7 +70,10 @@ default is yes. Add config pre-processor define (e.g., -A WITH_AUTH, -A N=1, -A X='"Y"') .TP .BI \-b " max_rcv_buf_size" -Maximum receive buffer size which will not be exceeded by the auto-probing procedure even if the OS allows. +Maximum OS UDP receive buffer size which will not be exceeded by auto-probing-and-increase procedure even if OS allows. +.TP +.BI \-B " max_snd_buf_size" +Maximum OS UDP send buffer size which will not be exceeded by auto-probing-and-increase procedure even if OS allows. .TP .BI \-c Checks the config file and displays the aliases and listen interface list.

1 0

git:master:77f03aab: doc: update manpage with missing -B option [skip ci]
by Victor Seva 15 Nov '24

15 Nov '24

Module: kamailio Branch: master Commit: 77f03aabd871dbf86c5106a93eb32ce67d7762bf URL: https://github.com/kamailio/kamailio/commit/77f03aabd871dbf86c5106a93eb32ce… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-15T11:10:59+01:00 doc: update manpage with missing -B option [skip ci] * update -l description --- Modified: doc/man/kamailio.8 --- Diff: https://github.com/kamailio/kamailio/commit/77f03aabd871dbf86c5106a93eb32ce… Patch: https://github.com/kamailio/kamailio/commit/77f03aabd871dbf86c5106a93eb32ce… --- diff --git a/doc/man/kamailio.8 b/doc/man/kamailio.8 index f4fc69ade7e..9579c806020 100644 --- a/doc/man/kamailio.8 +++ b/doc/man/kamailio.8 @@ -8,7 +8,7 @@ kamailio \- a very fast and configurable SIP server .SH SYNOPSIS .B kamailio [ -.B \-hfcmMdVIhEeblLnvKrRDTNWwtugPGSQOaAxXY +.B \-hfcmMdVIhEebBlLnvKrRDTNWwtugPGSQOaAxXY ] [ .BI \-a " auto\-aliases\-mode" ] [ @@ -16,6 +16,8 @@ kamailio \- a very fast and configurable SIP server ] [ .BI \-b " max_rcv_buf_size" ] [ +.BI \-B " max_snd_buf_size" +] [ .BI \-f " config\-file" ] [ .BI \-g " gid" @@ -68,7 +70,10 @@ default is yes. Add config pre-processor define (e.g., -A WITH_AUTH, -A N=1, -A X='"Y"') .TP .BI \-b " max_rcv_buf_size" -Maximum receive buffer size which will not be exceeded by the auto-probing procedure even if the OS allows. +Maximum OS UDP receive buffer size which will not be exceeded by auto-probing-and-increase procedure even if OS allows. +.TP +.BI \-B " max_snd_buf_size" +Maximum OS UDP send buffer size which will not be exceeded by auto-probing-and-increase procedure even if OS allows. .TP .BI \-c Checks the config file and displays the aliases and listen interface list. @@ -132,10 +137,18 @@ Turns on via host checking when forwarding replies. Listens on the specified address/interface. Multiple .B \-l mean listening on multiple addresses. The address format is -[proto:]address[:port], where proto = udp|tcp and -address = host|ip_address|interface_name. Example: -l localhost, --l udp:127.0.0.1:5080, -l eth0:5062. -The default behaviour is to listen on all the ipv4 interfaces. +[proto:]addr_lst[:port][/advaddr][/socket_name], +where proto=udp|tcp|tls|sctp, +addr_list = addr|(addr, addrress), +addr=host|ip_address|interface_name, +advaddr=addr[:port] (advertised address) and +socket_name=identifying name. +E.g: -l localhost, -l udp:127.0.0.1:5080, -l eth0:5062, +-l udp:127.0.0.1:5080/1.2.3.4:5060, +-l udp:127.0.0.1:5080//local, +-l udp:127.0.0.1:5080/1.2.3.4:5060/local, +-l \"sctp:(eth0)\", -l \"(eth0, eth1, 127.0.0.1):5065\". +The default behaviour is to listen on all the interfaces. .TP .BI \-\-loadmodule\fR=\fIname load the module specified by name

1 0

git:master:db267263: tm: backup/restor current T/branch for rpc reply commands
by Daniel-Constantin Mierla 15 Nov '24

15 Nov '24

Module: kamailio Branch: master Commit: db2672636a9f029f624059eb6ef69db86a559ff1 URL: https://github.com/kamailio/kamailio/commit/db2672636a9f029f624059eb6ef69db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-15T09:44:54+01:00 tm: backup/restor current T/branch for rpc reply commands --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/db2672636a9f029f624059eb6ef69db… Patch: https://github.com/kamailio/kamailio/commit/db2672636a9f029f624059eb6ef69db… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index a87a9281bf7..a7221235844 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2990,6 +2990,8 @@ void rpc_reply(rpc_t *rpc, void *c) { int ret; struct cell *trans; + tm_cell_t *orig_t = NULL; + int orig_branch; unsigned int hash_index, label, code; str ti, body, headers, tag, reason; @@ -3025,6 +3027,7 @@ void rpc_reply(rpc_t *rpc, void *c) } LM_DBG("hash_index=%u label=%u\n", hash_index, label); + tm_get_tb(&orig_t, &orig_branch); if(t_lookup_ident(&trans, hash_index, label) < 0) { ERR("Lookup failed\n"); rpc->fault(c, 481, "No such transaction"); @@ -3034,6 +3037,7 @@ void rpc_reply(rpc_t *rpc, void *c) /* it's refcounted now, t_reply_with body unrefs for me -- I can * continue but may not use T anymore */ ret = t_reply_with_body(trans, code, &reason, &body, &headers, &tag); + tm_set_tb(orig_t, orig_branch); if(ret < 0) { LM_ERR("Reply failed\n"); @@ -3056,6 +3060,8 @@ void rpc_reply_callid(rpc_t *rpc, void *c) { int code; tm_cell_t *trans; + tm_cell_t *orig_t = NULL; + int orig_branch; str reason = {0, 0}; str totag = {0, 0}; str hdrs = {0, 0}; @@ -3098,6 +3104,7 @@ void rpc_reply_callid(rpc_t *rpc, void *c) return; } + tm_get_tb(&orig_t, &orig_branch); if(t_lookup_callid(&trans, callid, cseq) < 0) { rpc->fault(c, 404, "Transaction not found"); return; @@ -3106,6 +3113,7 @@ void rpc_reply_callid(rpc_t *rpc, void *c) /* it's refcounted now, t_reply_with body unrefs for me -- I can * continue but may not use T anymore */ n = t_reply_with_body(trans, code, &reason, &body, &hdrs, &totag); + tm_set_tb(orig_t, orig_branch); if(n < 0) { rpc->fault(c, 500, "Reply failed");

1 0

git:master:ec30f583: tm: rpc_cancel() switch to get/set T/branch helpers
by Daniel-Constantin Mierla 15 Nov '24

15 Nov '24

Module: kamailio Branch: master Commit: ec30f5831ed3b6684715103b0242ed220e0159be URL: https://github.com/kamailio/kamailio/commit/ec30f5831ed3b6684715103b0242ed2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-15T09:36:32+01:00 tm: rpc_cancel() switch to get/set T/branch helpers --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/ec30f5831ed3b6684715103b0242ed2… Patch: https://github.com/kamailio/kamailio/commit/ec30f5831ed3b6684715103b0242ed2… --- diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index 832fdf89dc1..0ec5aab200a 100644 --- a/src/modules/tm/t_cancel.c +++ b/src/modules/tm/t_cancel.c @@ -417,8 +417,7 @@ void rpc_cancel(rpc_t *rpc, void *c) return; } - orig_t = get_t(); - orig_branch = get_t_branch(); + tm_get_tb(&orig_t, &orig_branch); if(t_lookup_callid(&trans, callid_s, cseq_s) < 0) { LM_DBG("Lookup failed\n"); rpc->fault(c, 400, "Transaction not found"); @@ -433,7 +432,7 @@ void rpc_cancel(rpc_t *rpc, void *c) /* t_lookup_callid REF`d the transaction for us, we must UNREF here! */ UNREF(trans); - set_t(orig_t, orig_branch); + tm_set_tb(orig_t, orig_branch); j = 0; while(i) { j++;

1 0

git:master:027ca1b2: tm: small helper functions to get/set current T and branch
by Daniel-Constantin Mierla 15 Nov '24

15 Nov '24

Module: kamailio Branch: master Commit: 027ca1b2e1d0857ac039ff8fee9fecadd88bbda0 URL: https://github.com/kamailio/kamailio/commit/027ca1b2e1d0857ac039ff8fee9feca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-15T09:33:52+01:00 tm: small helper functions to get/set current T and branch - pair for coherent naming --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h --- Diff: https://github.com/kamailio/kamailio/commit/027ca1b2e1d0857ac039ff8fee9feca… Patch: https://github.com/kamailio/kamailio/commit/027ca1b2e1d0857ac039ff8fee9feca… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 48e1634cce8..f0cebc014fe 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -150,6 +150,18 @@ int get_t_branch() return T_branch; } +void tm_get_tb(struct cell **t, int *branch) +{ + *t = T; + *branch = T_branch; +} + +void tm_set_tb(struct cell *t, int branch) +{ + T = t; + T_branch = branch; +} + /** * return the transaction by combining get() and t_check_msg() * - if T is not set, checks the transactions table for msg, and if found, diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index f3f69af4ac5..e9c019c7b46 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -79,6 +79,8 @@ int get_t_branch(void); typedef void (*tsett_f)(struct cell *t, int branch); void set_t(struct cell *t, int branch); +void tm_get_tb(struct cell **t, int *branch); +void tm_set_tb(struct cell *t, int branch); #define T_GET_TI "t_get_trans_ident" #define T_LOOKUP_IDENT "t_lookup_ident"

1 0

[kamailio/kamailio] tm: move local-request event route to the right location to access CANCEL (PR #3979)
by Xenofon Karamanos 14 Nov '24

14 Nov '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  This PR fixes the error introduced in #3962, about not being able to access the generated CANCEL message. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3979 -- Commit Summary -- * tm: move local-request event route to the right location to access CANCEL -- File Changes -- M src/modules/tm/t_cancel.c (93) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3979.patch https://github.com/kamailio/kamailio/pull/3979.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3979 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3979(a)github.com>

5 9

git:5.7:73e86052: tm: Fix log level
by Xenofon Karamanos 14 Nov '24

14 Nov '24

Module: kamailio Branch: 5.7 Commit: 73e860525a52d8c8e07aced4b7aa6a9ee6c95865 URL: https://github.com/kamailio/kamailio/commit/73e860525a52d8c8e07aced4b7aa6a9… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-11-14T16:35:31Z tm: Fix log level (cherry picked from commit af0f0000c4755d01f668570bc6db71f2f534a5c0) --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/73e860525a52d8c8e07aced4b7aa6a9… Patch: https://github.com/kamailio/kamailio/commit/73e860525a52d8c8e07aced4b7aa6a9… --- 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.7:ec35516f: 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.7 Commit: ec35516f38f0495aa4eb6f1f1f0c67a61d3238a8 URL: https://github.com/kamailio/kamailio/commit/ec35516f38f0495aa4eb6f1f1f0c67a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-11-14T16:35:26Z 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/ec35516f38f0495aa4eb6f1f1f0c67a… Patch: https://github.com/kamailio/kamailio/commit/ec35516f38f0495aa4eb6f1f1f0c67a… --- 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

← Newer
1
...
28
29
30
31
32
33
34
...
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