sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:d511399b: kazoo: add more explicit fields to kz_pua

by lazedo

Module: kamailio Branch: master Commit: d511399baa6a701fa0303487174a7bdc996fd051 URL: https://github.com/kamailio/kamailio/commit/d511399baa6a701fa0303487174a7bd… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-14T04:54:57+01:00 kazoo: add more explicit fields to kz_pua kz_pua.c was reformatted --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kz_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/d511399baa6a701fa0303487174a7bd… Patch: https://github.com/kamailio/kamailio/commit/d511399baa6a701fa0303487174a7bd…

7 years, 7 months

git:master:349def6b: kazoo: add pua transaction lock type

by lazedo

Module: kamailio Branch: master Commit: 349def6b129e63cdc46b88c502562c9e2543d421 URL: https://github.com/kamailio/kamailio/commit/349def6b129e63cdc46b88c502562c9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-14T04:38:30+01:00 kazoo: add pua transaction lock type --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/349def6b129e63cdc46b88c502562c9… Patch: https://github.com/kamailio/kamailio/commit/349def6b129e63cdc46b88c502562c9… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 5c81ad2..8574de6 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -88,6 +88,7 @@ int dbk_consumer_loop_count = 10; int dbk_consumer_ack_loop_count = 20; int dbk_include_entity = 1; int dbk_pua_mode = 1; +db_locking_t kz_pua_lock_type = DB_LOCKING_WRITE; int dbk_use_hearbeats = 0; int dbk_single_consumer_on_reconnect = 1; int dbk_consume_messages_on_reconnect = 1; @@ -197,6 +198,7 @@ static param_export_t params[] = { {"amqps_key", STR_PARAM, &kz_amqps_key.s}, {"amqps_verify_peer", INT_PARAM, &kz_amqps_verify_peer}, {"amqps_verify_hostname", INT_PARAM, &kz_amqps_verify_hostname}, + {"pua_lock_type", INT_PARAM, &kz_pua_lock_type}, {0, 0, 0} }; diff --git a/src/modules/kazoo/kz_pua.c b/src/modules/kazoo/kz_pua.c index 60b89dc..3c1e3cf 100644 --- a/src/modules/kazoo/kz_pua.c +++ b/src/modules/kazoo/kz_pua.c @@ -43,6 +43,7 @@ extern db1_con_t *kz_pa_db; extern db_func_t kz_pa_dbf; extern str kz_presentity_table; +extern db_locking_t kz_pua_lock_type; int kz_pua_update_presentity(str* event, str* realm, str* user, str* etag, str* sender, str* body, int expires, int reset) { @@ -125,7 +126,7 @@ int kz_pua_update_presentity(str* event, str* realm, str* user, str* etag, str* if (kz_pa_dbf.start_transaction) { - if (kz_pa_dbf.start_transaction(kz_pa_db, DB_LOCKING_WRITE) < 0) + if (kz_pa_dbf.start_transaction(kz_pa_db, kz_pua_lock_type) < 0) { LM_ERR("in start_transaction\n"); goto error;

7 years, 7 months

git:4.4:4febe26a: p_usrloc: fix to update expires column when db_ops_ruid set

by Lucian Balaceanu

Module: kamailio Branch: 4.4 Commit: 4febe26a166390b47bf63775cdeea71bb9089781 URL: https://github.com/kamailio/kamailio/commit/4febe26a166390b47bf63775cdeea71… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-04-13T16:52:50+03:00 p_usrloc: fix to update expires column when db_ops_ruid set --- Modified: modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/4febe26a166390b47bf63775cdeea71… Patch: https://github.com/kamailio/kamailio/commit/4febe26a166390b47bf63775cdeea71… --- diff --git a/modules/p_usrloc/ucontact.c b/modules/p_usrloc/ucontact.c index 72a5e65..ac7ba49 100644 --- a/modules/p_usrloc/ucontact.c +++ b/modules/p_usrloc/ucontact.c @@ -819,10 +819,10 @@ int db_update_ucontact_ruid(ucontact_t* _c) vals2[n2].val.str_val = _c->c; n2++; - keys2[n2] = &callid_col; - vals2[n2].type = DB1_STR; + keys2[n2] = &expires_col; + vals2[n2].type = DB1_DATETIME; vals2[n2].nul = 0; - vals2[n2].val.str_val = _c->callid; + vals2[n2].val.time_val = _c->expires; n2++; keys2[n2] = &q_col;

7 years, 7 months

git:master:3cdcb8ae: p_usrloc: fix to update expires column when db_ops_ruid set

by Lucian Balaceanu

Module: kamailio Branch: master Commit: 3cdcb8ae3783d7221d212df00769b495f88c740b URL: https://github.com/kamailio/kamailio/commit/3cdcb8ae3783d7221d212df00769b49… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-04-13T15:02:37+03:00 p_usrloc: fix to update expires column when db_ops_ruid set --- Modified: src/modules/p_usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/3cdcb8ae3783d7221d212df00769b49… Patch: https://github.com/kamailio/kamailio/commit/3cdcb8ae3783d7221d212df00769b49… --- diff --git a/src/modules/p_usrloc/ucontact.c b/src/modules/p_usrloc/ucontact.c index 5bc5e09..75da91a 100644 --- a/src/modules/p_usrloc/ucontact.c +++ b/src/modules/p_usrloc/ucontact.c @@ -819,10 +819,10 @@ int db_update_ucontact_ruid(ucontact_t* _c) vals2[n2].val.str_val = _c->c; n2++; - keys2[n2] = &callid_col; - vals2[n2].type = DB1_STR; + keys2[n2] = &expires_col; + vals2[n2].type = DB1_DATETIME; vals2[n2].nul = 0; - vals2[n2].val.str_val = _c->callid; + vals2[n2].val.time_val = _c->expires; n2++; keys2[n2] = &q_col;

7 years, 7 months

git:master:0efa0994: speeddial: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0efa0994519428c415c0cf16266b6bfc8345b67c URL: https://github.com/kamailio/kamailio/commit/0efa0994519428c415c0cf16266b6bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-13T09:27:13+02:00 speeddial: exported functions to kemi framework --- Modified: src/modules/speeddial/sdlookup.c Modified: src/modules/speeddial/sdlookup.h Modified: src/modules/speeddial/speeddial.c --- Diff: https://github.com/kamailio/kamailio/commit/0efa0994519428c415c0cf16266b6bf… Patch: https://github.com/kamailio/kamailio/commit/0efa0994519428c415c0cf16266b6bf… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index 79d52a8..13c7095 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -61,7 +61,7 @@ static inline int rewrite_ruri(struct sip_msg* _m, char* _s) /** * */ -int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) +int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) { str user_s, table_s, uri_s; int nr_keys; @@ -72,24 +72,21 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) db_key_t db_cols[1]; db1_res_t* db_res = NULL; - if(_table==NULL || fixup_get_svalue(_msg, (gparam_p)_table, &table_s)!=0) + if(stable==NULL || stable->s==NULL || stable->len<=0) { LM_ERR("invalid table parameter"); return -1; } + table_s = *stable; /* init */ nr_keys = 0; db_cols[0]=&new_uri_column; - if(_owner) + if(sowner!=NULL && sowner->s!=NULL && sowner->len>0) { + uri_s = *sowner; memset(&turi, 0, sizeof(struct sip_uri)); - if(fixup_get_svalue(_msg, (gparam_p)_owner, &uri_s)!=0) - { - LM_ERR("invalid owner uri parameter"); - return -1; - } if(parse_uri(uri_s.s, uri_s.len, &turi)!=0) { LM_ERR("bad owner SIP address!\n"); @@ -236,3 +233,28 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) return -1; } +/** + * + */ +int w_sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) +{ + str table_s, uri_s; + + if(_table==NULL || fixup_get_svalue(_msg, (gparam_p)_table, &table_s)!=0) + { + LM_ERR("invalid table parameter"); + return -1; + } + + if(_owner) + { + if(fixup_get_svalue(_msg, (gparam_p)_owner, &uri_s)!=0) + { + LM_ERR("invalid owner uri parameter"); + return -1; + } + return sd_lookup_owner(_msg, &table_s, &uri_s); + } + + return sd_lookup_owner(_msg, &table_s, NULL); +} diff --git a/src/modules/speeddial/sdlookup.h b/src/modules/speeddial/sdlookup.h index ea846b7..582afd4 100644 --- a/src/modules/speeddial/sdlookup.h +++ b/src/modules/speeddial/sdlookup.h @@ -26,6 +26,7 @@ #include "../../core/parser/msg_parser.h" -int sd_lookup(struct sip_msg* _msg, char* _table, char* _str2); +int w_sd_lookup(struct sip_msg* _msg, char* _table, char* _owner); +int sd_lookup_owner(struct sip_msg* _msg, str* _stable, str* _sowner); #endif /* _SDLOOKUP_H_ */ diff --git a/src/modules/speeddial/speeddial.c b/src/modules/speeddial/speeddial.c index 6c4e2a5..d5baa65 100644 --- a/src/modules/speeddial/speeddial.c +++ b/src/modules/speeddial/speeddial.c @@ -29,6 +29,7 @@ #include "../../core/error.h" #include "../../core/mem/mem.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" #include "sdlookup.h" @@ -65,9 +66,9 @@ db1_con_t* db_handle=0; /* Database connection handle */ /* Exported functions */ static cmd_export_t cmds[] = { - {"sd_lookup", (cmd_function)sd_lookup, 1, fixup_spve_null, 0, + {"sd_lookup", (cmd_function)w_sd_lookup, 1, fixup_spve_null, 0, REQUEST_ROUTE}, - {"sd_lookup", (cmd_function)sd_lookup, 2, fixup_spve_spve, 0, + {"sd_lookup", (cmd_function)w_sd_lookup, 2, fixup_spve_spve, 0, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -158,3 +159,39 @@ static void destroy(void) db_funcs.close(db_handle); } +/** + * + */ +static int ki_sd_lookup(sip_msg_t *msg, str *stable) +{ + return sd_lookup_owner(msg, stable, NULL); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_speeddial_exports[] = { + { str_init("speeddial"), str_init("lookup"), + SR_KEMIP_INT, ki_sd_lookup, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("speeddial"), str_init("lookup_owner"), + SR_KEMIP_INT, sd_lookup_owner, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_speeddial_exports); + return 0; +}

7 years, 7 months

git:master:911a051b: speeddial: coherent indentation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 911a051b9573d43e01bc627692d99f548f9fc344 URL: https://github.com/kamailio/kamailio/commit/911a051b9573d43e01bc627692d99f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-13T09:00:11+02:00 speeddial: coherent indentation --- Modified: src/modules/speeddial/sdlookup.c Modified: src/modules/speeddial/sdlookup.h Modified: src/modules/speeddial/speeddial.c Modified: src/modules/speeddial/speeddial.h --- Diff: https://github.com/kamailio/kamailio/commit/911a051b9573d43e01bc627692d99f5… Patch: https://github.com/kamailio/kamailio/commit/911a051b9573d43e01bc627692d99f5… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index f561d77..79d52a8 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -81,7 +81,7 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) /* init */ nr_keys = 0; db_cols[0]=&new_uri_column; - + if(_owner) { memset(&turi, 0, sizeof(struct sip_uri)); @@ -105,7 +105,7 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) goto err_server; } } - + db_keys[nr_keys]=&user_column; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; @@ -121,7 +121,7 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) db_vals[nr_keys].val.str_val.s = puri->host.s; db_vals[nr_keys].val.str_val.len = puri->host.len; nr_keys++; - + if (dstrip_s.s!=NULL && dstrip_s.len>0 && dstrip_s.len<puri->host.len && strncasecmp(puri->host.s,dstrip_s.s,dstrip_s.len)==0) @@ -180,21 +180,21 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) user_s.s = useruri_buf+4; switch(RES_ROWS(db_res)[0].values[0].type) - { + { case DB1_STRING: - strcpy(user_s.s, + strcpy(user_s.s, (char*)RES_ROWS(db_res)[0].values[0].val.string_val); user_s.len = strlen(user_s.s); break; case DB1_STR: - strncpy(user_s.s, + strncpy(user_s.s, (char*)RES_ROWS(db_res)[0].values[0].val.str_val.s, RES_ROWS(db_res)[0].values[0].val.str_val.len); user_s.len = RES_ROWS(db_res)[0].values[0].val.str_val.len; user_s.s[user_s.len] = '\0'; break; case DB1_BLOB: - strncpy(user_s.s, + strncpy(user_s.s, (char*)RES_ROWS(db_res)[0].values[0].val.blob_val.s, RES_ROWS(db_res)[0].values[0].val.blob_val.len); user_s.len = RES_ROWS(db_res)[0].values[0].val.blob_val.len; @@ -207,7 +207,7 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) } goto err_server; } - + /* check 'sip:' */ if(user_s.len<4 || strncmp(user_s.s, "sip:", 4)) { diff --git a/src/modules/speeddial/sdlookup.h b/src/modules/speeddial/sdlookup.h index f1fce5d..ea846b7 100644 --- a/src/modules/speeddial/sdlookup.h +++ b/src/modules/speeddial/sdlookup.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * + * */ diff --git a/src/modules/speeddial/speeddial.c b/src/modules/speeddial/speeddial.c index 9ad3f98..6c4e2a5 100644 --- a/src/modules/speeddial/speeddial.c +++ b/src/modules/speeddial/speeddial.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * + * */ @@ -89,7 +89,7 @@ static param_export_t params[] = { /* Module interface */ struct module_exports exports = { - "speeddial", + "speeddial", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* Exported functions */ params, /* Exported parameters */ @@ -128,7 +128,7 @@ static int child_init(int rank) */ static int mod_init(void) { - /* Find a database module */ + /* Find a database module */ if (db_bind_mod(&db_url, &db_funcs)) { LM_ERR("failed to bind database module\n"); diff --git a/src/modules/speeddial/speeddial.h b/src/modules/speeddial/speeddial.h index 73ac321..49dbd6d 100644 --- a/src/modules/speeddial/speeddial.h +++ b/src/modules/speeddial/speeddial.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * + * */

7 years, 7 months

I was surprised

by vladiksip

Dear! I was surprised to receive your message last Saturday, please take a look at the information I found for you http://www.maven-international.com/recently.php?b2b3 Sent from a prehistoric stone tablet, vladiksip

7 years, 7 months

git:master:27ecfa5f: modules: readme files regenerated - evrexec ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 27ecfa5fd8557a65e18c36b8388b7f176213c77b URL: https://github.com/kamailio/kamailio/commit/27ecfa5fd8557a65e18c36b8388b7f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-12T21:31:23+02:00 modules: readme files regenerated - evrexec ... [skip ci] --- Modified: src/modules/evrexec/README --- Diff: https://github.com/kamailio/kamailio/commit/27ecfa5fd8557a65e18c36b8388b7f1… Patch: https://github.com/kamailio/kamailio/commit/27ecfa5fd8557a65e18c36b8388b7f1… --- diff --git a/src/modules/evrexec/README b/src/modules/evrexec/README index cc8a1cd..c259f43 100644 --- a/src/modules/evrexec/README +++ b/src/modules/evrexec/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2017 http://www.asipto.com + Copyright Â© 2017 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -48,8 +48,9 @@ Chapter 1. Admin Guide 1. Overview - The module executes even route blocks once on dedicated processes. The - execution can be delayed for an interval of time. + The module executes event route blocks or KEMI functions on dedicated + processes at startup. The execution can be delayed for a specified + interval of time. The actions in the event route should be a loop or other tasks that run forever. @@ -82,7 +83,10 @@ Chapter 1. Admin Guide The parameter can be set multiple times to get more exec tasks in same configuration file. - * name - name of the event route to be executed. + * name - name of the event route to be executed. When used with a + KEMI embedded laguage, this has to be the name of a function from + the KEMI script. The function must have a string parameter, which + will retrieve the index of the works in string format. * workers - if set to 0 or 1 the task is executed in a dedicated process. Any number > 1 will create more dedicated processes, each of them executing the task.

7 years, 7 months

git:master:a26a65ef: evrexec: notes about usage of modules with KEMI scripts

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a26a65efe5b18ad471a9c5d5fe1a047ade2bda65 URL: https://github.com/kamailio/kamailio/commit/a26a65efe5b18ad471a9c5d5fe1a047… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-12T21:15:30+02:00 evrexec: notes about usage of modules with KEMI scripts --- Modified: src/modules/evrexec/doc/evrexec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a26a65efe5b18ad471a9c5d5fe1a047… Patch: https://github.com/kamailio/kamailio/commit/a26a65efe5b18ad471a9c5d5fe1a047… --- diff --git a/src/modules/evrexec/doc/evrexec_admin.xml b/src/modules/evrexec/doc/evrexec_admin.xml index 840399e..b624eed 100644 --- a/src/modules/evrexec/doc/evrexec_admin.xml +++ b/src/modules/evrexec/doc/evrexec_admin.xml @@ -16,8 +16,9 @@ <section> <title>Overview</title> <para> - The module executes even route blocks once on dedicated processes. The - execution can be delayed for an interval of time. + The module executes event route blocks or KEMI functions on dedicated + processes at startup. The execution can be delayed for a specified + interval of time. </para> <para> The actions in the event route should be a loop or other tasks that @@ -77,6 +78,10 @@ <listitem> <para> <emphasis>name</emphasis> - name of the event route to be executed. + When used with a KEMI embedded laguage, this has to be the name + of a function from the KEMI script. The function must have a + string parameter, which will retrieve the index of the works in + string format. </para> </listitem> <listitem>

7 years, 7 months

git:master:d6a91a42: evrexec: support to execute functions from kemi embedded language

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d6a91a42bc722f51b975241b098c62e2010f0c10 URL: https://github.com/kamailio/kamailio/commit/d6a91a42bc722f51b975241b098c62e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-12T20:25:54+02:00 evrexec: support to execute functions from kemi embedded language --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d6a91a42bc722f51b975241b098c62e… Patch: https://github.com/kamailio/kamailio/commit/d6a91a42bc722f51b975241b098c62e… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 1001571..5d45e6f 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -32,6 +32,7 @@ #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" #include "../../core/parser/parse_param.h" +#include "../../core/kemi.h" #include "../../core/fmsg.h" @@ -52,7 +53,7 @@ static int mod_init(void); static int child_init(int); int evrexec_param(modparam_t type, void* val); -void evrexec_process(evrexec_task_t *it); +void evrexec_process(evrexec_task_t *it, int idx); static param_export_t params[]={ @@ -123,7 +124,7 @@ static int child_init(int rank) while(it) { for(i=0; i<it->workers; i++) { snprintf(si_desc, MAX_PT_DESC, "EVREXEC child=%d exec=%.*s", - i, it->ename.len, it->ename.s); + i, it->ename.len, it->ename.s); pid=fork_process(PROC_RPC, si_desc, 1); if (pid<0) return -1; /* error */ @@ -133,7 +134,7 @@ static int child_init(int rank) if (cfg_child_init()) return -1; - evrexec_process(it); + evrexec_process(it, i); } } it = it->next; @@ -145,15 +146,26 @@ static int child_init(int rank) /** * */ -void evrexec_process(evrexec_task_t *it) +void evrexec_process(evrexec_task_t *it, int idx) { sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + str sidx = STR_NULL; if(it!=NULL) { fmsg = faked_msg_next(); set_route_type(LOCAL_ROUTE); if(it->wait>0) sleep_us(it->wait); - run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + keng = sr_kemi_eng_get(); + if(keng==NULL) { + run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + } else { + sidx.s = int2str(idx, &sidx.len); + if(keng->froute(fmsg, EVENT_ROUTE, + &it->ename, &sidx)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } } /* avoid exiting the process */ while(1) { sleep(3600); } @@ -169,6 +181,7 @@ int evrexec_param(modparam_t type, void *val) param_t *pit=NULL; evrexec_task_t *it; evrexec_task_t tmp; + sr_kemi_eng_t *keng = NULL; str s; char c; @@ -211,15 +224,18 @@ int evrexec_param(modparam_t type, void *val) free_params(params_list); return -1; } - /* get the route name */ - c = s.s[s.len]; - s.s[s.len] = '\0'; - tmp.rtid = route_lookup(&event_rt, s.s); - s.s[s.len] = c; - if(tmp.rtid == -1) { - LM_ERR("event route not found: %.*s\n", s.len, s.s); - free_params(params_list); - return -1; + /* set '\0' at the end of route name */ + tmp.ename.s[tmp.ename.len] = '\0'; + keng = sr_kemi_eng_get(); + if(keng==NULL) { + tmp.rtid = route_lookup(&event_rt, tmp.ename.s); + if(tmp.rtid == -1) { + LM_ERR("event route not found: %.*s\n", tmp.ename.len, tmp.ename.s); + free_params(params_list); + return -1; + } + } else { + tmp.rtid = -1; } it = (evrexec_task_t*)pkg_malloc(sizeof(evrexec_task_t));

7 years, 7 months

← Newer
1
...
25
26
27
28
29
30
31
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017