sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

git:master: core: init_child(1) for no-fork mode replaced with init_child( PROC_SIPINIT)
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: ece30366e75ad5f057e911ce25f79caf9861cec6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ece3036… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 29 10:25:16 2011 +0200 core: init_child(1) for no-fork mode replaced with init_child(PROC_SIPINIT) - use the defined proc rank instead if its integer value --- main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/main.c b/main.c index 45f0a6a..e2ad1f3 100644 --- a/main.c +++ b/main.c @@ -1390,7 +1390,7 @@ int main_loop() * in fact we behave like a child, not like main process */ - if (init_child(1) < 0) { + if (init_child(PROC_SIPINIT) < 0) { LOG(L_ERR, "main_dontfork: init_child failed\n"); goto error; }

1 0

git:master: usrloc(k): use PROC_SIPINIT instead of rank 1 in child_init
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: c5ca00dc3dba76bfa5d2b35963999ae10db88cf1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5ca00d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 29 10:23:23 2011 +0200 usrloc(k): use PROC_SIPINIT instead of rank 1 in child_init - this child is used to load the records from db --- modules_k/usrloc/ul_mod.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index eaa36e2..17526f9 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -360,8 +360,8 @@ static int child_init(int _rank) LM_ERR("child(%d): failed to connect to database\n", _rank); return -1; } - /* _rank==1 is used even when fork is disabled */ - if (_rank==1 && db_mode!= DB_ONLY) { + /* _rank==PROC_SIPINIT is used even when fork is disabled */ + if (_rank==PROC_SIPINIT && db_mode!= DB_ONLY) { /* if cache is used, populate domains from DB */ for( ptr=root ; ptr ; ptr=ptr->next) { if (preload_udomain(ul_dbh, ptr->d) < 0) {

1 0

git:master: xmlrpc: advertise to core that sip workers handle rpc commands
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: f079c23f5af6f154279d9a68a0c2abd09a788736 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f079c23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 28 22:53:48 2011 +0200 xmlrpc: advertise to core that sip workers handle rpc commands --- modules/xmlrpc/xmlrpc.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 8824a30..a63a4cc 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -2462,6 +2462,16 @@ static int mod_init(void) } +/** + * advertise that sip workers handle rpc commands + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + set_sip_rpc_mode(1); + return 0; +} + + static int fixup_xmlrpc_reply(void** param, int param_no) { int ret;

1 0

git:master: core: added defines for positive child ranks
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: 119ad6aa83a6efed0ffc71eea477e4b5cfbea73b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=119ad6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 29 10:18:01 2011 +0200 core: added defines for positive child ranks - PROC_SIPINIT 1 - some modules do specific processing in this child only, like usrloc loading records from db - PROC_SIPRPC 127 - special positive rank to use in RPC workers to init the environment for processing SIP-specific commands. For example, event_route[tm:local-request] can be executed due to MI/RPC command and have insite SIP related functions from other modules which need db connection, like acc_db_request() --- sr_module.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sr_module.h b/sr_module.h index 71ffa92..ce8c781 100644 --- a/sr_module.h +++ b/sr_module.h @@ -204,6 +204,13 @@ typedef int (*param_func_t)( modparam_t type, void* val); #define PROC_NOCHLDINIT -128 /**< no child init functions will be called if this rank is used in fork_process() */ +#define PROC_SIPINIT 1 /**< First SIP worker - some modules do special + processing in this child, like loading db data */ +#define PROC_SIPRPC 127 /**< Used to init RPC worker as SIP commands + handler. Don't do any special processing in the + child init with this rank - just bare child + initialization */ + #define PROC_MIN PROC_NOCHLDINIT /**< Minimum process rank */

1 0

git:master: mi_rpc: call init mi child based on core advertising of handling rpc commands
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: 30f501c092cecdcd6c90b929f14db45921767f77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30f501c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 28 23:04:02 2011 +0200 mi_rpc: call init mi child based on core advertising of handling rpc commands - update of the way to prepare sip workers to execute mi commands via rpc --- modules/mi_rpc/mi_rpc_mod.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index 6e6e2c6..bfc4aaf 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -78,19 +78,12 @@ struct module_exports exports = { static int child_init(int rank) { - if(rank==PROC_RPC) { + if(is_rpc_worker(rank)) { + LM_DBG("initializing child[%d] for rpc handling\n", rank); if(init_mi_child()!=0) { LM_CRIT("Failed to init the mi commands\n"); return -1; } - } else if(rank>0) { - if(find_module_by_name("xmlrpc")!=0) - { - if(init_mi_child()!=0) { - LM_CRIT("Failed to init the mi commands for xmlrpc usage\n"); - return -1; - } - } } return 0;

1 0

git:master: lib/kmi: init MI workers for SIP commands when needed
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: 359a96d03de99322a34934160d2817157b35846c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=359a96d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 29 10:14:32 2011 +0200 lib/kmi: init MI workers for SIP commands when needed --- lib/kmi/mi.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/lib/kmi/mi.c b/lib/kmi/mi.c index 8d2c01d..ede6783 100644 --- a/lib/kmi/mi.c +++ b/lib/kmi/mi.c @@ -46,6 +46,7 @@ #include <string.h> #include "../../dprint.h" +#include "../../sr_module.h" #include "mi_mem.h" #include "mi.h" @@ -112,6 +113,13 @@ int init_mi_child(void) return -1; } } + if(is_sip_worker(PROC_NOCHLDINIT)) { + LM_DBG("initalizing proc rpc for sip handling\n"); + if(init_child(PROC_SIPRPC)<0) { + LM_DBG("failed to init proc rpc for sip handling\n"); + return -1; + } + } mi_commands_initialized = 1; return 0; }

1 0

git:master: xmlrpc: updated the way of setting child sip-rpc mode
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: dc623cc5923c76747c177da10c9b0a8194269a33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc623cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 28 23:56:07 2011 +0200 xmlrpc: updated the way of setting child sip-rpc mode --- modules/xmlrpc/xmlrpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index a63a4cc..327df9f 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -2467,7 +2467,7 @@ static int mod_init(void) */ int mod_register(char *path, int *dlflags, void *p1, void *p2) { - set_sip_rpc_mode(1); + set_child_sip_rpc_mode(); return 0; }

1 0

git:master: tm: advertise child rpc-sip mode when using event_route[tm: local-request]
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: ab84134e3d34c0ef85c3bb9724796f9c2034f342 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab84134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 29 09:33:01 2011 +0200 tm: advertise child rpc-sip mode when using event_route[tm:local-request] - the event route can be executed for MI/RPC commands that send requests, thus there are sip routing specific functions that work when child init for sip workers is executed for that process - example, calling acc_db_request() requires db connection to be open --- modules/tm/tm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index d9b8bbf..5e06470 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -842,6 +842,8 @@ static int mod_init(void) goto_on_local_req=route_lookup(&event_rt, "tm:local-request"); if (goto_on_local_req>=0 && event_rt.rlist[goto_on_local_req]==0) goto_on_local_req=-1; /* disable */ + if (goto_on_local_req>=0) + set_child_rpc_sip_mode(); #endif /* WITH_EVENT_LOCAL_REQUEST */ if (goto_on_sl_reply && onreply_rt.rlist[goto_on_sl_reply]==0) WARN("empty/non existing on_sl_reply route\n");

1 0

git:master: core: allow to specify that rpc worker may handle sip commands
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: df1958c017f01d82a2dfe821daa292884a989c1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df1958c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 28 23:52:49 2011 +0200 core: allow to specify that rpc worker may handle sip commands - a sip child process can handle rpc (e.g., xmlops module) and a rpc child process can handle sip commands (e.g., mi cmd to end dlg and event_route[tm:local-request]) --- sr_module.c | 26 ++++++++++++++++++++------ sr_module.h | 5 +++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/sr_module.c b/sr_module.c index 9da476f..564900c 100644 --- a/sr_module.c +++ b/sr_module.c @@ -113,23 +113,37 @@ int mod_response_cbk_no=0; response_function* mod_response_cbks=0; /** - * if set to 1, SIP worker processes handle RPC commands as well + * if bit 1 set, SIP worker processes handle RPC commands as well + * if bit 2 set, RPC worker processes handle SIP commands as well */ static int child_sip_rpc_mode = 0; -void set_sip_rpc_mode(int mode) +#define CHILD_SIP_RPC 1<<0 +#define CHILD_RPC_SIP 1<<1 + +void set_child_sip_rpc_mode(void) { - child_sip_rpc_mode = mode; + child_sip_rpc_mode |= CHILD_SIP_RPC; } -int get_sip_rpc_mode(void) +void set_child_rpc_sip_mode(void) { - return child_sip_rpc_mode; + child_sip_rpc_mode |= CHILD_RPC_SIP; } int is_rpc_worker(int rank) { - if(rank==PROC_RPC || (rank>PROC_MAIN && child_sip_rpc_mode!=0)) + if(rank==PROC_RPC + || (rank>PROC_MAIN && (child_sip_rpc_mode&CHILD_SIP_RPC)!=0)) + return 1; + return 0; +} + +int is_sip_worker(int rank) +{ + if(rank>PROC_MAIN + || ((rank==PROC_RPC || rank==PROC_NOCHLDINIT) + && (child_sip_rpc_mode&CHILD_RPC_SIP)!=0)) return 1; return 0; } diff --git a/sr_module.h b/sr_module.h index 5a56923..71ffa92 100644 --- a/sr_module.h +++ b/sr_module.h @@ -655,8 +655,9 @@ int fixup_free_fparam_2(void** param, int param_no); */ free_fixup_function get_fixup_free(fixup_function f); -void set_sip_rpc_mode(int mode); -int get_sip_rpc_mode(void); +void set_child_sip_rpc_mode(void); +void set_child_rpc_sip_mode(void); +int is_sip_worker(int rank); int is_rpc_worker(int rank); #endif /* sr_module_h */

1 0

git:master: core: added possibility to know if SIP workers handle RPC commands
by Daniel-Constantin Mierla 29 Sep '11

29 Sep '11

Module: sip-router Branch: master Commit: 37db0ca71dd14653182ac3c50bc27c7271f322cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37db0ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 28 22:18:53 2011 +0200 core: added possibility to know if SIP workers handle RPC commands - for example when using xmlrpc module, the rpc commands are handled by sip workers and may require special sip child initialization --- sr_module.c | 22 ++++++++++++++++++++++ sr_module.h | 4 ++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/sr_module.c b/sr_module.c index f861655..9da476f 100644 --- a/sr_module.c +++ b/sr_module.c @@ -112,6 +112,28 @@ struct sr_module* modules=0; int mod_response_cbk_no=0; response_function* mod_response_cbks=0; +/** + * if set to 1, SIP worker processes handle RPC commands as well + */ +static int child_sip_rpc_mode = 0; + +void set_sip_rpc_mode(int mode) +{ + child_sip_rpc_mode = mode; +} + +int get_sip_rpc_mode(void) +{ + return child_sip_rpc_mode; +} + +int is_rpc_worker(int rank) +{ + if(rank==PROC_RPC || (rank>PROC_MAIN && child_sip_rpc_mode!=0)) + return 1; + return 0; +} + /* initializes statically built (compiled in) modules*/ int register_builtin_modules() { diff --git a/sr_module.h b/sr_module.h index deea860..5a56923 100644 --- a/sr_module.h +++ b/sr_module.h @@ -655,4 +655,8 @@ int fixup_free_fparam_2(void** param, int param_no); */ free_fixup_function get_fixup_free(fixup_function f); +void set_sip_rpc_mode(int mode); +int get_sip_rpc_mode(void); +int is_rpc_worker(int rank); + #endif /* sr_module_h */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011