sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

git:master: async: documentation for async_task_route()
by Daniel-Constantin Mierla 14 Apr '14

14 Apr '14

Module: sip-router Branch: master Commit: 272b23738de76d397c145c44c22a943fe198f753 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=272b237… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 14:28:13 2014 +0200 async: documentation for async_task_route() --- modules/async/README | 36 +++++++++++++++++++++++++++ modules/async/doc/async_admin.xml | 49 +++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/modules/async/README b/modules/async/README index 4f2c0ef..3dd83a0 100644 --- a/modules/async/README +++ b/modules/async/README @@ -31,12 +31,14 @@ Daniel-Constantin Mierla 4.1. async_route(routename, seconds) 4.2. async_sleep(seconds) + 4.3. async_task_route(routename) List of Examples 1.1. Set workers parameter 1.2. async_sleep usage 1.3. async_sleep usage + 1.4. async_task_route usage Chapter 1. Admin Guide @@ -56,6 +58,7 @@ Chapter 1. Admin Guide 4.1. async_route(routename, seconds) 4.2. async_sleep(seconds) + 4.3. async_task_route(routename) 1. Overview @@ -107,6 +110,7 @@ modparam("async", "workers", 2) 4.1. async_route(routename, seconds) 4.2. async_sleep(seconds) + 4.3. async_task_route(routename) 4.1. async_route(routename, seconds) @@ -157,3 +161,35 @@ async_sleep("4"); send_reply("404", "Not found"); exit; ... + +4.3. async_task_route(routename) + + Continue the processing of the SIP request with the route[routename] in + one of the processes from core asynchronous framework. The core + parameter async_workers has to be set to enable asynchronous framework. + The task is executed as soon as a process from asynchronous framework + is idle, there is no wait time for the task like for async_route(...). + + In case of internal errors, the function returns false, otherwise the + function exits the execution of the script at that moment (return 0 + behaviour). + + The routename parameter can be a static string or a dynamic string + value with config variables. + + Since the SIP request handling is resumed in another process, the + config file execution state is practically lost. Therefore beware that + the execution of config after resume will end once the route[routename] + is finished. + + This function can be used from REQUEST_ROUTE. + + Example 1.4. async_task_route usage +... +async_task_rroute("RESUME"); +... +route[RESUME] { + send_reply("404", "Not found"); + exit; +} +... diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml index 02d4b26..8556fd2 100644 --- a/modules/async/doc/async_admin.xml +++ b/modules/async/doc/async_admin.xml @@ -90,7 +90,7 @@ modparam("async", "workers", 2) <section> <title>Functions</title> - <section> + <section id="async.f.async_route"> <title> <function moreinfo="none">async_route(routename, seconds)</function> </title> @@ -133,7 +133,7 @@ route[RESUME] { </example> </section> - <section> + <section id="async.f.async_sleep"> <title> <function moreinfo="none">async_sleep(seconds)</function> </title> @@ -161,6 +161,51 @@ exit; </programlisting> </example> </section> + + <section id="async.f.async_task_route"> + <title> + <function moreinfo="none">async_task_route(routename)</function> + </title> + <para> + Continue the processing of the SIP request with the route[routename] + in one of the processes from core asynchronous framework. The core + parameter async_workers has to be set to enable asynchronous + framework. The task is executed as soon as a process from asynchronous + framework is idle, there is no wait time for the task like for + async_route(...). + </para> + <para> + In case of internal errors, the function returns false, otherwise the + function exits the execution of the script at that moment (return + 0 behaviour). + </para> + <para> + The routename parameter can be a static string or a dynamic string + value with config variables. + </para> + <para> + Since the SIP request handling is resumed in another process, + the config file execution state is practically lost. Therefore beware + that the execution of config after resume will end once the + route[routename] is finished. + </para> + <para> + This function can be used from REQUEST_ROUTE. + </para> + <example> + <title><function>async_task_route</function> usage</title> + <programlisting format="linespecific"> +... +async_task_rroute("RESUME"); +... +route[RESUME] { + send_reply("404", "Not found"); + exit; +} +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:master: async: fixed type in the title of async_route() example
by Daniel-Constantin Mierla 14 Apr '14

14 Apr '14

Module: sip-router Branch: master Commit: 93a0a29f445a21a1397bd9ce6b34563fbf889fd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93a0a29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 14:31:53 2014 +0200 async: fixed type in the title of async_route() example --- modules/async/README | 4 ++-- modules/async/doc/async_admin.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/async/README b/modules/async/README index 3dd83a0..deb5748 100644 --- a/modules/async/README +++ b/modules/async/README @@ -36,7 +36,7 @@ Daniel-Constantin Mierla List of Examples 1.1. Set workers parameter - 1.2. async_sleep usage + 1.2. async_route usage 1.3. async_sleep usage 1.4. async_task_route usage @@ -133,7 +133,7 @@ modparam("async", "workers", 2) This function can be used from REQUEST_ROUTE. - Example 1.2. async_sleep usage + Example 1.2. async_route usage ... async_route("RESUME", "4"); ... diff --git a/modules/async/doc/async_admin.xml b/modules/async/doc/async_admin.xml index 8556fd2..6ca0f20 100644 --- a/modules/async/doc/async_admin.xml +++ b/modules/async/doc/async_admin.xml @@ -119,7 +119,7 @@ modparam("async", "workers", 2) This function can be used from REQUEST_ROUTE. </para> <example> - <title><function>async_sleep</function> usage</title> + <title><function>async_route</function> usage</title> <programlisting format="linespecific"> ... async_route("RESUME", "4");

1 0

git:master: async: new function async_task_route(rname)
by Daniel-Constantin Mierla 14 Apr '14

14 Apr '14

Module: sip-router Branch: master Commit: cab6c3abedb9036ebd75483c860b0caa74388e4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cab6c3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 14:16:48 2014 +0200 async: new function async_task_route(rname) - execute actions in a routing block via core async framework --- modules/async/async_mod.c | 74 +++++++++++++++++++++++++++++++++++++++++++ modules/async/async_sleep.c | 74 +++++++++++++++++++++++++++++++++++++++++++ modules/async/async_sleep.h | 4 ++- 3 files changed, 151 insertions(+), 1 deletions(-) diff --git a/modules/async/async_mod.c b/modules/async/async_mod.c index 26e94b7..cc838f8 100644 --- a/modules/async/async_mod.c +++ b/modules/async/async_mod.c @@ -33,6 +33,7 @@ #include "../../pvar.h" #include "../../timer_proc.h" #include "../../route_struct.h" +#include "../../async_task.h" #include "../../modules/tm/tm_load.h" #include "async_sleep.h" @@ -49,6 +50,8 @@ static int w_async_sleep(struct sip_msg* msg, char* sec, char* str2); static int fixup_async_sleep(void** param, int param_no); static int w_async_route(struct sip_msg* msg, char* rt, char* sec); static int fixup_async_route(void** param, int param_no); +static int w_async_task_route(struct sip_msg* msg, char* rt, char* p2); +static int fixup_async_task_route(void** param, int param_no); /* tm */ struct tm_binds tmb; @@ -59,6 +62,8 @@ static cmd_export_t cmds[]={ 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"async_sleep", (cmd_function)w_async_sleep, 1, fixup_async_sleep, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"async_task_route", (cmd_function)w_async_task_route, 1, fixup_async_task_route, + 0, REQUEST_ROUTE|FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -129,6 +134,9 @@ static void mod_destroy(void) async_destroy_timer_list(); } +/** + * + */ static int w_async_sleep(struct sip_msg* msg, char* sec, char* str2) { int s; @@ -159,6 +167,9 @@ static int w_async_sleep(struct sip_msg* msg, char* sec, char* str2) return -1; } +/** + * + */ static int fixup_async_sleep(void** param, int param_no) { async_param_t *ap; @@ -179,6 +190,9 @@ static int fixup_async_sleep(void** param, int param_no) return 0; } +/** + * + */ static int w_async_route(struct sip_msg* msg, char* rt, char* sec) { cfg_action_t *act; @@ -220,6 +234,9 @@ static int w_async_route(struct sip_msg* msg, char* rt, char* sec) return 0; } +/** + * + */ static int fixup_async_route(void** param, int param_no) { if(param_no==1) @@ -233,3 +250,60 @@ static int fixup_async_route(void** param, int param_no) } return 0; } + +/** + * + */ +static int w_async_task_route(struct sip_msg* msg, char* rt, char* sec) +{ + cfg_action_t *act; + str rn; + int ri; + + if(msg==NULL) + return -1; + + if(fixup_get_svalue(msg, (gparam_t*)rt, &rn)!=0) + { + LM_ERR("no async route block name\n"); + return -1; + } + + ri = route_get(&main_rt, rn.s); + if(ri<0) + { + LM_ERR("unable to find route block [%.*s]\n", rn.len, rn.s); + return -1; + } + act = main_rt.rlist[ri]; + if(act==NULL) + { + LM_ERR("empty action lists in route block [%.*s]\n", rn.len, rn.s); + return -1; + } + + if(async_send_task(msg, act)<0) + return -1; + /* force exit in config */ + return 0; +} + +/** + * + */ +static int fixup_async_task_route(void** param, int param_no) +{ + if(!async_task_initialized()) { + LM_ERR("async task framework was not initialized" + " - set async_workers parameter in core\n"); + return -1; + } + + if(param_no==1) + { + if(fixup_spve_null(param, 1)<0) + return -1; + return 0; + } + return 0; +} diff --git a/modules/async/async_sleep.c b/modules/async/async_sleep.c index e486a3b..2dcd911 100644 --- a/modules/async/async_sleep.c +++ b/modules/async/async_sleep.c @@ -31,6 +31,7 @@ #include "../../ut.h" #include "../../locking.h" #include "../../timer.h" +#include "../../async_task.h" #include "../../modules/tm/tm_load.h" #include "async_sleep.h" @@ -186,3 +187,76 @@ void async_timer_exec(unsigned int ticks, void *param) shm_free(ai); } } + + +/** + * + */ +void async_exec_task(void *param) +{ + cfg_action_t *act; + unsigned int *p; + unsigned int tindex; + unsigned int tlabel; + + act = *((cfg_action_t**)param); + p = (unsigned int*)((char*)param + sizeof(cfg_action_t*)); + tindex = p[0]; + tlabel = p[1]; + + if(act!=NULL) + tmb.t_continue(tindex, tlabel, act); + /* param is freed along with the async task strucutre in core */ +} + +/** + * + */ +int async_send_task(sip_msg_t* msg, cfg_action_t *act) +{ + async_task_t *at; + tm_cell_t *t = 0; + unsigned int tindex; + unsigned int tlabel; + int dsize; + unsigned int *p; + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + dsize = sizeof(async_task_t) + sizeof(cfg_action_t*) + + 2*sizeof(unsigned int); + at = (async_task_t*)shm_malloc(dsize); + if(at==NULL) + { + LM_ERR("no more shm\n"); + return -1; + } + memset(at, 0, dsize); + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suppend the processing\n"); + shm_free(at); + return -1; + } + at->exec = async_exec_task; + at->param = (char*)at + sizeof(async_task_t); + *((cfg_action_t**)at->param) = act; + p = (unsigned int*)((char*)at->param + sizeof(cfg_action_t*)); + p[0] = tindex; + p[1] = tlabel; + async_task_push(at); + return 0; +} diff --git a/modules/async/async_sleep.h b/modules/async/async_sleep.h index 6275bd4..2ae6bcf 100644 --- a/modules/async/async_sleep.h +++ b/modules/async/async_sleep.h @@ -42,8 +42,10 @@ int async_init_timer_list(void); int async_destroy_timer_list(void); -int async_sleep(struct sip_msg* msg, int seconds, cfg_action_t *act); +int async_sleep(sip_msg_t* msg, int seconds, cfg_action_t *act); void async_timer_exec(unsigned int ticks, void *param); +int async_send_task(sip_msg_t* msg, cfg_action_t *act); + #endif

1 0

git:master: core: async_workers - new core parameter
by Daniel-Constantin Mierla 14 Apr '14

14 Apr '14

Module: sip-router Branch: master Commit: d5a22ca880d04549b4f65086bcfd2f3f67311bcb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5a22ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 14:17:36 2014 +0200 core: async_workers - new core parameter - specify how many processes to create for asyn framework - default is 0 (asyn framework disabled) - you must set it to >0 to enable it --- cfg.lex | 2 ++ cfg.y | 4 ++++ main.c | 1 + sr_module.c | 12 ++++++++++++ 4 files changed, 19 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index 3d4b889..7435bb2 100644 --- a/cfg.lex +++ b/cfg.lex @@ -392,6 +392,7 @@ MAXBUFFER maxbuffer SQL_BUFFER_SIZE sql_buffer_size CHILDREN children SOCKET_WORKERS socket_workers +ASYNC_WORKERS async_workers CHECK_VIA check_via PHONE2TEL phone2tel MEMLOG "memlog"|"mem_log" @@ -775,6 +776,7 @@ IMPORTFILE "import_file" <INITIAL>{SQL_BUFFER_SIZE} { count(); yylval.strval=yytext; return SQL_BUFFER_SIZE; } <INITIAL>{CHILDREN} { count(); yylval.strval=yytext; return CHILDREN; } <INITIAL>{SOCKET_WORKERS} { count(); yylval.strval=yytext; return SOCKET_WORKERS; } +<INITIAL>{ASYNC_WORKERS} { count(); yylval.strval=yytext; return ASYNC_WORKERS; } <INITIAL>{CHECK_VIA} { count(); yylval.strval=yytext; return CHECK_VIA; } <INITIAL>{PHONE2TEL} { count(); yylval.strval=yytext; return PHONE2TEL; } <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } diff --git a/cfg.y b/cfg.y index fd0fd2c..2e75bc7 100644 --- a/cfg.y +++ b/cfg.y @@ -141,6 +141,7 @@ #include "rvalue.h" #include "sr_compat.h" #include "msg_translator.h" +#include "async_task.h" #include "ppcfg.h" #include "pvapi.h" @@ -439,6 +440,7 @@ extern char *finame; %token STAT %token CHILDREN %token SOCKET_WORKERS +%token ASYNC_WORKERS %token CHECK_VIA %token PHONE2TEL %token MEMLOG @@ -938,6 +940,8 @@ assign_stm: | CHILDREN EQUAL error { yyerror("number expected"); } | SOCKET_WORKERS EQUAL NUMBER { socket_workers=$3; } | SOCKET_WORKERS EQUAL error { yyerror("number expected"); } + | ASYNC_WORKERS EQUAL NUMBER { async_task_set_workers($3); } + | ASYNC_WORKERS EQUAL error { yyerror("number expected"); } | CHECK_VIA EQUAL NUMBER { check_via=$3; } | CHECK_VIA EQUAL error { yyerror("boolean value expected"); } | PHONE2TEL EQUAL NUMBER { phone2tel=$3; } diff --git a/main.c b/main.c index b86b67d..89115a4 100644 --- a/main.c +++ b/main.c @@ -190,6 +190,7 @@ #include "pv_core.h" /* register core pvars */ #include "ppcfg.h" #include "sock_ut.h" +#include "async_task.h" #ifdef DEBUG_DMALLOC #include <dmalloc.h> diff --git a/sr_module.c b/sr_module.c index e169291..3fb98a6 100644 --- a/sr_module.c +++ b/sr_module.c @@ -65,6 +65,7 @@ #include "rpc_lookup.h" #include "sr_compat.h" #include "ppcfg.h" +#include "async_task.h" #include <sys/stat.h> #include <regex.h> @@ -842,6 +843,9 @@ int init_modules(void) { struct sr_module* t; + if(async_task_init()<0) + return -1; + for(t = modules; t; t = t->next) { if (t->exports.init_f) { if (t->exports.init_f() != 0) { @@ -891,6 +895,8 @@ int init_child(int rank) } DBG("init_child: initializing %s with rank %d\n", type, rank); + if(async_task_child_init(rank)<0) + return -1; for(t = modules; t; t = t->next) { if (t->exports.init_child_f) { @@ -945,6 +951,9 @@ static int init_mod_child( struct sr_module* m, int rank ) */ int init_child(int rank) { + if(async_task_child_init(rank)<0) + return -1; + return init_mod_child(modules, rank); } @@ -991,6 +1000,9 @@ int init_modules(void) struct sr_module* t; int i; + if(async_task_init()<0) + return -1; + i = init_mod(modules); if(i!=0) return i;

1 0

git:master: core: framework for creating asynchronous pool of workers
by Daniel-Constantin Mierla 14 Apr '14

14 Apr '14

Module: sip-router Branch: master Commit: 9467ebbfdeea640923dbb77b4bea97ccda795903 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9467ebb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 14 14:13:36 2014 +0200 core: framework for creating asynchronous pool of workers - dedicated group of processes that can get tasks from other processes via memory pipe - react immediately, no time based polling - should reduce the need for other components to create extra processes for special handling --- async_task.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ async_task.h | 36 ++++++++++ 2 files changed, 256 insertions(+), 0 deletions(-) diff --git a/async_task.c b/async_task.c new file mode 100644 index 0000000..f5aa818 --- /dev/null +++ b/async_task.c @@ -0,0 +1,220 @@ +/** + * Copyright (C) 2014 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Extensible SIP Router, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> + +#include <sys/socket.h> +#include <sys/types.h> +#include <sys/un.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#include <fcntl.h> +#include <errno.h> + +#include "dprint.h" +#include "sr_module.h" +#include "ut.h" +#include "pt.h" +#include "cfg/cfg_struct.h" + + +#include "async_task.h" + +static int _async_task_workers = 0; +static int _async_task_sockets[2]; + +int async_task_run(int idx); + +/** + * + */ +int async_task_init_sockets(void) +{ + if (socketpair(PF_UNIX, SOCK_DGRAM, 0, _async_task_sockets) < 0) { + LM_ERR("opening tasks dgram socket pair\n"); + return -1; + } + LM_DBG("inter-process event notification sockets initialized\n"); + return 0; +} + +/** + * + */ +void async_task_close_sockets_child(void) +{ + LM_DBG("closing the notification socket used by children\n"); + close(_async_task_sockets[1]); +} + +/** + * + */ +void async_task_close_sockets_parent(void) +{ + LM_DBG("closing the notification socket used by parent\n"); + close(_async_task_sockets[0]); +} + +/** + * + */ +int async_task_init(void) +{ + LM_DBG("start initializing asynk task framework\n"); + if(_async_task_workers<=0) + return 0; + + /* advertise new processes to core */ + register_procs(_async_task_workers); + + /* advertise new processes to cfg framework */ + cfg_register_child(_async_task_workers); + + return 0; +} + +/** + * + */ +int async_task_initialized(void) +{ + if(_async_task_workers<=0) + return 0; + return 1; +} + +/** + * + */ +int async_task_child_init(int rank) +{ + int pid; + int i; + + LM_DBG("child initializing asynk task framework\n"); + + if(_async_task_workers<=0) + return 0; + + if (rank==PROC_INIT) { + if(async_task_init_sockets()<0) { + LM_ERR("failed to initialize tasks sockets\n"); + return -1; + } + return 0; + } + + if(rank>0) { + async_task_close_sockets_parent(); + return 0; + } + if (rank!=PROC_MAIN) + return 0; + + for(i=0; i<_async_task_workers; i++) { + pid=fork_process(PROC_RPC, "Async Task Worker", 1); + if (pid<0) + return -1; /* error */ + if(pid==0) { + /* child */ + + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + /* main function for workers */ + if(async_task_run(i+1)<0) { + LM_ERR("failed to initialize task worker process: %d\n", i); + return -1; + } + } + } + + return 0; +} + +/** + * + */ +int async_task_set_workers(int n) +{ + if(_async_task_workers>0) { + LM_WARN("task workers already set\n"); + return 0; + } + if(n<=0) + return 0; + + _async_task_workers = n; + + return 0; +} + +/** + * + */ +int async_task_push(async_task_t *task) +{ + int len; + + if(_async_task_workers<=0) + return 0; + + len = write(_async_task_sockets[1], &task, sizeof(async_task_t*)); + if(len<=0) { + LM_ERR("failed to pass the task to asynk workers\n"); + return -1; + } + LM_DBG("task sent [%p]\n", task); + return 0; +} + +/** + * + */ +int async_task_run(int idx) +{ + async_task_t *ptask; + int received; + + LM_DBG("async task worker %d ready\n", idx); + + for( ; ; ) { + if ((received = recvfrom(_async_task_sockets[0], + &ptask, sizeof(async_task_t*), + 0, NULL, 0)) < 0) { + LM_ERR("failed to received task (%d: %s)\n", errno, strerror(errno)); + continue; + } + if(received != sizeof(async_task_t*)) { + LM_ERR("invalid task size %d\n", received); + continue; + } + if(ptask->exec!=NULL) { + LM_DBG("task executed [%p] (%p/%p)\n", ptask, + ptask->exec, ptask->param); + ptask->exec(ptask->param); + } + shm_free(ptask); + } + + return 0; +} diff --git a/async_task.h b/async_task.h new file mode 100644 index 0000000..4c317a1 --- /dev/null +++ b/async_task.h @@ -0,0 +1,36 @@ +/** + * Copyright (C) 2014 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Extensible SIP Router, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + + +#ifndef _ASYNC_TASK_H_ +#define _ASYNC_TASK_H_ + +typedef void (*async_cbe_t)(void *p); + +typedef struct _async_task { + async_cbe_t exec; + void *param; +} async_task_t; + +int async_task_init(void); +int async_task_child_init(int rank); +int async_task_initialized(void); +int async_task_set_workers(int n); +int async_task_push(async_task_t *task); + +#endif

1 0

git:master: pv: use pv cache to lookup avp name for $cnt(...)
by Daniel-Constantin Mierla 13 Apr '14

13 Apr '14

Module: sip-router Branch: master Commit: eb5b9c6965d1da46f8cb45d3ac2eb6598b3b6dea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb5b9c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 13 22:19:15 2014 +0200 pv: use pv cache to lookup avp name for $cnt(...) --- modules/pv/pv_core.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 0afd9b1..ecf956a 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -2779,30 +2779,21 @@ int pv_parse_cnt_name(pv_spec_p sp, str *in) if(in->s==NULL || in->len<=0) return -1; + pv = pv_cache_get(in); pv = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); - if(pv==NULL) + if(pv==NULL) { + LM_ERR("cannot find pv name [%.*s]\n", in->len, in->s); return -1; + } - memset(pv, 0, sizeof(pv_spec_t)); - - if(pv_parse_spec(in, pv)==NULL) - goto error; - - if(pv->type!=PVT_AVP) - { + if(pv->type!=PVT_AVP) { LM_ERR("expected avp name instead of [%.*s]\n", in->len, in->s); - goto error; + return -1; } sp->pvp.pvn.u.dname = (void*)pv; sp->pvp.pvn.type = PV_NAME_PVAR; return 0; - -error: - LM_ERR("invalid pv name [%.*s]\n", in->len, in->s); - if(pv!=NULL) - pkg_free(pv); - return -1; }

1 0

git:master: ipops: new pv to get hostname details:
by Daniel-Constantin Mierla 13 Apr '14

13 Apr '14

Module: sip-router Branch: master Commit: 997f13c89d16361799651cd77214ffdcf26d532c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=997f13c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 13 16:22:38 2014 +0200 ipops: new pv to get hostname details: - $HN(n) - hostname - $HN(d) - domain - $HN(f) - fullname - $HN(i) - ip address - based on gethsontname and resolving it --- modules/ipops/ipops_mod.c | 2 + modules/ipops/ipops_pv.c | 166 +++++++++++++++++++++++++++++++++++++++++++++ modules/ipops/ipops_pv.h | 4 + 3 files changed, 172 insertions(+), 0 deletions(-) diff --git a/modules/ipops/ipops_mod.c b/modules/ipops/ipops_mod.c index d90aaa3..4e174f5 100644 --- a/modules/ipops/ipops_mod.c +++ b/modules/ipops/ipops_mod.c @@ -96,6 +96,8 @@ static int w_dns_query(struct sip_msg* msg, char* str1, char* str2); static pv_export_t mod_pvs[] = { { {"dns", sizeof("dns")-1}, PVT_OTHER, pv_get_dns, 0, pv_parse_dns_name, 0, 0, 0 }, + { {"HN", sizeof("HN")-1}, PVT_OTHER, pv_get_hn, 0, + pv_parse_hn_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/modules/ipops/ipops_pv.c b/modules/ipops/ipops_pv.c index 08be1fe..d6edadd 100644 --- a/modules/ipops/ipops_pv.c +++ b/modules/ipops/ipops_pv.c @@ -33,6 +33,7 @@ #include "../../dprint.h" #include "../../hashes.h" +#include "../../resolve.h" #include "../../pvar.h" @@ -428,3 +429,168 @@ int dns_update_pv(str *hostname, str *name) return 1; } + + +struct _hn_pv_data { + str data; + str fullname; + str hostname; + str domain; + str ipaddr; +}; + +static struct _hn_pv_data *_hn_data = NULL; + +/** + * + */ +int hn_pv_data_init(void) +{ + char hbuf[512]; + int hlen; + char *d; + struct hostent *he; + int i; + + if(_hn_data != NULL) + return 0; + + if (gethostname(hbuf, 512)<0) { + LM_WARN("gethostname failed - host pvs will be null\n"); + return -1; + } + + hlen = strlen(hbuf); + if(hlen<=0) { + LM_WARN("empty hostname result - host pvs will be null\n"); + return -1; + } + + _hn_data = (struct _hn_pv_data*)pkg_malloc(sizeof(struct _hn_pv_data)+46+2*(hlen+1)); + if(_hn_data==NULL) { + LM_ERR("no more pkg to init hostname data\n"); + return -1; + } + memset(_hn_data, 0, sizeof(struct _hn_pv_data)+46+2*(hlen+1)); + + _hn_data->data.len = hlen; + _hn_data->data.s = (char*)_hn_data + sizeof(struct _hn_pv_data); + _hn_data->fullname.len = hlen; + _hn_data->fullname.s = _hn_data->data.s + hlen + 1; + + strcpy(_hn_data->data.s, hbuf); + strcpy(_hn_data->fullname.s, hbuf); + + d=strchr(_hn_data->data.s, '.'); + if (d) { + _hn_data->hostname.len = d - _hn_data->data.s; + _hn_data->hostname.s = _hn_data->data.s; + _hn_data->domain.len = _hn_data->fullname.len + - _hn_data->hostname.len-1; + _hn_data->domain.s = d+1; + } else { + _hn_data->hostname = _hn_data->fullname; + } + + he=resolvehost(_hn_data->fullname.s); + if (he) { + if ((strlen(he->h_name)!=_hn_data->fullname.len) + || strncmp(he->h_name, _hn_data->fullname.s, + _hn_data->fullname.len)) { + LM_WARN("hostname '%.*s' different than gethostbyname '%s'\n", + _hn_data->fullname.len, _hn_data->fullname.s, he->h_name); + } + + if (he->h_addr_list) { + for (i=0; he->h_addr_list[i]; i++) { + if (inet_ntop(he->h_addrtype, he->h_addr_list[i], hbuf, 46)) { + if (_hn_data->ipaddr.len==0) { + _hn_data->ipaddr.len = strlen(hbuf); + _hn_data->ipaddr.s = _hn_data->fullname.s + hlen + 1; + strcpy(_hn_data->ipaddr.s, hbuf); + } else if (strncmp(_hn_data->ipaddr.s, hbuf, + _hn_data->ipaddr.len)!=0) { + LM_WARN("many IPs to hostname: %s not used\n", hbuf); + } + } + } + } else { + LM_WARN(" can't resolve hostname's address: %s\n", + _hn_data->fullname.s); + } + } + + DBG("Hostname: %.*s\n", _hn_data->hostname.len, ZSW(_hn_data->hostname.s)); + DBG("Domain: %.*s\n", _hn_data->domain.len, ZSW(_hn_data->domain.s)); + DBG("Fullname: %.*s\n", _hn_data->fullname.len, ZSW(_hn_data->fullname.s)); + DBG("IPaddr: %.*s\n", _hn_data->ipaddr.len, ZSW(_hn_data->ipaddr.s)); + + return 0; +} + +/** + * + */ +int pv_parse_hn_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 1: + if(strncmp(in->s, "n", 1)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "f", 1)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "d", 1)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "i", 1)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + hn_pv_data_init(); + + return 0; + +error: + LM_ERR("unknown host PV name %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_hn(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(param==NULL) + return -1; + if(_hn_data==NULL) + return pv_get_null(msg, param, res);; + switch(param->pvn.u.isname.name.n) + { + case 1: + if(_hn_data->fullname.len==0) + return pv_get_null(msg, param, res);; + return pv_get_strval(msg, param, res, &_hn_data->fullname); + case 2: + if(_hn_data->domain.len==0) + return pv_get_null(msg, param, res);; + return pv_get_strval(msg, param, res, &_hn_data->domain); + case 3: + if(_hn_data->ipaddr.len==0) + return pv_get_null(msg, param, res);; + return pv_get_strval(msg, param, res, &_hn_data->ipaddr); + default: + if(_hn_data->hostname.len==0) + return pv_get_null(msg, param, res);; + return pv_get_strval(msg, param, res, &_hn_data->hostname); + } +} diff --git a/modules/ipops/ipops_pv.h b/modules/ipops/ipops_pv.h index 043d891..16c8ac8 100644 --- a/modules/ipops/ipops_pv.h +++ b/modules/ipops/ipops_pv.h @@ -35,5 +35,9 @@ int dns_init_pv(char *path); void dns_destroy_pv(void); int dns_update_pv(str *tomatch, str *name); +int pv_parse_hn_name(pv_spec_p sp, str *in); +int pv_get_hn(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + #endif

1 0

git:master: modules/sdpops: fixed typo in readme example
by Juha Heinanen 13 Apr '14

13 Apr '14

Module: sip-router Branch: master Commit: 0bea3e5cf97593b2955aec4bb545b4f8698bd964 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0bea3e5… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Apr 13 10:34:30 2014 +0300 modules/sdpops: fixed typo in readme example --- modules/sdpops/README | 2 +- modules/sdpops/doc/sdpops_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sdpops/README b/modules/sdpops/README index e694b17..ce92cc1 100644 --- a/modules/sdpops/README +++ b/modules/sdpops/README @@ -293,7 +293,7 @@ if(sdp_with_transport("RTP/SAVP")) Example 1.9. sdp_with_transport_like usage ... # check for SAVPF stream -if(sdp_with_transport("SAVPF")) +if(sdp_with_transport_like("SAVPF")) { # the session has a SAVPF stream, e.g., RTP/SAVPF or UDP/TLS/RTP/SAVPF } diff --git a/modules/sdpops/doc/sdpops_admin.xml b/modules/sdpops/doc/sdpops_admin.xml index 4ce7a01..53216fd 100644 --- a/modules/sdpops/doc/sdpops_admin.xml +++ b/modules/sdpops/doc/sdpops_admin.xml @@ -293,7 +293,7 @@ if(sdp_with_transport("RTP/SAVP")) <programlisting format="linespecific"> ... # check for SAVPF stream -if(sdp_with_transport("SAVPF")) +if(sdp_with_transport_like("SAVPF")) { # the session has a SAVPF stream, e.g., RTP/SAVPF or UDP/TLS/RTP/SAVPF }

1 0

[tracker] Task closed: kamailio crashed time to time in the different places
by sip-router 11 Apr '14

11 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#393 - kamailio crashed time to time in the different places User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=393 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: kamailio crashed time to time in the different places
by sip-router 11 Apr '14

11 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#393 - kamailio crashed time to time in the different places User who did this - Daniel-Constantin Mierla (miconda) ---------- You should try with latest version in 4.0 branch (4.0.6 right now), there were fixes to some issues that could result in such behaviour. I am closing this item, if you still get it, reopen and provide the backtrace again. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=393#comment1386 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
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 April 2014