sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
243 discussions

git:master:69ee44c4: corex: use ZSW() for shm report rpc output

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 69ee44c4cf83447bab2104b5d380f01af3893608 URL: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T11:45:34+01:00 corex: use ZSW() for shm report rpc output --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… Patch: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index f605ef2795..b66d6e237d 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -108,24 +108,24 @@ static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) "used_frags", mrep.used_frags, "total_frags", mrep.total_frags, "max_free_frag_size", mrep.max_free_frag_size, - "max_free_frag_file", mrep.max_free_frag_file, - "max_free_frag_func", mrep.max_free_frag_func, - "max_free_frag_mname", mrep.max_free_frag_mname, + "max_free_frag_file", ZSW(mrep.max_free_frag_file), + "max_free_frag_func", ZSW(mrep.max_free_frag_func), + "max_free_frag_mname", ZSW(mrep.max_free_frag_mname), "max_free_frag_line", mrep.max_free_frag_line, "max_used_frag_size", mrep.max_used_frag_size, - "max_used_frag_file", mrep.max_used_frag_file, - "max_used_frag_func", mrep.max_used_frag_func, - "max_used_frag_mname", mrep.max_used_frag_mname, + "max_used_frag_file", ZSW(mrep.max_used_frag_file), + "max_used_frag_func", ZSW(mrep.max_used_frag_func), + "max_used_frag_mname", ZSW(mrep.max_used_frag_mname), "max_used_frag_line", mrep.max_used_frag_line, "min_free_frag_size", mrep.min_free_frag_size, - "min_free_frag_file", mrep.min_free_frag_file, - "min_free_frag_func", mrep.min_free_frag_func, - "min_free_frag_mname", mrep.min_free_frag_mname, + "min_free_frag_file", ZSW(mrep.min_free_frag_file), + "min_free_frag_func", ZSW(mrep.min_free_frag_func), + "min_free_frag_mname", ZSW(mrep.min_free_frag_mname), "min_free_frag_line", mrep.min_free_frag_line, "min_used_frag_size", mrep.min_used_frag_size, - "min_used_frag_file", mrep.min_used_frag_file, - "min_used_frag_func", mrep.min_used_frag_func, - "min_used_frag_mname", mrep.min_used_frag_mname, + "min_used_frag_file", ZSW(mrep.min_used_frag_file), + "min_used_frag_func", ZSW(mrep.min_used_frag_func), + "min_used_frag_mname", ZSW(mrep.min_used_frag_mname), "min_used_frag_line", mrep.min_used_frag_line ); }

2 years, 8 months

git:master:647a734f: core: mem - use macro for setting qm report fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 647a734f07537272f1235415f2712f770bc3f350 URL: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T11:19:26+01:00 core: mem - use macro for setting qm report fields --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… Patch: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 69de680d76..2ff295fcb1 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1028,6 +1028,14 @@ void qm_sums(void* qmp) "-----------------------------\n"); } +#define QM_REPORT_SET(MREP, FRAG, FIELD) do { \ + MREP->FIELD ## _size = FRAG->size; \ + MREP->FIELD ## _file = FRAG->file; \ + MREP->FIELD ## _func = FRAG->func; \ + MREP->FIELD ## _mname = FRAG->mname; \ + MREP->FIELD ## _line = FRAG->line; \ + } while(0) + void qm_report(void* qmp, mem_report_t *mrep) { struct qm_block* qm; @@ -1050,67 +1058,34 @@ void qm_report(void* qmp, mem_report_t *mrep) mrep->free_frags++; mrep->free_size_m += f->size; if(mrep->max_free_frag_size==0) { - mrep->max_free_frag_size = f->size; - mrep->max_free_frag_file = f->file; - mrep->max_free_frag_func = f->func; - mrep->max_free_frag_mname = f->mname; - mrep->max_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_free_frag); } else { if(f->size > mrep->max_free_frag_size) { - mrep->max_free_frag_size = f->size; - mrep->max_free_frag_file = f->file; - mrep->max_free_frag_func = f->func; - mrep->max_free_frag_mname = f->mname; - mrep->max_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_free_frag); } } if(mrep->min_free_frag_size==0) { - mrep->min_free_frag_size = f->size; - mrep->min_free_frag_file = f->file; - mrep->min_free_frag_func = f->func; - mrep->min_free_frag_mname = f->mname; - mrep->min_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_free_frag); } else { if(f->size < mrep->min_free_frag_size) { - mrep->min_free_frag_size = f->size; - mrep->min_free_frag_file = f->file; - mrep->min_free_frag_func = f->func; - mrep->min_free_frag_mname = f->mname; - mrep->min_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_free_frag); } } } else { mrep->used_frags++; mrep->used_size_m += f->size; if(mrep->max_used_frag_size==0) { - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_file = f->file; - mrep->max_used_frag_func = f->func; - mrep->max_used_frag_mname = f->mname; - mrep->max_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_used_frag); } else { if(f->size > mrep->max_used_frag_size) { - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_file = f->file; - mrep->max_used_frag_func = f->func; - mrep->max_used_frag_mname = f->mname; - mrep->max_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_used_frag); } } if(mrep->min_used_frag_size==0) { - mrep->min_used_frag_size = f->size; - mrep->min_used_frag_file = f->file; - mrep->min_used_frag_func = f->func; - mrep->min_used_frag_mname = f->mname; - mrep->min_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_used_frag); } else { if(f->size < mrep->min_used_frag_size) { - mrep->min_used_frag_size = f->size; - mrep->min_used_frag_file = f->file; - mrep->min_used_frag_func = f->func; - mrep->min_used_frag_mname = f->mname; - mrep->min_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_used_frag); } } }

2 years, 8 months

git:master:1c5b26d0: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1c5b26d0b6e2c43741d7b37341bfe49a78d7697a URL: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-10T11:01:25+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49… Patch: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49…

2 years, 8 months

[kamailio/kamailio] siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring (PR #3049)

by Dennis

siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3049 -- Commit Summary -- * siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring -- File Changes -- M src/modules/siptrace/siptrace.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3049.patch https://github.com/kamailio/kamailio/pull/3049.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3049 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3049(a)github.com>

2 years, 8 months

git:master:57b1d537: siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 57b1d5375927b987b162fcf0e2c99a39b717bd65 URL: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:48:59+01:00 siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… Patch: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index d7416506dd..2c2fc48404 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2070,6 +2070,11 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) return -1; } + if(_siptrace_mode & SIPTRACE_MODE_URI) { + if(sip_trace_xheaders_write(sto) != 0) + return -1; + } + memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = sto->body.s; msg.len = sto->body.len;

2 years, 8 months

[kamailio/kamailio] smsops: Fix ucs2-to-utf8 for Accent chars (PR #3043)

by alexyosifov

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3043 -- Commit Summary -- * smsops: Fix ucs2-to-utf8 for Accent chars -- File Changes -- M src/modules/smsops/smsops_impl.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3043.patch https://github.com/kamailio/kamailio/pull/3043.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3043 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3043(a)github.com>

2 years, 8 months

git:master:f9f16a6c: smsops: Fix ucs2-to-utf8 for Accent chars

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f9f16a6c700a7378fc30f6f9c0a767438fc638b9 URL: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:26+01:00 smsops: Fix ucs2-to-utf8 for Accent chars --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… Patch: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 909ccde4e2..9d1e19c237 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -479,7 +479,7 @@ int gsm_to_ascii(char* buffer, int buffer_length, str sms, const int fill_bits) int ucs2_to_utf8 (int ucs2, char * utf8) { if (ucs2 < 0x80) { utf8[0] = ucs2; - utf8[1] = 0; + utf8[1] = 0; return 1; } if (ucs2 >= 0x80 && ucs2 < 0x800) { @@ -888,7 +888,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Length is worst-case 2 * len (UCS2 is 2 Bytes, UTF8 is worst-case 4 Bytes) rp_data->pdu.payload.sm.len = 0; while (len > 0) { - j = (body.s[p] << 8) + body.s[p + 1]; + j = ((unsigned char)body.s[p] << 8) + (unsigned char)body.s[p + 1]; p += 2; rp_data->pdu.payload.sm.len += ucs2_to_utf8(j, &rp_data->pdu.payload.sm.s[rp_data->pdu.payload.sm.len]); len -= 2;

2 years, 8 months

[kamailio/kamailio] Master uac (PR #3047)

by Stefan Mititelu

#### 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds 1 UAC module function and 1 TM module modparam. It enables "uac:reply" event route trigger on timeout or non-2xx replies. Basically it: - adds TMCB_ON_FAILURE callback for UAC - copies the TM uac content into uas; thus failure route will have the uas to work with. => this part of the code was already there, i just enabled it via (another) modparam. So far, is basically tested on our side, without any apparent issues. More testing will follow. Please have a look on this and tell me what you think about it. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3047 -- Commit Summary -- * uac: add new function uac_req_send_fr() * tm: Add enable_uac_fr modparam -- File Changes -- M src/modules/tm/config.c (5) M src/modules/tm/config.h (1) M src/modules/tm/doc/params.xml (16) M src/modules/tm/tm.c (1) M src/modules/tm/uac.c (2) M src/modules/uac/api.h (2) M src/modules/uac/doc/uac_admin.xml (27) M src/modules/uac/uac.c (1) M src/modules/uac/uac_send.c (23) M src/modules/uac/uac_send.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3047.patch https://github.com/kamailio/kamailio/pull/3047.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3047 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3047(a)github.com>

2 years, 8 months

git:master:d3f25a5d: tm: Add enable_uac_fr modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3f25a5dd0139677a66792141fff075475085a03 URL: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:04+01:00 tm: Add enable_uac_fr modparam --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/tm.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… Patch: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… --- diff --git a/src/modules/tm/config.c b/src/modules/tm/config.c index 3bfd007ba0..5c5ea58590 100644 --- a/src/modules/tm/config.c +++ b/src/modules/tm/config.c @@ -95,7 +95,8 @@ struct cfg_group_tm default_tm_cfg = { CANCELs; on by default */ 1, /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs into the corresp. hop-by-hop CANCELs, on by default */ - 0 /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ + 0, /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ + 0 /* enable_uac_fr */ }; void *tm_cfg = &default_tm_cfg; @@ -206,5 +207,7 @@ cfg_def_t tm_cfg_def[] = { " the corresponding generated hop-by-hop CANCELs"}, {"relay_100", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, relay SIP 100 messages as a stateless proxy"}, + {"enable_uac_fr", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set, enables failure route for UAC messages"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/tm/config.h b/src/modules/tm/config.h index 17be5416a6..47f05e0c4c 100644 --- a/src/modules/tm/config.h +++ b/src/modules/tm/config.h @@ -130,6 +130,7 @@ struct cfg_group_tm { int local_cancel_reason; int e2e_cancel_reason; unsigned int relay_100; + int enable_uac_fr; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ee305b891c..3f67ae3f4d 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1607,4 +1607,20 @@ modparam("tm", "reply_relay_mode", 0) </example> </section> + <section id="tm.p.enable_uac_fr"> + <title><varname>enable_uac_fr</varname> (int)</title> + <para> + Enable failure route trigger, for uac. This will copy the tm uac into uas. + Thus, failure route can be triggered even for uac messages. + </para> + <example> + <title>enable_uac_fr example</title> + <programlisting> +... +modparam("tm", "enable_uac_fr", 1) +.... + </programlisting> + </example> + </section> + </section> diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index d8fc7caa19..69defa1f26 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -486,6 +486,7 @@ static param_export_t params[]={ {"event_callback_lres_sent", PARAM_STR, &_tm_event_callback_lres_sent }, {"exec_time_check" , PARAM_INT, &tm_exec_time_check_param }, {"reply_relay_mode", PARAM_INT, &tm_reply_relay_mode }, + {"enable_uac_fr", PARAM_INT, &default_tm_cfg.enable_uac_fr }, {0,0,0} }; diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 7dfcefb6ea..b7be8e3b38 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -548,7 +548,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, #ifdef USE_DNS_FAILOVER /* Set the outgoing message as UAS, so the failover code has something to work with */ - if(cfg_get(core, core_cfg, use_dns_failover)) { + if(cfg_get(core, core_cfg, use_dns_failover) || cfg_get(tm, tm_cfg, enable_uac_fr)) { if(likely(t_build_msg_from_buf(&lreq, buf, buf_len, uac_r, &dst) == 0)) { if (parse_headers(&lreq, HDR_EOH_F, 0) == -1) { LM_ERR("failed to parse headers on uas for failover\n");

2 years, 8 months

git:master:b3c301e1: uac: trigger event route for failure and timeout

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b3c301e1c99eb90df1533724442aef7991cd36bc URL: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:04+01:00 uac: trigger event route for failure and timeout ...when $uac_req(evroute) = 2 --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… Patch: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 188d1b913e..3ce59d3e11 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1241,11 +1241,20 @@ failure_route[REMOTE_AUTH] { <function moreinfo="none">event_route[uac:reply]</function> </title> <para> - Event route executed for the final reply of the branch for the - request sent with uac_req_send(). The associated $uac_req(evroute) - has to be set to 1. If the request is challenged for authentication + The associated $uac_req(evroute) can have either of the following values: + <itemizedlist> + <listitem><para> + <emphasis>1</emphasis> : event route executed for the <emphasis>final reply</emphasis> of the branch for the + request sent with uac_req_send(). If the request is challenged for authentication with 401/407, then the event_route is executed twice, first for 401/407 and second for final reply of the transaction. + </para></listitem> + <listitem><para> + <emphasis>2</emphasis> : event route executed for <emphasis>failure</emphasis> of the branch for the + request sent with uac_req_send(). event route will execute also for timeout. + In order for this to work, please also enable TM module "enable_uac_fr" modparam. + </para></listitem> + </itemizedlist> </para> <example> <title><function>event_route[uac:reply]</function> usage</title> diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 43767c7804..887dc1b4a4 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -886,9 +886,21 @@ int uac_req_send(void) return -1; } - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; - /* Callback function */ - uac_r.cb = uac_send_tm_callback; + switch (_uac_req.evroute) + { + + case 2: + uac_r.cb_flags = TMCB_ON_FAILURE; + /* Callback function */ + uac_r.cb = uac_resend_tm_callback; + break; + case 1: + default: + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + /* Callback function */ + uac_r.cb = uac_send_tm_callback; + break; + } /* Callback parameter */ uac_r.cbp = (void*)tp; }

2 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2022