sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

git:master:ed4d7fbe: ndb_mongodb: added mongodb_find_one()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ed4d7fbee914c7fc4c5da438f4c4f021648d1e75 URL: https://github.com/kamailio/kamailio/commit/ed4d7fbee914c7fc4c5da438f4c4f02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-10T16:48:33+02:00 ndb_mongodb: added mongodb_find_one() - find first matching document and return it - faster when knowing it is supposed to be only one, or needing only one --- Modified: modules/ndb_mongodb/mongodb_client.c Modified: modules/ndb_mongodb/mongodb_client.h Modified: modules/ndb_mongodb/ndb_mongodb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ed4d7fbee914c7fc4c5da438f4c4f02… Patch: https://github.com/kamailio/kamailio/commit/ed4d7fbee914c7fc4c5da438f4c4f02… --- diff --git a/modules/ndb_mongodb/mongodb_client.c b/modules/ndb_mongodb/mongodb_client.c index 7202e6c..5b82c44 100644 --- a/modules/ndb_mongodb/mongodb_client.c +++ b/modules/ndb_mongodb/mongodb_client.c @@ -217,6 +217,7 @@ int mongodbc_exec_cmd(str *srv, str *dname, str *cname, str *cmd, str *res, int bson_t reply; const bson_t *cdoc; char c; + int nres; int ret; if(srv==NULL || cmd==NULL || res==NULL) @@ -283,10 +284,12 @@ int mongodbc_exec_cmd(str *srv, str *dname, str *cname, str *cmd, str *res, int NULL, 0); } else { + nres = 0; + if(emode==3) nres = 1; /* return one result */ rpl->cursor = mongoc_collection_find (rpl->collection, MONGOC_QUERY_NONE, 0, - 0, + nres, 0, &command, NULL, @@ -343,6 +346,14 @@ int mongodbc_find(str *srv, str *dname, str *cname, str *cmd, str *res) /** * */ +int mongodbc_find_one(str *srv, str *dname, str *cname, str *cmd, str *res) +{ + return mongodbc_exec_cmd(srv, dname, cname, cmd, res, 3); +} + +/** + * + */ mongodbc_reply_t *mongodbc_get_reply(str *name) { mongodbc_reply_t *rpl; diff --git a/modules/ndb_mongodb/mongodb_client.h b/modules/ndb_mongodb/mongodb_client.h index 1583db9..b0892e9 100644 --- a/modules/ndb_mongodb/mongodb_client.h +++ b/modules/ndb_mongodb/mongodb_client.h @@ -35,6 +35,7 @@ int mongodbc_add_server(char *spec); int mongodbc_exec_simple(str *srv, str *dname, str *cname, str *cmd, str *res); int mongodbc_exec(str *srv, str *dname, str *cname, str *cmd, str *res); int mongodbc_find(str *srv, str *dname, str *cname, str *cmd, str *res); +int mongodbc_find_one(str *srv, str *dname, str *cname, str *cmd, str *res); typedef struct mongodbc_server { str *sname; diff --git a/modules/ndb_mongodb/ndb_mongodb_mod.c b/modules/ndb_mongodb/ndb_mongodb_mod.c index 75bee9f..25c7fef 100644 --- a/modules/ndb_mongodb/ndb_mongodb_mod.c +++ b/modules/ndb_mongodb/ndb_mongodb_mod.c @@ -39,6 +39,8 @@ MODULE_VERSION int mongodb_srv_param(modparam_t type, void *val); static int w_mongodb_find(sip_msg_t* msg, char* ssrv, char *sdname, char *scname, char* scmd, char* sres); +static int w_mongodb_find_one(sip_msg_t* msg, char* ssrv, char *sdname, char *scname, + char* scmd, char* sres); static int w_mongodb_cmd_simple(sip_msg_t* msg, char* ssrv, char *sdname, char *scname, char* scmd, char* sres); static int w_mongodb_cmd(sip_msg_t* msg, char* ssrv, char *sdname, char *scname, @@ -64,6 +66,8 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"mongodb_find", (cmd_function)w_mongodb_find, 5, fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_find_one", (cmd_function)w_mongodb_find_one, 5, fixup_mongodb_cmd, + 0, ANY_ROUTE}, {"mongodb_cmd_simple", (cmd_function)w_mongodb_cmd_simple, 5, fixup_mongodb_cmd, 0, ANY_ROUTE}, {"mongodb_cmd", (cmd_function)w_mongodb_cmd, 5, fixup_mongodb_cmd, @@ -155,12 +159,15 @@ static int w_mongodb_do_cmd(sip_msg_t* msg, char* ssrv, char *sdname, char *scna LM_ERR("no mongodb reply name\n"); return -1; } + ret = -1; if(ctype==0) { ret = mongodbc_exec_simple(&s[0], &s[1], &s[2], &s[3], &s[4]); } else if(ctype==1) { ret = mongodbc_exec(&s[0], &s[1], &s[2], &s[3], &s[4]); - } else { + } else if(ctype==2) { ret = mongodbc_find(&s[0], &s[1], &s[2], &s[3], &s[4]); + } else if(ctype==3) { + ret = mongodbc_find_one(&s[0], &s[1], &s[2], &s[3], &s[4]); } if(ret<0) return -1; @@ -197,6 +204,15 @@ static int w_mongodb_find(sip_msg_t* msg, char* ssrv, char *sdname, char *scname /** * */ +static int w_mongodb_find_one(sip_msg_t* msg, char* ssrv, char *sdname, char *scname, + char* scmd, char* sres) +{ + return w_mongodb_do_cmd(msg, ssrv, sdname, scname, scmd, sres, 3); +} + +/** + * + */ static int fixup_mongodb_cmd(void** param, int param_no) { return fixup_spve_null(param, 1);

9 years

git:master:4a7ad5ee: rtpengine: added weights to rtpengine_sock example

by Juha Heinanen

Module: kamailio Branch: master Commit: 4a7ad5eedbc956277a65af4b57b1aaea8fcf389b URL: https://github.com/kamailio/kamailio/commit/4a7ad5eedbc956277a65af4b57b1aae… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-04-10T16:36:53+03:00 rtpengine: added weights to rtpengine_sock example --- Modified: modules/rtpengine/README Modified: modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a7ad5eedbc956277a65af4b57b1aae… Patch: https://github.com/kamailio/kamailio/commit/4a7ad5eedbc956277a65af4b57b1aae…

9 years

git:master:c6eff0f5: ndb_mongodb: fixed name of the function in docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c6eff0f5f6ec33fba5d61e4a6616d1bddfe6f958 URL: https://github.com/kamailio/kamailio/commit/c6eff0f5f6ec33fba5d61e4a6616d1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-10T11:32:20+02:00 ndb_mongodb: fixed name of the function in docs --- Modified: modules/ndb_mongodb/README Modified: modules/ndb_mongodb/doc/ndb_mongodb_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c6eff0f5f6ec33fba5d61e4a6616d1b… Patch: https://github.com/kamailio/kamailio/commit/c6eff0f5f6ec33fba5d61e4a6616d1b… --- diff --git a/modules/ndb_mongodb/README b/modules/ndb_mongodb/README index 314164d..cef2482 100644 --- a/modules/ndb_mongodb/README +++ b/modules/ndb_mongodb/README @@ -30,7 +30,9 @@ Daniel-Constantin Mierla 4. Functions 4.1. mongodb_cmd(srvname, dbname, cname, command, replyid) - 4.2. mongodb_cmd(srvname, dbname, cname, command, replyid) + 4.2. mongodb_cmd_simple(srvname, dbname, cname, command, + replyid) + 4.3. mongodb_find(srvname, dbname, cname, command, replyid) 4.4. mongodb_next(replyid) 4.5. mongodb_free(replyid) @@ -61,7 +63,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. mongodb_cmd(srvname, dbname, cname, command, replyid) - 4.2. mongodb_cmd(srvname, dbname, cname, command, replyid) + 4.2. mongodb_cmd_simple(srvname, dbname, cname, command, replyid) 4.3. mongodb_find(srvname, dbname, cname, command, replyid) 4.4. mongodb_next(replyid) 4.5. mongodb_free(replyid) @@ -120,7 +122,7 @@ modparam("ndb_mongodb", "server", "name=mgs2;uri='mongodb://127.0.0.2/kamailio'" 4. Functions 4.1. mongodb_cmd(srvname, dbname, cname, command, replyid) - 4.2. mongodb_cmd(srvname, dbname, cname, command, replyid) + 4.2. mongodb_cmd_simple(srvname, dbname, cname, command, replyid) 4.3. mongodb_find(srvname, dbname, cname, command, replyid) 4.4. mongodb_next(replyid) 4.5. mongodb_free(replyid) @@ -157,7 +159,7 @@ if(mongodb_cmd("mgs1", "kamailio", "acc", "{ \"collStats\": \"acc\" }", "mgr1")) } ... -4.2. mongodb_cmd(srvname, dbname, cname, command, replyid) +4.2. mongodb_cmd_simple(srvname, dbname, cname, command, replyid) Send a valid command to MongoDB server identified by srvname. The reply will be stored in a local container identified by replyid. All the diff --git a/modules/ndb_mongodb/doc/ndb_mongodb_admin.xml b/modules/ndb_mongodb/doc/ndb_mongodb_admin.xml index c5971ed..1927197 100644 --- a/modules/ndb_mongodb/doc/ndb_mongodb_admin.xml +++ b/modules/ndb_mongodb/doc/ndb_mongodb_admin.xml @@ -161,7 +161,7 @@ if(mongodb_cmd("mgs1", "kamailio", "acc", "{ \"collStats\": \"acc\" }", "mgr1")) </section> <section id="ndb_mongodb.f.mongodb_cmd_simple"> <title> - <function moreinfo="none">mongodb_cmd(srvname, dbname, cname, command, replyid)</function> + <function moreinfo="none">mongodb_cmd_simple(srvname, dbname, cname, command, replyid)</function> </title> <para> Send a valid command to MongoDB server identified by srvname. The reply will

9 years

TM possible deadlock

by Jason Penton

Hi All, I have been experiencing a deadlock when a timeout occurs on a t_relayed() INVITE. Going through the code I have noticed a possible chance of deadlock (without re-entrant enabled). Here is my thinking: t_should_relay_response() is called with REPLY_LOCK when the timer process fires on the fr_inv_timer (no response from the INVITE that was relayed, other than 100 provisional) and a 408 is generated. However, from within that function there are calls to run_failure_handlers() which in turn *could* try and lock the reply (viz. somebody having a t_reply() call in the cfg file - in failure route block). This would result in another lock on the same transaction's REPLY_LOCK.... Has anybody else experienced something like this? this is on master btw. Cheers Jason

9 years

git:master:54503788: kamctl: added help for 'db connect' command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 545037884e806df0d450fd6d7b425808c944d8a8 URL: https://github.com/kamailio/kamailio/commit/545037884e806df0d450fd6d7b42580… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-08T16:30:22+02:00 kamctl: added help for 'db connect' command --- Modified: utils/kamctl/kamctl.sqlbase --- Diff: https://github.com/kamailio/kamailio/commit/545037884e806df0d450fd6d7b42580… Patch: https://github.com/kamailio/kamailio/commit/545037884e806df0d450fd6d7b42580… --- diff --git a/utils/kamctl/kamctl.sqlbase b/utils/kamctl/kamctl.sqlbase index 53d32f9..06481e7 100644 --- a/utils/kamctl/kamctl.sqlbase +++ b/utils/kamctl/kamctl.sqlbase @@ -67,6 +67,7 @@ cat <<EOF ........................... column key equal to value as string db nmatch <table> <key> <value>...... display record from table that has ........................... column key equal to value as non-string + db connect .......................... connect to db server via cli EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_db_ops"

9 years

git:master:1044cd53: modules/cdp: Fixed possible deadlock with sticky loadbalancing of CDP sessions

by jaybeepee

Module: kamailio Branch: master Commit: 1044cd532c57641881e21c9b59d523b8f9d59340 URL: https://github.com/kamailio/kamailio/commit/1044cd532c57641881e21c9b59d523b… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-08T15:33:03+02:00 modules/cdp: Fixed possible deadlock with sticky loadbalancing of CDP sessions --- Modified: modules/cdp/authstatemachine.c Modified: modules/cdp/diameter_comm.c Modified: modules/cdp/routing.c Modified: modules/cdp/routing.h --- Diff: https://github.com/kamailio/kamailio/commit/1044cd532c57641881e21c9b59d523b… Patch: https://github.com/kamailio/kamailio/commit/1044cd532c57641881e21c9b59d523b…

9 years

git:master:224e34a5: modules/ims_charging: return if no reply associated with dlg

by jaybeepee

Module: kamailio Branch: master Commit: 224e34a55b012ee46996bb4d86e662d99e4c0541 URL: https://github.com/kamailio/kamailio/commit/224e34a55b012ee46996bb4d86e662d… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-08T15:27:14+02:00 modules/ims_charging: return if no reply associated with dlg - prevents possible segfault - also removed old commented code --- Modified: modules/ims_charging/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/224e34a55b012ee46996bb4d86e662d… Patch: https://github.com/kamailio/kamailio/commit/224e34a55b012ee46996bb4d86e662d… --- diff --git a/modules/ims_charging/dialog.c b/modules/ims_charging/dialog.c index f564fcb..0548fee 100644 --- a/modules/ims_charging/dialog.c +++ b/modules/ims_charging/dialog.c @@ -27,26 +27,8 @@ void dlg_reply(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { reply = _params->rpl; if (!reply) { LM_WARN("dlg_reply has no SIP reply associated.\n"); + return; } - -// if (reply != FAKED_REPLY && reply->REPLY_STATUS == 200) { -// //get CC session from callback param -// char* cdp_session_id = (char*)*_params->param; -// LM_INFO("Call answered\n"); -// LM_DBG("Call answered and we have a session id of [%s]\n", cdp_session_id); -// -// str session_id; -// session_id.s = cdp_session_id; -// session_id.len = strlen(cdp_session_id); -// AAASession* cdp_session = cdpb.AAAGetCCAccSession(session_id); -// if (!cdp_session) { -// LM_ERR("could not find find CC App CDP session\n"); -// return; -// } -// -// cdpb.AAAStartChargingCCAccSession(cdp_session); -// cdpb.AAASessionsUnlock(cdp_session->hash); -// } if (reply != FAKED_REPLY && reply->REPLY_STATUS == 200) { LM_DBG("Call answered on dlg [%p] - search for Ro Session and initialise timers.\n", dlg);

9 years

git:master:e0c11e33: modules/ims_qos: improved selection of identifier for Rx

by Richard Good

Module: kamailio Branch: master Commit: e0c11e332b7cffc94cada674defb567ce2f6562e URL: https://github.com/kamailio/kamailio/commit/e0c11e332b7cffc94cada674defb567… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-04-08T15:20:24+02:00 modules/ims_qos: improved selection of identifier for Rx --- Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e0c11e332b7cffc94cada674defb567… Patch: https://github.com/kamailio/kamailio/commit/e0c11e332b7cffc94cada674defb567…

9 years

git:master:6cc60c15: modules/dialog_ng: fix route_sets for callee_leg

by jaybeepee

Module: kamailio Branch: master Commit: 6cc60c159c692b2f38d0fce6b07510b9cc88efd0 URL: https://github.com/kamailio/kamailio/commit/6cc60c159c692b2f38d0fce6b07510b… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-08T15:18:21+02:00 modules/dialog_ng: fix route_sets for callee_leg --- Modified: modules/dialog_ng/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/6cc60c159c692b2f38d0fce6b07510b… Patch: https://github.com/kamailio/kamailio/commit/6cc60c159c692b2f38d0fce6b07510b… --- diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index e680473..af1af7c 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -215,12 +215,11 @@ int populate_leg_info(struct dlg_cell *dlg, struct sip_msg *msg, } else { skip_recs = 0; /* was the 200 OK received or local generated */ - /*skip_recs = dlg->from_rr_nb + + skip_recs = dlg->from_rr_nb + ((t->relayed_reply_branch >= 0) ? ((t->uac[t->relayed_reply_branch].flags & TM_UAC_FLAG_R2) ? 2 : ((t->uac[t->relayed_reply_branch].flags & TM_UAC_FLAG_RR) ? 1 : 0)) : 0); - * */ } if (msg->record_route) {

9 years

git:master:285225c3: modules/dialog_ng: end dialog on timeout

by jaybeepee

Module: kamailio Branch: master Commit: 285225c30fbe23c58361966020da1b9d089cca9e URL: https://github.com/kamailio/kamailio/commit/285225c30fbe23c58361966020da1b9… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-08T15:17:04+02:00 modules/dialog_ng: end dialog on timeout --- Modified: modules/dialog_ng/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/285225c30fbe23c58361966020da1b9… Patch: https://github.com/kamailio/kamailio/commit/285225c30fbe23c58361966020da1b9… --- diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index f484830..e680473 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -1212,7 +1212,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { } if ((event == DLG_EVENT_REQ || event == DLG_EVENT_REQACK) - && new_state == DLG_STATE_CONFIRMED) { + && (new_state == DLG_STATE_CONFIRMED || new_state==DLG_STATE_EARLY)) { timeout = get_dlg_timeout(req); if (timeout != default_timeout) { @@ -1294,9 +1294,8 @@ void dlg_ontimeout(struct dlg_tl *tl) { } } - if ((dlg->dflags & DLG_FLAG_TOBYE) - && (dlg->state == DLG_STATE_CONFIRMED)) { - //TODO: dlg_bye_all(dlg, NULL); + if (dlg->state == DLG_STATE_CONFIRMED) { + dlg_bye_all(dlg, NULL); unref_dlg(dlg, 1); return; }

9 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015