sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

git:master:e4800a83: timer: use route_lookup() instead of route_get() to find a route block
by Daniel-Constantin Mierla 28 Oct '17

28 Oct '17

Module: kamailio Branch: master Commit: e4800a83439cb04eb3a5d4e106ad767a3d6776a5 URL: https://github.com/kamailio/kamailio/commit/e4800a83439cb04eb3a5d4e106ad767… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T16:44:56+02:00 timer: use route_lookup() instead of route_get() to find a route block - avoids creating an empty route block structure - split code for dedicated cfg function wrapper --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/e4800a83439cb04eb3a5d4e106ad767… Patch: https://github.com/kamailio/kamailio/commit/e4800a83439cb04eb3a5d4e106ad767… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 4a09a94c2b..009bc6a95d 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -252,12 +252,8 @@ static int timer_enable_fixup(void** param, int param_no) return 0; } -static int timer_enable_func(sip_msg_t* m, char* timer_act, char* enable) +static int timer_enable_helper(sip_msg_t* m, timer_action_t* a, int en) { - timer_action_t* a; - int en; - a = (void*) timer_act; - en = (int)(long) enable; /* timer is not deleted immediately but is removed from handler * by itself because timer_del may be slow blocking procedure * Disable and enable in sequence may be tricky @@ -282,6 +278,16 @@ static int timer_enable_func(sip_msg_t* m, char* timer_act, char* enable) return 1; } +static int timer_enable_func(sip_msg_t* m, char* timer_act, char* enable) +{ + timer_action_t* a; + int en; + a = (void*) timer_act; + en = (int)(long) enable; + + return timer_enable_helper(m, a, en); +} + static int get_next_part(char** s, str* part, char delim) { char *c, *c2; @@ -331,7 +337,7 @@ static int declare_timer(modparam_t type, char* param) c = s.s[s.len]; s.s[s.len] = '\0'; - n = route_get(&main_rt, s.s); + n = route_lookup(&main_rt, s.s); s.s[s.len] = c; if (n == -1) goto err; route_no = n;

1 0

git:master:17f5db5b: modules: readme files regenerated - timer ... [skip ci]
by Kamailio Dev 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 17f5db5b934a6ba35835aa99545d79deb99b35af URL: https://github.com/kamailio/kamailio/commit/17f5db5b934a6ba35835aa99545d79d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-27T15:31:22+02:00 modules: readme files regenerated - timer ... [skip ci] --- Modified: src/modules/timer/README --- Diff: https://github.com/kamailio/kamailio/commit/17f5db5b934a6ba35835aa99545d79d… Patch: https://github.com/kamailio/kamailio/commit/17f5db5b934a6ba35835aa99545d79d… --- diff --git a/src/modules/timer/README b/src/modules/timer/README index 23cd3e49b9..bc20dd0953 100644 --- a/src/modules/timer/README +++ b/src/modules/timer/README @@ -26,10 +26,13 @@ Tomas Mandys 5. Functions 5.1. timer_enable(timer_id, enable_disable) - 5.2. @timer.timer.timer_id.enabled - 5.3. @timer.executed - 6. Examples + 6. Selects + + 6.1. @timer.timer.timer_id.enabled + 6.2. @timer.executed + + 7. Examples List of Examples @@ -58,10 +61,13 @@ Chapter 1. Admin Guide 5. Functions 5.1. timer_enable(timer_id, enable_disable) - 5.2. @timer.timer.timer_id.enabled - 5.3. @timer.executed - 6. Examples + 6. Selects + + 6.1. @timer.timer.timer_id.enabled + 6.2. @timer.executed + + 7. Examples 1. Overview @@ -87,11 +93,13 @@ Chapter 1. Admin Guide 3. ABNF syntax +... timer_id = alphanum slow_fast = "slow" | "fast" declare_timer_syntax = timer_id "=" (route#|route_name) "," interval "," slow_fast "," ["enable"] enable_disable = "0" | "1" +... 4. Parameters @@ -115,16 +123,13 @@ Chapter 1. Admin Guide timer_enable to start it later. Example 1.1. Example declare_timer - ... - modparam("timer", "declare_timer", "MY_TIMER=MY_TIMER_ROUTE,10,slow,enab -le"); - ... +... +modparam("timer", "declare_timer", "MY_TIMER=MY_TIMER_ROUTE,10,slow,enable"); +... 5. Functions 5.1. timer_enable(timer_id, enable_disable) - 5.2. @timer.timer.timer_id.enabled - 5.3. @timer.executed 5.1. timer_enable(timer_id, enable_disable) @@ -136,34 +141,44 @@ le"); * enable_distable - set to 1 to enable timer, to 0 to disable. Example 1.2. timer_enable usage - ... - timer_enable("MY_TIMER", 1); - ... +... +timer_enable("MY_TIMER", 1); +... + +6. Selects -5.2. @timer.timer.timer_id.enabled + 6.1. @timer.timer.timer_id.enabled + 6.2. @timer.executed + +6.1. @timer.timer.timer_id.enabled Return true ("1") if timer specified by timer_id is enabled, otherwise returns false ("0"). Example 1.3. timer.timer.timer_id.enabled usage - if (@timer.timer.MY_TIMER.enabled == "1") { - .... - } +... +if (@timer.timer.MY_TIMER.enabled == "1") { + ... +} +... -5.3. @timer.executed +6.2. @timer.executed Returns name of timer which has been executed, i.e. non empty value is returned only when handler is being processed. Example 1.4. timer.executed usage - if (@timer.executed != "") { - # timer is being handled - .... - } +... +if (@timer.executed != "") { + # timer is being handled + ... +} +... -6. Examples +7. Examples Example 1.5. timer common example +... loadmodule "modules/xprint/xprint.so" loadmodule "modules/timer/timer.so" @@ -184,18 +199,20 @@ route["ONTIMER2"] { timer_enable("tmr1", 0); route("print"); } +... Example 1.6. Using timer module for testing a functionality The timer module may be used to test a functionality being developed and not requiring real request. A developer may put tested code in route section which is called once after Kamailio starts. +... loadmodule "timer"; loadmodule "xprint"; modparam("timer", "declare_timer", "TIMER_TEST=TEST,100,,enable"); -route { +request_route { xplog("L_E","main route"); } @@ -206,4 +223,5 @@ route[TEST] { # add here tested functionality xplog("L_E","test end\n"); -} + } +...

1 0

git:master:25a775cf: timer: docs - split selects from functions section
by Daniel-Constantin Mierla 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 25a775cf44bc9c88ce8b6afc906968e2677dbf37 URL: https://github.com/kamailio/kamailio/commit/25a775cf44bc9c88ce8b6afc906968e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T15:11:49+02:00 timer: docs - split selects from functions section --- Modified: src/modules/timer/doc/timer.xml --- Diff: https://github.com/kamailio/kamailio/commit/25a775cf44bc9c88ce8b6afc906968e… Patch: https://github.com/kamailio/kamailio/commit/25a775cf44bc9c88ce8b6afc906968e…

1 0

git:master:e9d0e799: timer: use typedefs, updated log macros
by Daniel-Constantin Mierla 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: e9d0e799309b807b2376fd3eb30bd74a36997168 URL: https://github.com/kamailio/kamailio/commit/e9d0e799309b807b2376fd3eb30bd74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T15:01:41+02:00 timer: use typedefs, updated log macros --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/e9d0e799309b807b2376fd3eb30bd74… Patch: https://github.com/kamailio/kamailio/commit/e9d0e799309b807b2376fd3eb30bd74…

1 0

git:master:3386e345: timer: code formatting
by Daniel-Constantin Mierla 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 3386e34593da78fcbf6f72f45ad2e6e8d3a72525 URL: https://github.com/kamailio/kamailio/commit/3386e34593da78fcbf6f72f45ad2e6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T14:52:22+02:00 timer: code formatting --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/3386e34593da78fcbf6f72f45ad2e6e… Patch: https://github.com/kamailio/kamailio/commit/3386e34593da78fcbf6f72f45ad2e6e…

1 0

[kamailio/kamailio] dialog: remove replicated dialog from profile as soon as gets to term… (#1284)
by Charles Chance 27 Oct '17

27 Oct '17

…inated state - matches local (non-replicated) behaviour introduced in edf61ac You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1284 -- Commit Summary -- * dialog: remove replicated dialog from profile as soon as gets to terminated state -- File Changes -- M src/modules/dialog/dlg_dmq.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1284.patch https://github.com/kamailio/kamailio/pull/1284.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/1284

2 2

git:master:0a3ba3ca: Merge pull request #1284 from kamailio/cchance/dialog
by GitHub 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 0a3ba3ca39d7215a9ac6b8906768e2835f6de353 URL: https://github.com/kamailio/kamailio/commit/0a3ba3ca39d7215a9ac6b8906768e28… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-27T11:34:32+01:00 Merge pull request #1284 from kamailio/cchance/dialog dialog: remove replicated dialog from profile as soon as gets to termâ¦ --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/0a3ba3ca39d7215a9ac6b8906768e28… Patch: https://github.com/kamailio/kamailio/commit/0a3ba3ca39d7215a9ac6b8906768e28… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 668bdbdef4..1a27842254 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -323,6 +323,13 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg, dlg->h_entry, dlg->h_id); } } + + /* remove dialog from profiles when no longer active */ + if (dlg->profile_links!=NULL) { + destroy_linkers(dlg->profile_links); + dlg->profile_links = NULL; + } + /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; /* keep dialog around for a bit, to prevent out-of-order

1 0

git:master:22e4031c: dialog: remove replicated dialog from profile as soon as gets to terminated state
by Charles Chance 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 22e4031cdcc7ba7c90553bd569e289043c0c64cf URL: https://github.com/kamailio/kamailio/commit/22e4031cdcc7ba7c90553bd569e2890… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-10-25T15:29:07+01:00 dialog: remove replicated dialog from profile as soon as gets to terminated state - matches local (non-replicated) behaviour introduced in edf61ac --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/22e4031cdcc7ba7c90553bd569e2890… Patch: https://github.com/kamailio/kamailio/commit/22e4031cdcc7ba7c90553bd569e2890… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 668bdbdef4..1a27842254 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -323,6 +323,13 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg, dlg->h_entry, dlg->h_id); } } + + /* remove dialog from profiles when no longer active */ + if (dlg->profile_links!=NULL) { + destroy_linkers(dlg->profile_links); + dlg->profile_links = NULL; + } + /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; /* keep dialog around for a bit, to prevent out-of-order

1 0

[kamailio/kamailio] pkg/kamailio/obs: git cherry-pick to 5.0 branch (#1285)
by sergey-safarov 27 Oct '17

27 Oct '17

pkg/kamailio/obs: git cherry-pick to 5.0 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1285 -- Commit Summary -- * pkg/kamailio/obs: Updated SPEC file * pkg/kamailio/obs Fixed build of perl module * pkg/kamailio/obs: Added support of OpenSUSE Tumbleweed -- File Changes -- M pkg/kamailio/obs/kamailio.service (2) M pkg/kamailio/obs/kamailio.spec (193) M pkg/kamailio/obs/meta (9) A pkg/kamailio/obs/prjconf (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1285.patch https://github.com/kamailio/kamailio/pull/1285.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/1285

2 3

git:5.0:dd50f9a0: Merge pull request #1285 from sergey-safarov/5.0
by GitHub 27 Oct '17

27 Oct '17

Module: kamailio Branch: 5.0 Commit: dd50f9a07250b431402d3a7ee8ebe2e04be931b5 URL: https://github.com/kamailio/kamailio/commit/dd50f9a07250b431402d3a7ee8ebe2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-27T10:52:20+02:00 Merge pull request #1285 from sergey-safarov/5.0 pkg/kamailio/obs: git cherry-pick to 5.0 branch --- Added: pkg/kamailio/obs/prjconf Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/dd50f9a07250b431402d3a7ee8ebe2e… Patch: https://github.com/kamailio/kamailio/commit/dd50f9a07250b431402d3a7ee8ebe2e…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017