sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:master: modules_k:siputils Fixed the fixup for ring_insert_callid

by Marius Zbihlei

Module: sip-router Branch: master Commit: 8fdc717ab8b28857e23366804f0668b83971f249 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8fdc717… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Apr 8 16:48:37 2011 +0300 modules_k:siputils Fixed the fixup for ring_insert_callid --- modules_k/siputils/ring.c | 1 + modules_k/siputils/ring.h | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/siputils/ring.c b/modules_k/siputils/ring.c index ed0d478..1ae54b2 100644 --- a/modules_k/siputils/ring.c +++ b/modules_k/siputils/ring.c @@ -374,6 +374,7 @@ int ring_filter(struct sip_msg *msg, unsigned int flags, void *bar) * \return 0 */ int ring_fixup(void ** param, int param_no) { + int ring_timeout = cfg_get(siputils, siputils_cfg, ring_timeout); if (ring_timeout == 0) { LM_ERR("ring_insert_callid functionality deactivated, you need to set a positive ring_timeout\n"); return -1; diff --git a/modules_k/siputils/ring.h b/modules_k/siputils/ring.h index 74b35a6..2097f8f 100644 --- a/modules_k/siputils/ring.h +++ b/modules_k/siputils/ring.h @@ -38,7 +38,6 @@ extern gen_lock_t *ring_lock; -extern unsigned int ring_timeout; /*!

13 years, 7 months

git:3.1: nat_traversal: use register_dummy_timers() to handle cfg framework updates

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 341d6f035740eb1fa370760ff72e59f506a1860c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=341d6f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 22:56:46 2011 +0200 nat_traversal: use register_dummy_timers() to handle cfg framework updates (cherry picked from commit 44bc565d39ef8cb078c7e46f12863a7788c7b4e4) --- modules_k/nat_traversal/nat_traversal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 559fb49..791488d 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -1809,7 +1809,7 @@ mod_init(void) LM_NOTICE("using 10 seconds for keepalive_interval\n"); keepalive_interval = 10; } - register_procs(1); + register_dummy_timers(1); return 0; }

13 years, 7 months

git:3.1: nathelper(k): use register_dummy_timers() to handle cfg framework updates

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 86f0ca802a1d1f7bc6da82702aa97a46e5575f5d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86f0ca8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 22:55:46 2011 +0200 nathelper(k): use register_dummy_timers() to handle cfg framework updates (cherry picked from commit 1decfa6aaf44cb228569cd180c57dd67375dbe43) --- modules_k/nathelper/nathelper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 2b07f38..a66cfc4 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -649,7 +649,7 @@ mod_init(void) init_sip_ping(); } - register_procs(natping_processes); + register_dummy_timers(natping_processes); } /* Prepare 1918 networks list */

13 years, 7 months

git:3.1: rtimer: use register_dymmy_timers() to handle cfg framework updates

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: c4cfa4cc3893d2c8d5825167a298d1baff812c0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4cfa4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 22:54:15 2011 +0200 rtimer: use register_dymmy_timers() to handle cfg framework updates (cherry picked from commit 7d784e2e7195b953f568caa1dd553cce1e587fe3) --- modules_k/rtimer/rtimer_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rtimer/rtimer_mod.c b/modules_k/rtimer/rtimer_mod.c index d0ed96c..33c7c2e 100644 --- a/modules_k/rtimer/rtimer_mod.c +++ b/modules_k/rtimer/rtimer_mod.c @@ -118,7 +118,7 @@ static int mod_init(void) return -1; } } else { - register_procs(1); + register_dummy_timers(1); } it = it->next; }

13 years, 7 months

git:3.1: core: wrapper to pre-register new dummy timers

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: febb7de20cbcf94046f8e119664308ec596fa266 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=febb7de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 20:34:18 2011 +0200 core: wrapper to pre-register new dummy timers - register_dummy_timers(no) adds the number of new processes in the process table and initializes as well the number of new childres to the cfg framework - fork_dummy_timer() handles now the updates in cfg framework (cherry picked from commit 421cba5d6b25d85d542b875633368e0bc98be07d) --- timer_proc.c | 15 +++++++++++++++ timer_proc.h | 3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/timer_proc.c b/timer_proc.c index 09d19d3..a042008 100644 --- a/timer_proc.c +++ b/timer_proc.c @@ -36,12 +36,25 @@ */ #include "timer_proc.h" +#include "cfg/cfg_struct.h" #include "pt.h" #include "mem/shm_mem.h" #include <unistd.h> +/** update internal counters for running new dummy timers + * @param timers - number of dummy timer processes + * @return - 0 on success; -1 on error + */ +int register_dummy_timers(int timers) +{ + if(register_procs(timers)<0) + return -1; + cfg_register_child(timers); + return 0; +} + /** forks a separate simple sleep() periodic timer. * Forks a very basic periodic timer process, that just sleep()s for * the specified interval and then calls the timer function. @@ -66,8 +79,10 @@ int fork_dummy_timer(int child_id, char* desc, int make_sock, if (pid<0) return -1; if (pid==0){ /* child */ + if (cfg_child_init()) return -1; for(;;){ sleep(interval); + cfg_update(); f(get_ticks(), param); /* ticks in s for compatibility with old timers */ } diff --git a/timer_proc.h b/timer_proc.h index 81088d6..5e95400 100644 --- a/timer_proc.h +++ b/timer_proc.h @@ -36,6 +36,9 @@ #include "local_timer.h" +/** @brief register the number of extra dummy timer processes */ +int register_dummy_timers(int timers); + /** @brief forks a separate simple sleep() periodic timer */ int fork_dummy_timer(int child_id, char* desc, int make_sock, timer_function* f, void* param, int interval);

13 years, 7 months

git:master: nat_traversal: use register_dummy_timers() to handle cfg framework updates

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 44bc565d39ef8cb078c7e46f12863a7788c7b4e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44bc565… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 22:56:46 2011 +0200 nat_traversal: use register_dummy_timers() to handle cfg framework updates --- modules_k/nat_traversal/nat_traversal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 559fb49..791488d 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -1809,7 +1809,7 @@ mod_init(void) LM_NOTICE("using 10 seconds for keepalive_interval\n"); keepalive_interval = 10; } - register_procs(1); + register_dummy_timers(1); return 0; }

13 years, 7 months

git:master: rtimer: use register_dymmy_timers() to handle cfg framework updates

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7d784e2e7195b953f568caa1dd553cce1e587fe3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d784e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 22:54:15 2011 +0200 rtimer: use register_dymmy_timers() to handle cfg framework updates --- modules_k/rtimer/rtimer_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rtimer/rtimer_mod.c b/modules_k/rtimer/rtimer_mod.c index d0ed96c..33c7c2e 100644 --- a/modules_k/rtimer/rtimer_mod.c +++ b/modules_k/rtimer/rtimer_mod.c @@ -118,7 +118,7 @@ static int mod_init(void) return -1; } } else { - register_procs(1); + register_dummy_timers(1); } it = it->next; }

13 years, 7 months

git:master: nathelper(k): use register_dummy_timers() to handle cfg framework updates

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1decfa6aaf44cb228569cd180c57dd67375dbe43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1decfa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 22:55:46 2011 +0200 nathelper(k): use register_dummy_timers() to handle cfg framework updates --- modules_k/nathelper/nathelper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 4f303cb..bc3784a 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -649,7 +649,7 @@ mod_init(void) init_sip_ping(); } - register_procs(natping_processes); + register_dummy_timers(natping_processes); } /* Prepare 1918 networks list */

13 years, 7 months

git:master: core: wrapper to pre-register new dummy timers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 421cba5d6b25d85d542b875633368e0bc98be07d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=421cba5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 20:34:18 2011 +0200 core: wrapper to pre-register new dummy timers - register_dummy_timers(no) adds the number of new processes in the process table and initializes as well the number of new childres to the cfg framework - fork_dummy_timer() handles now the updates in cfg framework --- timer_proc.c | 15 +++++++++++++++ timer_proc.h | 3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/timer_proc.c b/timer_proc.c index 09d19d3..a042008 100644 --- a/timer_proc.c +++ b/timer_proc.c @@ -36,12 +36,25 @@ */ #include "timer_proc.h" +#include "cfg/cfg_struct.h" #include "pt.h" #include "mem/shm_mem.h" #include <unistd.h> +/** update internal counters for running new dummy timers + * @param timers - number of dummy timer processes + * @return - 0 on success; -1 on error + */ +int register_dummy_timers(int timers) +{ + if(register_procs(timers)<0) + return -1; + cfg_register_child(timers); + return 0; +} + /** forks a separate simple sleep() periodic timer. * Forks a very basic periodic timer process, that just sleep()s for * the specified interval and then calls the timer function. @@ -66,8 +79,10 @@ int fork_dummy_timer(int child_id, char* desc, int make_sock, if (pid<0) return -1; if (pid==0){ /* child */ + if (cfg_child_init()) return -1; for(;;){ sleep(interval); + cfg_update(); f(get_ticks(), param); /* ticks in s for compatibility with old timers */ } diff --git a/timer_proc.h b/timer_proc.h index 81088d6..5e95400 100644 --- a/timer_proc.h +++ b/timer_proc.h @@ -36,6 +36,9 @@ #include "local_timer.h" +/** @brief register the number of extra dummy timer processes */ +int register_dummy_timers(int timers); + /** @brief forks a separate simple sleep() periodic timer */ int fork_dummy_timer(int child_id, char* desc, int make_sock, timer_function* f, void* param, int interval);

13 years, 7 months

git:master: p_usrloc: use register_dummy_timers() to handle cfg framework updates

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ed6ec3be13036cd28dc0df34694f3594a5a6b292 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed6ec3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 7 22:54:55 2011 +0200 p_usrloc: use register_dummy_timers() to handle cfg framework updates - the dummy timer is now created in child_init with rank==PROC_INIT --- modules_k/p_usrloc/p_usrloc_mod.c | 16 ++++++++++++---- modules_k/p_usrloc/ul_db_watch.c | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules_k/p_usrloc/p_usrloc_mod.c b/modules_k/p_usrloc/p_usrloc_mod.c index 6c8c76a..357ce59 100644 --- a/modules_k/p_usrloc/p_usrloc_mod.c +++ b/modules_k/p_usrloc/p_usrloc_mod.c @@ -57,6 +57,7 @@ #include "../../sr_module.h" #include "../../dprint.h" #include "../../rpc_lookup.h" +#include "../../timer_proc.h" #include "../../globals.h" /* is_main */ #include "../../ut.h" /* str_init */ #include "udomain.h" /* {insert,delete,get,release}_urecord */ @@ -435,16 +436,23 @@ static int mod_init(void) LM_ERR("could not init database watch environment.\n"); return -1; } - if(init_db_check() < 0){ - LM_ERR("could not initialise database check.\n"); - return -1; - } + if(db_master_write){ + /* register extra dummy timer to be created in init_db_check() */ + register_dummy_timers(1); + } return 0; } static int child_init(int _rank) { + if(_rank==PROC_INIT) { + if(init_db_check() < 0){ + LM_ERR("could not initialise database check.\n"); + return -1; + } + return 0; + } if(ul_db_child_init() < 0){ LM_ERR("could not initialise databases.\n"); return -1; diff --git a/modules_k/p_usrloc/ul_db_watch.c b/modules_k/p_usrloc/ul_db_watch.c index 69cb2da..4d14e30 100644 --- a/modules_k/p_usrloc/ul_db_watch.c +++ b/modules_k/p_usrloc/ul_db_watch.c @@ -58,7 +58,7 @@ int init_db_check(void){ int ret; if(db_master_write){ LM_INFO("start timer, interval %i seconds\n", retry_interval); - ret = fork_dummy_timer(PROC_TIMER, "TIMER WATCH", 1, check_dbs, NULL, retry_interval); + ret = fork_dummy_timer(PROC_TIMER, "TIMER UL WATCH", 1, check_dbs, NULL, retry_interval); } else { ret = 0; }

13 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011