sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

git:5.1:0a327ed6: tm: make t_run_local_req reentrant

by Federico Cabiddu

Module: kamailio Branch: 5.1 Commit: 0a327ed62b47bd56b7b7463c2552d2c66397e897 URL: https://github.com/kamailio/kamailio/commit/0a327ed62b47bd56b7b7463c2552d2c… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-12-06T17:26:45+01:00 tm: make t_run_local_req reentrant - avoid crash when local-request event route is triggered inside another one (cherry picked from commit 97b15611ad87e36dd17ba76a77cb8817d974806b) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/0a327ed62b47bd56b7b7463c2552d2c… Patch: https://github.com/kamailio/kamailio/commit/0a327ed62b47bd56b7b7463c2552d2c… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index dddeb0aa34..7b78a609b3 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -221,7 +221,7 @@ static inline int t_run_local_req( uac_req_t *uac_r, struct cell *new_cell, struct retr_buf *request) { - static struct sip_msg lreq; + struct sip_msg lreq = {0}; struct onsend_info onsnd_info; tm_xlinks_t backup_xd; int sflag_bk;

6 years, 5 months

git:master:432b38bb: Merge pull request #1348 from grumvalski/local_request_crash

by GitHub

Module: kamailio Branch: master Commit: 432b38bb0b50b683360743cfbb013e4865c426e4 URL: https://github.com/kamailio/kamailio/commit/432b38bb0b50b683360743cfbb013e4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-12-06T17:18:47+01:00 Merge pull request #1348 from grumvalski/local_request_crash tm: make t_run_local_req reentrant --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/432b38bb0b50b683360743cfbb013e4… Patch: https://github.com/kamailio/kamailio/commit/432b38bb0b50b683360743cfbb013e4… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index dddeb0aa34..7b78a609b3 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -221,7 +221,7 @@ static inline int t_run_local_req( uac_req_t *uac_r, struct cell *new_cell, struct retr_buf *request) { - static struct sip_msg lreq; + struct sip_msg lreq = {0}; struct onsend_info onsnd_info; tm_xlinks_t backup_xd; int sflag_bk;

6 years, 5 months

[kamailio/kamailio] tm: make t_run_local_req reentrant (#1348)

by Federico Cabiddu

- avoid crash when local-request event route is triggered inside another one Nested calls to tm:local-routes generate a crash. I've been recently experiencing this with the following scenario: - event_route[tm:local-request] defined - dialog module's send_bye param set to 1 - htable module's enable_dmq param set to 1 When a dialog reaches the timeout, the BYE generated by dialog module triggers the tm:local-request event route. One of the operations done in my scenario is an htable decrement on a table for which dmq replication is enabled. This trigger again the tm event route (because dmq is using tm uac). When the execution of the 2nd route ends the first one is continued, but the sip_msg structure is at this point corrupted because is declared static in t_run_local_req. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1348 -- Commit Summary -- * tm: make t_run_local_req reentrant -- File Changes -- M src/modules/tm/uac.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1348.patch https://github.com/kamailio/kamailio/pull/1348.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/1348

6 years, 5 months

git:master:97b15611: tm: make t_run_local_req reentrant

by grumvalski

Module: kamailio Branch: master Commit: 97b15611ad87e36dd17ba76a77cb8817d974806b URL: https://github.com/kamailio/kamailio/commit/97b15611ad87e36dd17ba76a77cb881… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-11-30T15:06:27+01:00 tm: make t_run_local_req reentrant - avoid crash when local-request event route is triggered inside another one --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/97b15611ad87e36dd17ba76a77cb881… Patch: https://github.com/kamailio/kamailio/commit/97b15611ad87e36dd17ba76a77cb881… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index dddeb0aa34..7b78a609b3 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -221,7 +221,7 @@ static inline int t_run_local_req( uac_req_t *uac_r, struct cell *new_cell, struct retr_buf *request) { - static struct sip_msg lreq; + struct sip_msg lreq = {0}; struct onsend_info onsnd_info; tm_xlinks_t backup_xd; int sflag_bk;

6 years, 5 months

git:master:f04c812b: http_async_client: exported query function to kemi interface

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f04c812b2af2d933e61b0d643bd245cc91c5f3eb URL: https://github.com/kamailio/kamailio/commit/f04c812b2af2d933e61b0d643bd245c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T17:00:41+01:00 http_async_client: exported query function to kemi interface --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f04c812b2af2d933e61b0d643bd245c… Patch: https://github.com/kamailio/kamailio/commit/f04c812b2af2d933e61b0d643bd245c… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 3ec52f4f3b..1799a05fb6 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -50,6 +50,7 @@ #include "../../core/pvar.h" #include "../../core/cfg/cfg_struct.h" #include "../../core/fmsg.h" +#include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" @@ -207,19 +208,6 @@ struct module_exports exports = { }; -int mod_register(char *path, int *dlflags, void *p1, void *p2) -{ - pv_register_api_t pvra; - - pvra = (pv_register_api_t)find_export("pv_register_api", NO_SCRIPT, 0); - if (!pvra) { - LM_ERR("Cannot import pv functions (pv module must be loaded before this module)\n"); - return -1; - } - pvra(&pv_api); - return 0; -} - /** * init module function */ @@ -407,7 +395,24 @@ static int w_http_async_query(sip_msg_t *msg, char *query, char* rt) return -1; } return async_send_query(msg, &sdata, &rn); +} +/** + * + */ +static int ki_http_async_query(sip_msg_t *msg, str *sdata, str *rn) +{ + if(msg==NULL) + return -1; + if(sdata==NULL || sdata->len <= 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + if(rn->s==NULL || rn->len <= 0) { + LM_ERR("invalid route name parameter\n"); + return -1; + } + return async_send_query(msg, sdata, rn); } #define _IVALUE_ERROR(NAME) LM_ERR("invalid parameter '" #NAME "' (must be a number)\n") @@ -724,3 +729,32 @@ static int ah_set_req(struct sip_msg* msg, pv_param_t *param, return 1; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_http_async_client_exports[] = { + { str_init("http_async_client"), str_init("query"), + SR_KEMIP_INT, ki_http_async_query, + { 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) +{ + pv_register_api_t pvra; + + pvra = (pv_register_api_t)find_export("pv_register_api", NO_SCRIPT, 0); + if (!pvra) { + LM_ERR("Cannot import pv functions (pv module must be loaded before this module)\n"); + return -1; + } + pvra(&pv_api); + sr_kemi_modules_add(sr_kemi_http_async_client_exports); + return 0; +} \ No newline at end of file

6 years, 5 months

git:master:3de068a8: tm: t_check_status exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3de068a8897917d088993923f3028ca98aadc765 URL: https://github.com/kamailio/kamailio/commit/3de068a8897917d088993923f3028ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T16:50:39+01:00 tm: t_check_status exported to kemi framework --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/3de068a8897917d088993923f3028ca… Patch: https://github.com/kamailio/kamailio/commit/3de068a8897917d088993923f3028ca… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 9bc1695a0f..7d7145393b 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -852,7 +852,6 @@ static int child_init(int rank) } - /**************************** wrapper functions ***************************/ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) { @@ -984,6 +983,98 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) return -1; } +static int ki_t_check_status(sip_msg_t* msg, str *sexp) +{ + regmatch_t pmatch; + struct cell *t; + char *status, *s = NULL; + char backup; + int lowest_status, n, ret; + regex_t re; + + /* first get the transaction */ + if (t_check(msg, 0 ) == -1) return -1; + + if ((t = get_t()) == 0) { + LM_ERR("cannot check status for a reply" + " which has no T-state established\n"); + goto error0; + } + + memset(&re, 0, sizeof(regex_t)); + if (regcomp(&re, sexp->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { + LM_ERR("Bad regular expression '%s'\n", s); + goto error0; + } + + switch(get_route_type()) { + case REQUEST_ROUTE: + /* use the status of the last sent reply */ + status = int2str( t->uas.status, 0); + break; + + case TM_ONREPLY_ROUTE: + case CORE_ONREPLY_ROUTE: + /* use the status of the current reply */ + status = msg->first_line.u.reply.status.s; + backup = status[msg->first_line.u.reply.status.len]; + status[msg->first_line.u.reply.status.len] = 0; + break; + + case FAILURE_ROUTE: + /* use the status of the winning reply */ + ret = t_pick_branch( -1, 0, t, &lowest_status); + if (ret == -1) { + /* t_pick_branch() retuns error also when there are only + * blind UACs. Let us give it another chance including the + * blind branches. */ + LM_DBG("t_pick_branch returned error," + " trying t_pick_branch_blind\n"); + ret = t_pick_branch_blind(t, &lowest_status); + } + if (ret < 0) { + LM_CRIT("BUG: t_pick_branch failed to get" + " a final response in FAILURE_ROUTE\n"); + goto error; + } + status = int2str( lowest_status , 0); + break; + case BRANCH_FAILURE_ROUTE: + status = int2str(t->uac[get_t_branch()].last_received, 0); + break; + default: + LM_ERR("unsupported route type %d\n", + get_route_type()); + goto error; + } + + LM_DBG("checked status is <%s>\n",status); + /* do the checking */ + n = regexec(&re, status, 1, &pmatch, 0); + + regfree(&re); + + if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ + /* t_check() above has the side effect of setting T and + * REFerencing T => we must unref and unset it. */ + UNREF( t ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); + } + if (n!=0) return -1; + return 1; + +error: + regfree(&re); +error0: + if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ + /* t_check() above has the side effect of setting T and + * REFerencing T => we must unref and unset it. */ + UNREF( t ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); + } + + return -1; +} inline static int w_t_check(struct sip_msg* msg, char* str, char* str2) { @@ -2818,6 +2909,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_check_status"), + SR_KEMIP_INT, ki_t_check_status, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_grep_status"), SR_KEMIP_INT, t_grep_status, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, @@ -2883,4 +2979,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(tm_kemi_exports); return 0; -} +} \ No newline at end of file

6 years, 5 months

git:master:50c055a8: userblacklist: exported user check functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 50c055a880f16cbb6c1a74b4ef82248bc3519f01 URL: https://github.com/kamailio/kamailio/commit/50c055a880f16cbb6c1a74b4ef82248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T16:38:56+01:00 userblacklist: exported user check functions to kemi framework --- Modified: src/modules/tmrec/tmrec_mod.c Modified: src/modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/50c055a880f16cbb6c1a74b4ef82248… Patch: https://github.com/kamailio/kamailio/commit/50c055a880f16cbb6c1a74b4ef82248…

6 years, 5 months

git:master:2de66166: uri_db: functions exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2de661667ce0452a0095cd60d4913007045bb628 URL: https://github.com/kamailio/kamailio/commit/2de661667ce0452a0095cd60d491300… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T15:52:25+01:00 uri_db: functions exported to kemi framework --- Modified: src/modules/uri_db/checks.c Modified: src/modules/uri_db/checks.h Modified: src/modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/2de661667ce0452a0095cd60d491300… Patch: https://github.com/kamailio/kamailio/commit/2de661667ce0452a0095cd60d491300…

6 years, 5 months

git:master:a0436852: mediaproxy: export functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a04368528a3350a14038101a4bf17b4b742e362d URL: https://github.com/kamailio/kamailio/commit/a04368528a3350a14038101a4bf17b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T12:31:28+01:00 mediaproxy: export functions to kemi framework --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/a04368528a3350a14038101a4bf17b4… Patch: https://github.com/kamailio/kamailio/commit/a04368528a3350a14038101a4bf17b4… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 7250638d76..9caa0f8c64 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -48,6 +48,7 @@ #include "../../core/msg_translator.h" #include "../../modules/dialog/dlg_load.h" #include "../../modules/dialog/dlg_hash.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -173,8 +174,11 @@ typedef struct ice_candidate_data // Function prototypes // +static int w_EngageMediaProxy(struct sip_msg *msg, char *p1, char *p2); static int EngageMediaProxy(struct sip_msg *msg); +static int w_UseMediaProxy(struct sip_msg *msg, char *p1, char *p2); static int UseMediaProxy(struct sip_msg *msg); +static int w_EndMediaSession(struct sip_msg *msg, char *p1, char *p2); static int EndMediaSession(struct sip_msg *msg); static int mod_init(void); @@ -209,14 +213,12 @@ static AVP_Param media_relay_avp = {str_init(MEDIA_RELAY_AVP_SPEC), {0}, 0}; static AVP_Param ice_candidate_avp = {str_init(ICE_CANDIDATE_AVP_SPEC), {0}, 0}; static cmd_export_t commands[] = { - {"engage_media_proxy", (cmd_function)EngageMediaProxy, 0, 0, 0, - REQUEST_ROUTE}, - {"use_media_proxy", (cmd_function)UseMediaProxy, 0, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"end_media_session", (cmd_function)EndMediaSession, 0, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, + {"engage_media_proxy", (cmd_function)w_EngageMediaProxy, 0, 0, 0, + REQUEST_ROUTE | BRANCH_ROUTE}, + {"use_media_proxy", (cmd_function)w_UseMediaProxy, 0, 0, 0, + ANY_ROUTE}, + {"end_media_session", (cmd_function)w_EndMediaSession, 0, 0, 0, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0}}; static param_export_t parameters[] = { @@ -2016,6 +2018,10 @@ static int EngageMediaProxy(struct sip_msg *msg) return 1; } +static int w_EngageMediaProxy(struct sip_msg *msg, char *p1, char *p2) +{ + return EngageMediaProxy(msg); +} static int UseMediaProxy(struct sip_msg *msg) { @@ -2025,6 +2031,10 @@ static int UseMediaProxy(struct sip_msg *msg) return use_media_proxy(msg, "", NULL); } +static int w_UseMediaProxy(struct sip_msg *msg, char *p1, char *p2) +{ + return UseMediaProxy(msg); +} static int EndMediaSession(struct sip_msg *msg) { @@ -2044,6 +2054,10 @@ static int EndMediaSession(struct sip_msg *msg) return end_media_session(callid, from_tag, to_tag); } +static int w_EndMediaSession(struct sip_msg *msg, char *p1, char *p2) +{ + return EndMediaSession(msg); +} // // Module management: initialization/destroy/function-parameter-fixing/... @@ -2173,3 +2187,34 @@ static int child_init(int rank) return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_mediaproxy_exports[] = { + { str_init("mediaproxy"), str_init("engage_media_proxy"), + SR_KEMIP_INT, EngageMediaProxy, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("mediaproxy"), str_init("use_media_proxy"), + SR_KEMIP_INT, UseMediaProxy, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("mediaproxy"), str_init("end_media_session"), + SR_KEMIP_INT, EndMediaSession, + { SR_KEMIP_NONE, SR_KEMIP_NONE, 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_mediaproxy_exports); + return 0; +} \ No newline at end of file

6 years, 5 months

git:master:74208c21: ndb_mongodb: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 74208c2160ffb6200dd6a8982fd4d94a2c00d879 URL: https://github.com/kamailio/kamailio/commit/74208c2160ffb6200dd6a8982fd4d94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-06T11:43:38+01:00 ndb_mongodb: exported functions to kemi framework --- Modified: src/modules/ndb_mongodb/ndb_mongodb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/74208c2160ffb6200dd6a8982fd4d94… Patch: https://github.com/kamailio/kamailio/commit/74208c2160ffb6200dd6a8982fd4d94… --- diff --git a/src/modules/ndb_mongodb/ndb_mongodb_mod.c b/src/modules/ndb_mongodb/ndb_mongodb_mod.c index 824d2aad07..73ca648977 100644 --- a/src/modules/ndb_mongodb/ndb_mongodb_mod.c +++ b/src/modules/ndb_mongodb/ndb_mongodb_mod.c @@ -29,6 +29,7 @@ #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/trim.h" +#include "../../core/kemi.h" #include "mongodb_client.h" #include "api.h" @@ -177,6 +178,42 @@ static int w_mongodb_do_cmd(sip_msg_t* msg, char* ssrv, char *sdname, char *scna return 1; } +/** + * + */ +static int ki_mongodbc_exec_simple(sip_msg_t* msg, str* ssrv, str *sdname, + str *scname, str* scmd, str* sres) +{ + return mongodbc_exec_simple(ssrv, sdname, scname, scmd, sres); +} + +/** + * + */ +static int ki_mongodbc_exec(sip_msg_t* msg, str* ssrv, str *sdname, + str *scname, str* scmd, str* sres) +{ + return mongodbc_exec(ssrv, sdname, scname, scmd, sres); +} + +/** + * + */ +static int ki_mongodbc_find(sip_msg_t* msg, str* ssrv, str *sdname, + str *scname, str* scmd, str* sres) +{ + return mongodbc_find(ssrv, sdname, scname, scmd, sres); +} + +/** + * + */ +static int ki_mongodbc_find_one(sip_msg_t* msg, str* ssrv, str *sdname, + str *scname, str* scmd, str* sres) +{ + return mongodbc_find_one(ssrv, sdname, scname, scmd, sres); +} + /** * */ @@ -239,6 +276,16 @@ static int w_mongodb_free_reply(struct sip_msg* msg, char* res) return 1; } +/** + * + */ +static int ki_mongodbc_free_reply(struct sip_msg* msg, str* name) +{ + if(mongodbc_free_reply(name)<0) + return -1; + return 1; +} + /** * */ @@ -257,6 +304,16 @@ static int w_mongodb_next_reply(struct sip_msg* msg, char* res) return 1;; } +/** + * + */ +static int ki_mongodbc_next_reply(struct sip_msg* msg, str* name) +{ + if(mongodbc_next_reply(name)<0) + return -1; + return 1;; +} + /** * */ @@ -382,3 +439,49 @@ static int pv_get_mongodb(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_ndb_mongodb_exports[] = { + { str_init("ndb_mongodb"), str_init("exec_simple"), + SR_KEMIP_INT, ki_mongodbc_exec_simple, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("exec"), + SR_KEMIP_INT, ki_mongodbc_exec, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("find"), + SR_KEMIP_INT, ki_mongodbc_find, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("find_one"), + SR_KEMIP_INT, ki_mongodbc_find_one, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("free_reply"), + SR_KEMIP_INT, ki_mongodbc_free_reply, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ndb_mongodb"), str_init("next_reply"), + SR_KEMIP_INT, ki_mongodbc_next_reply, + { SR_KEMIP_STR, SR_KEMIP_NONE, 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_ndb_mongodb_exports); + return 0; +} \ No newline at end of file

6 years, 5 months

← Newer
1
...
39
40
41
42
43
44
45
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017