sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:master:d3211fdf: tm: event_route[local-response] is actually executed after response is sent

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3211fdff1cfb9596a5339eff2184f1a91508bd2 URL: https://github.com/kamailio/kamailio/commit/d3211fdff1cfb9596a5339eff2184f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T12:49:20+02:00 tm: event_route[local-response] is actually executed after response is sent - change back after previous commit - somehow it is incoherent with event_route[local-request] that is before sending out, allowing to change the content --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/d3211fdff1cfb9596a5339eff2184f1… Patch: https://github.com/kamailio/kamailio/commit/d3211fdff1cfb9596a5339eff2184f1… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index 22cce59abc..5c6111a075 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -79,7 +79,7 @@ event_route [tm:local-request] { <function moreinfo="none">event_route[tm:local-response]</function> </title> <para> - Executed when the tm module is about to send a local generated, + Executed after the tm module sent a local generated, transaction stateful response. </para> <example>

5 years, 3 months

git:master:755e15fc: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 755e15fcfc4d36cdeff974a7ab701f3cdd445c78 URL: https://github.com/kamailio/kamailio/commit/755e15fcfc4d36cdeff974a7ab701f3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T09:46:47+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/755e15fcfc4d36cdeff974a7ab701f3… Patch: https://github.com/kamailio/kamailio/commit/755e15fcfc4d36cdeff974a7ab701f3… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 7f0970a4e3..8cbefc75b8 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -269,8 +269,8 @@ Daniel-Constantin Mierla 1.94. t_uac_send usage 1.95. t_get_status_code usage 1.96. event_route[tm:branch-failure:id] usage - 1.1. event_route[tm:local-request] usage - 1.2. event_route[tm:local-response] usage + 1.97. event_route[tm:local-request] usage + 1.98. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -2994,11 +2994,12 @@ event_route[tm:branch-failure:myroute] { 6.2. event_route[tm:local-request] Executed when the tm module generates a request, in other words, the - request originates from and a transaction is created for it. The source - of the requests can be tm itself or other modules that use tm - internally (e.g., msilo, uac). The event route is executed if it is - defined in the native config file. To execute the equivalent callback - when using KEMI scripting, see the 'event_callback' module parameter. + request originates from Kamailio and a transaction is created for it. + The source of the requests can be tm itself or other modules that use + tm internally (e.g., msilo, uac). The event route is executed if it is + defined in the native Kamailio config file. To execute the equivalent + callback when using KEMI scripting, see the 'event_callback' module + parameter. The request can still be updated, i.e., changes are possible to R-URI ($ru), destination URI ($du) or the send socket ($fs).

5 years, 3 months

git:master:18303418: tm: docs - include dockbook entities in event route file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 18303418756952ce0d850d8994cc485a823d547c URL: https://github.com/kamailio/kamailio/commit/18303418756952ce0d850d8994cc485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T09:37:09+02:00 tm: docs - include dockbook entities in event route file --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/18303418756952ce0d850d8994cc485… Patch: https://github.com/kamailio/kamailio/commit/18303418756952ce0d850d8994cc485… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index b969695c9a..22cce59abc 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> +%docentities; + +]> <section id="tm.event_routes" xmlns:xi="http://www.w3.org/2001/XInclude"> <sectioninfo>

5 years, 3 months

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

by Kamailio Dev

Module: kamailio Branch: master Commit: be8ba0dab1ee36ae517cef52c023cd83440f4af9 URL: https://github.com/kamailio/kamailio/commit/be8ba0dab1ee36ae517cef52c023cd8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T09:31:51+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/be8ba0dab1ee36ae517cef52c023cd8… Patch: https://github.com/kamailio/kamailio/commit/be8ba0dab1ee36ae517cef52c023cd8… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 47598f379e..7f0970a4e3 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -149,7 +149,7 @@ Daniel-Constantin Mierla 6. Event Routes - 6.1. event_route[tm:branch-failure] + 6.1. event_route[tm:branch-failure:id] 6.2. event_route[tm:local-request] 6.3. event_route[tm:local-response] @@ -268,9 +268,9 @@ Daniel-Constantin Mierla 1.93. t_is_retr_async_reply usage 1.94. t_uac_send usage 1.95. t_get_status_code usage - 1.96. event_route[tm:branch-failure] usage - 1.97. event_route[tm:local-request] usage - 1.98. event_route[tm:local-response] usage + 1.96. event_route[tm:branch-failure:id] usage + 1.1. event_route[tm:local-request] usage + 1.2. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -400,7 +400,7 @@ Chapter 1. Admin Guide 6. Event Routes - 6.1. event_route[tm:branch-failure] + 6.1. event_route[tm:branch-failure:id] 6.2. event_route[tm:local-request] 6.3. event_route[tm:local-response] @@ -2964,21 +2964,21 @@ if($var(ts) == 500) { ... } 6. Event Routes - 6.1. event_route[tm:branch-failure] + 6.1. event_route[tm:branch-failure:id] 6.2. event_route[tm:local-request] 6.3. event_route[tm:local-response] -6.1. event_route[tm:branch-failure] +6.1. event_route[tm:branch-failure:id] Named branch failure routes can be defined to run when when a failure response is received. This allows handling failures on individual branches, for example, retrying an alternative outbound flow. - The format of the event_route name is "tm:branch-failure:<name>" and is + The format of the event_route name is "tm:branch-failure:<id>" and is enabled with the t_on_branch_failure function. This event_route uses the BRANCH_FAILURE_ROUTE route type. - Example 1.96. event_route[tm:branch-failure] usage + Example 1.96. event_route[tm:branch-failure:id] usage ... request_route { ... @@ -2993,8 +2993,15 @@ event_route[tm:branch-failure:myroute] { 6.2. event_route[tm:local-request] - Executed after the tm module has sent a local generated, transaction - stateful request. + Executed when the tm module generates a request, in other words, the + request originates from and a transaction is created for it. The source + of the requests can be tm itself or other modules that use tm + internally (e.g., msilo, uac). The event route is executed if it is + defined in the native config file. To execute the equivalent callback + when using KEMI scripting, see the 'event_callback' module parameter. + + The request can still be updated, i.e., changes are possible to R-URI + ($ru), destination URI ($du) or the send socket ($fs). Example 1.97. event_route[tm:local-request] usage ... @@ -3006,8 +3013,8 @@ event_route [tm:local-request] { 6.3. event_route[tm:local-response] - Executed after the tm module has sent a local generated, transaction - stateful response. + Executed when the tm module is about to send a local generated, + transaction stateful response. Example 1.98. event_route[tm:local-response] usage ...

5 years, 3 months

git:5.1:a792b1cf: siptrace: check if trace_to_database is set before checking the db connection

by Federico Cabiddu

Module: kamailio Branch: 5.1 Commit: a792b1cfd927e1c29385a229d82b96c91b86b9ab URL: https://github.com/kamailio/kamailio/commit/a792b1cfd927e1c29385a229d82b96c… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-08-27T09:28:12+02:00 siptrace: check if trace_to_database is set before checking the db connection (cherry picked from commit afd0c929dc72a975e2ca3c88f307fd8c140a4fda) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/a792b1cfd927e1c29385a229d82b96c… Patch: https://github.com/kamailio/kamailio/commit/a792b1cfd927e1c29385a229d82b96c… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1e26bc2131..59c14d7b7e 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -503,14 +503,14 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, static int sip_trace_store_db(siptrace_data_t *sto) { + if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) + goto done; + if(db_con == NULL) { LM_DBG("database connection not initialized\n"); return -1; } - if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) - goto done; - db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS];

5 years, 3 months

git:5.2:94b60464: siptrace: check if trace_to_database is set before checking the db connection

by Federico Cabiddu

Module: kamailio Branch: 5.2 Commit: 94b60464c9ccac49ebae238aa42ae16fb2c5f9ec URL: https://github.com/kamailio/kamailio/commit/94b60464c9ccac49ebae238aa42ae16… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-08-27T09:27:54+02:00 siptrace: check if trace_to_database is set before checking the db connection (cherry picked from commit afd0c929dc72a975e2ca3c88f307fd8c140a4fda) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/94b60464c9ccac49ebae238aa42ae16… Patch: https://github.com/kamailio/kamailio/commit/94b60464c9ccac49ebae238aa42ae16… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 08ddc07ef5..a5299d4cad 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -497,14 +497,14 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, static int sip_trace_store_db(siptrace_data_t *sto) { + if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) + goto done; + if(db_con == NULL) { LM_DBG("database connection not initialized\n"); return -1; } - if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) - goto done; - db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS];

5 years, 3 months

[kamailio/kamailio] siptrace: check if trace_to_database is set before checking the db co… (#2047)

by Federico Cabiddu

…nnection   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Return the proper error code to not stop message processing in reply_route. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2047 -- Commit Summary -- * siptrace: check if trace_to_database is set before checking the db connection -- File Changes -- M src/modules/siptrace/siptrace.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2047.patch https://github.com/kamailio/kamailio/pull/2047.diff -- 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/pull/2047

5 years, 3 months

git:master:042971bc: Merge pull request #2047 from kamailio/grumvalski/siptrace_fix

by GitHub

Module: kamailio Branch: master Commit: 042971bcb6bb47ced735f5405fa5534f94d81dce URL: https://github.com/kamailio/kamailio/commit/042971bcb6bb47ced735f5405fa5534… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-27T09:26:48+02:00 Merge pull request #2047 from kamailio/grumvalski/siptrace_fix siptrace: check if trace_to_database is set before checking the db coâ¦ --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/042971bcb6bb47ced735f5405fa5534… Patch: https://github.com/kamailio/kamailio/commit/042971bcb6bb47ced735f5405fa5534… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 8fa832a043..211ddac363 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -542,14 +542,14 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, static int sip_trace_store_db(siptrace_data_t *sto) { + if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) + goto done; + if(db_con == NULL) { LM_DBG("database connection not initialized\n"); return -1; } - if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) - goto done; - db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS];

5 years, 3 months

git:master:afd0c929: siptrace: check if trace_to_database is set before checking the db connection

by Federico Cabiddu

Module: kamailio Branch: master Commit: afd0c929dc72a975e2ca3c88f307fd8c140a4fda URL: https://github.com/kamailio/kamailio/commit/afd0c929dc72a975e2ca3c88f307fd8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-08-26T20:21:13+02:00 siptrace: check if trace_to_database is set before checking the db connection --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/afd0c929dc72a975e2ca3c88f307fd8… Patch: https://github.com/kamailio/kamailio/commit/afd0c929dc72a975e2ca3c88f307fd8… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 8fa832a043..211ddac363 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -542,14 +542,14 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, static int sip_trace_store_db(siptrace_data_t *sto) { + if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) + goto done; + if(db_con == NULL) { LM_DBG("database connection not initialized\n"); return -1; } - if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) - goto done; - db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS];

5 years, 3 months

git:master:b241fc7e: tm: docs - clarifications about event routes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b241fc7e1d20098dd8b0666297303fe7255587e8 URL: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T09:17:18+02:00 tm: docs - clarifications about event routes --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… Patch: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index adda5536ed..b969695c9a 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -10,20 +10,20 @@ <section id="tm.e.branch-failure"> <title> - <function moreinfo="none">event_route[tm:branch-failure]</function> + <function moreinfo="none">event_route[tm:branch-failure:id]</function> </title> <para> Named branch failure routes can be defined to run when when a failure response is received. This allows handling failures on individual branches, for example, retrying an alternative outbound flow. </para> - <para> - The format of the event_route name is "tm:branch-failure:<name>" - and is enabled with the t_on_branch_failure function. - This event_route uses the BRANCH_FAILURE_ROUTE route type. - </para> + <para> + The format of the event_route name is "tm:branch-failure:<id>" + and is enabled with the t_on_branch_failure function. + This event_route uses the BRANCH_FAILURE_ROUTE route type. + </para> <example> - <title><function>event_route[tm:branch-failure]</function> usage</title> + <title><function>event_route[tm:branch-failure:id]</function> usage</title> <programlisting> ... request_route { @@ -44,7 +44,17 @@ event_route[tm:branch-failure:myroute] { <function moreinfo="none">event_route[tm:local-request]</function> </title> <para> - Executed after the tm module has sent a local generated, transaction stateful request. + Executed when the tm module generates a request, in other words, + the request originates from &kamailio; and a transaction is created + for it. The source of the requests can be tm itself or other modules + that use tm internally (e.g., msilo, uac). The event route is executed + if it is defined in the native &kamailio; config file. To execute + the equivalent callback when using KEMI scripting, see the + 'event_callback' module parameter. + </para> + <para> + The request can still be updated, i.e., changes are possible to + R-URI ($ru), destination URI ($du) or the send socket ($fs). </para> <example> <title><function>event_route[tm:local-request]</function> usage</title> @@ -63,7 +73,8 @@ event_route [tm:local-request] { <function moreinfo="none">event_route[tm:local-response]</function> </title> <para> - Executed after the tm module has sent a local generated, transaction stateful response. + Executed when the tm module is about to send a local generated, + transaction stateful response. </para> <example> <title><function>event_route[tm:local-response]</function> usage</title>

5 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019