sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
427 discussions

git:5.0:ebc29b28: db_oracle: fix raw sql queries
by Ovidiu Sas 21 Apr '17

21 Apr '17

Module: kamailio Branch: 5.0 Commit: ebc29b28d187527389349c1b1d9d69dcb97d66d0 URL: https://github.com/kamailio/kamailio/commit/ebc29b28d187527389349c1b1d9d69d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-04-21T12:35:20-04:00 db_oracle: fix raw sql queries (cherry picked from commit 5d75450e2a05a029d51ab38c3ef6f36fef49a51b) --- Modified: src/modules/db_oracle/dbase.c Modified: src/modules/db_oracle/res.c --- Diff: https://github.com/kamailio/kamailio/commit/ebc29b28d187527389349c1b1d9d69d… Patch: https://github.com/kamailio/kamailio/commit/ebc29b28d187527389349c1b1d9d69d… --- diff --git a/src/modules/db_oracle/dbase.c b/src/modules/db_oracle/dbase.c index eb400df..a4d54b9 100644 --- a/src/modules/db_oracle/dbase.c +++ b/src/modules/db_oracle/dbase.c @@ -216,7 +216,7 @@ static int db_oracle_submit_query(const db1_con_t* _h, const str* _s) (unsigned)hc); return -1; } - + if (!pqd->_rs) { /* * This method is at ~25% faster as set OCI_COMMIT_ON_SUCCESS @@ -373,8 +373,7 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) int len; const char *p; - if (!_h || !_s || !_s->s) { -badparam: + if (!_h || !_r || !_s || !_s->s) { LM_ERR("invalid parameter value\n"); return -1; } @@ -387,7 +386,6 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) while (len && *p == ' ') ++p, --len; #define _S_DIFF(p, l, S) (l <= sizeof(S)-1 || strncasecmp(p, S, sizeof(S)-1)) if (!_S_DIFF(p, len, "select ")) { - if (!_r) goto badparam; cb._rs = &reshp; } else { if ( _S_DIFF(p, len, "insert ") @@ -398,10 +396,11 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) return -2; } #undef _S_DIFF - if (_r) goto badparam; cb._rs = NULL; } + CON_ORA(_h)->pqdata = &cb; + CON_ORA(_h)->bindpos = 0; len = db_do_raw_query(_h, _s, _r, db_oracle_submit_query, db_oracle_store_result); CON_ORA(_h)->pqdata = NULL; /* paranoid for next call */ return len; @@ -488,7 +487,7 @@ int db_oracle_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, { query_data_t cb; int rc; - + if (!_h || !CON_TABLE(_h)) { LM_ERR("invalid parameter value\n"); return -1; diff --git a/src/modules/db_oracle/res.c b/src/modules/db_oracle/res.c index 5511567..ca585fe 100644 --- a/src/modules/db_oracle/res.c +++ b/src/modules/db_oracle/res.c @@ -440,7 +440,6 @@ int db_oracle_store_result(const db1_con_t* _h, db1_res_t** _r) OCIStmt* hs; if (!_h || !_r) { -badparam: LM_ERR("invalid parameter\n"); return -1; } @@ -448,15 +447,20 @@ int db_oracle_store_result(const db1_con_t* _h, db1_res_t** _r) con = CON_ORA(_h); { query_data_t *pcb = con->pqdata; - - if (!pcb || !pcb->_rs) - goto badparam; - + if (!pcb) { + LM_ERR("invalid parameter\n"); + return -1; + } + if (!pcb->_rs) { + LM_DBG("no result\n"); + return 0; + } + hs = *pcb->_rs; pcb->_rs = NULL; /* paranoid for next call */ - } - + } + rc = -1; if (_r) *_r = NULL; /* unification for all errors */

1 0

git:master:5d75450e: db_oracle: fix raw sql queries
by Ovidiu Sas 21 Apr '17

21 Apr '17

Module: kamailio Branch: master Commit: 5d75450e2a05a029d51ab38c3ef6f36fef49a51b URL: https://github.com/kamailio/kamailio/commit/5d75450e2a05a029d51ab38c3ef6f36… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-04-21T12:34:01-04:00 db_oracle: fix raw sql queries --- Modified: src/modules/db_oracle/dbase.c Modified: src/modules/db_oracle/res.c --- Diff: https://github.com/kamailio/kamailio/commit/5d75450e2a05a029d51ab38c3ef6f36… Patch: https://github.com/kamailio/kamailio/commit/5d75450e2a05a029d51ab38c3ef6f36… --- diff --git a/src/modules/db_oracle/dbase.c b/src/modules/db_oracle/dbase.c index eb400df..a4d54b9 100644 --- a/src/modules/db_oracle/dbase.c +++ b/src/modules/db_oracle/dbase.c @@ -216,7 +216,7 @@ static int db_oracle_submit_query(const db1_con_t* _h, const str* _s) (unsigned)hc); return -1; } - + if (!pqd->_rs) { /* * This method is at ~25% faster as set OCI_COMMIT_ON_SUCCESS @@ -373,8 +373,7 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) int len; const char *p; - if (!_h || !_s || !_s->s) { -badparam: + if (!_h || !_r || !_s || !_s->s) { LM_ERR("invalid parameter value\n"); return -1; } @@ -387,7 +386,6 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) while (len && *p == ' ') ++p, --len; #define _S_DIFF(p, l, S) (l <= sizeof(S)-1 || strncasecmp(p, S, sizeof(S)-1)) if (!_S_DIFF(p, len, "select ")) { - if (!_r) goto badparam; cb._rs = &reshp; } else { if ( _S_DIFF(p, len, "insert ") @@ -398,10 +396,11 @@ int db_oracle_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) return -2; } #undef _S_DIFF - if (_r) goto badparam; cb._rs = NULL; } + CON_ORA(_h)->pqdata = &cb; + CON_ORA(_h)->bindpos = 0; len = db_do_raw_query(_h, _s, _r, db_oracle_submit_query, db_oracle_store_result); CON_ORA(_h)->pqdata = NULL; /* paranoid for next call */ return len; @@ -488,7 +487,7 @@ int db_oracle_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, { query_data_t cb; int rc; - + if (!_h || !CON_TABLE(_h)) { LM_ERR("invalid parameter value\n"); return -1; diff --git a/src/modules/db_oracle/res.c b/src/modules/db_oracle/res.c index 5511567..ca585fe 100644 --- a/src/modules/db_oracle/res.c +++ b/src/modules/db_oracle/res.c @@ -440,7 +440,6 @@ int db_oracle_store_result(const db1_con_t* _h, db1_res_t** _r) OCIStmt* hs; if (!_h || !_r) { -badparam: LM_ERR("invalid parameter\n"); return -1; } @@ -448,15 +447,20 @@ int db_oracle_store_result(const db1_con_t* _h, db1_res_t** _r) con = CON_ORA(_h); { query_data_t *pcb = con->pqdata; - - if (!pcb || !pcb->_rs) - goto badparam; - + if (!pcb) { + LM_ERR("invalid parameter\n"); + return -1; + } + if (!pcb->_rs) { + LM_DBG("no result\n"); + return 0; + } + hs = *pcb->_rs; pcb->_rs = NULL; /* paranoid for next call */ - } - + } + rc = -1; if (_r) *_r = NULL; /* unification for all errors */

1 0

git:5.0:79d10d03: sqlops: free the result only if there is a result
by Ovidiu Sas 21 Apr '17

21 Apr '17

Module: kamailio Branch: 5.0 Commit: 79d10d03049bf235c302b5261c2a59d64f9ba210 URL: https://github.com/kamailio/kamailio/commit/79d10d03049bf235c302b5261c2a59d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-04-21T12:01:35-04:00 sqlops: free the result only if there is a result (cherry picked from commit 92c8c66e5ba1e5036fdc7a6171e013e21964a03b) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/79d10d03049bf235c302b5261c2a59d… Patch: https://github.com/kamailio/kamailio/commit/79d10d03049bf235c302b5261c2a59d… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 30264e5..ddf579c 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -269,7 +269,7 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) if(db_res==NULL || RES_ROW_N(db_res)<=0 || RES_COL_N(db_res)<=0) { LM_DBG("no result after query\n"); - con->dbf.free_result(con->dbh, db_res); + if (db_res) con->dbf.free_result(con->dbh, db_res); return 2; } if(!res)

1 0

git:master:92c8c66e: sqlops: free the result only if there is a result
by Ovidiu Sas 21 Apr '17

21 Apr '17

Module: kamailio Branch: master Commit: 92c8c66e5ba1e5036fdc7a6171e013e21964a03b URL: https://github.com/kamailio/kamailio/commit/92c8c66e5ba1e5036fdc7a6171e013e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-04-21T11:59:42-04:00 sqlops: free the result only if there is a result --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/92c8c66e5ba1e5036fdc7a6171e013e… Patch: https://github.com/kamailio/kamailio/commit/92c8c66e5ba1e5036fdc7a6171e013e… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 30264e5..ddf579c 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -269,7 +269,7 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) if(db_res==NULL || RES_ROW_N(db_res)<=0 || RES_COL_N(db_res)<=0) { LM_DBG("no result after query\n"); - con->dbf.free_result(con->dbh, db_res); + if (db_res) con->dbf.free_result(con->dbh, db_res); return 2; } if(!res)

1 0

git:5.0:fa721898: topos: free temporary sip msg structure when handling 100 replies
by Daniel-Constantin Mierla 21 Apr '17

21 Apr '17

Module: kamailio Branch: 5.0 Commit: fa72189835590abde9799ec99518abdf493009c6 URL: https://github.com/kamailio/kamailio/commit/fa72189835590abde9799ec99518abd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T16:10:36+02:00 topos: free temporary sip msg structure when handling 100 replies - it can lead to memory leak, reported by Sergey Basov (cherry picked from commit 5613130b8d1e5b75668bcf1635ce43ea9852f2ef) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fa72189835590abde9799ec99518abd… Patch: https://github.com/kamailio/kamailio/commit/fa72189835590abde9799ec99518abd… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 14297f7..7b1ef89 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -280,12 +280,14 @@ int tps_msg_received(void *data) str *obuf; char *nbuf = NULL; int dialog; + int ret; obuf = (str*)data; memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = obuf->s; msg.len = obuf->len; + ret = 0; if(tps_prepare_msg(&msg)!=0) { goto done; } @@ -310,17 +312,22 @@ int tps_msg_received(void *data) /* reply */ if(msg.first_line.u.reply.statuscode==100) { /* nothing to do - it should be absorbed */ - return 0; + goto done; } tps_response_received(&msg); } nbuf = tps_msg_update(&msg, (unsigned int*)&obuf->len); + if(nbuf==NULL) { + LM_ERR("not enough pkg memory for new message\n"); + ret = -1; + goto done; + } if(obuf->len>=BUF_SIZE) { LM_ERR("new buffer overflow (%d)\n", obuf->len); - pkg_free(nbuf); - return -1; + ret = -1; + goto done; } memcpy(obuf->s, nbuf, obuf->len); obuf->s[obuf->len] = '\0'; @@ -329,7 +336,7 @@ int tps_msg_received(void *data) if(nbuf!=NULL) pkg_free(nbuf); free_sip_msg(&msg); - return 0; + return ret; } /** @@ -368,7 +375,7 @@ int tps_msg_sent(void *data) /* reply */ if(msg.first_line.u.reply.statuscode==100) { /* nothing to do - it should be locally generated */ - return 0; + goto done; } tps_response_sent(&msg); }

1 0

git:master:5613130b: topos: free temporary sip msg structure when handling 100 replies
by Daniel-Constantin Mierla 21 Apr '17

21 Apr '17

Module: kamailio Branch: master Commit: 5613130b8d1e5b75668bcf1635ce43ea9852f2ef URL: https://github.com/kamailio/kamailio/commit/5613130b8d1e5b75668bcf1635ce43e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T16:10:06+02:00 topos: free temporary sip msg structure when handling 100 replies - it can lead to memory leak, reported by Sergey Basov --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5613130b8d1e5b75668bcf1635ce43e… Patch: https://github.com/kamailio/kamailio/commit/5613130b8d1e5b75668bcf1635ce43e… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 14297f7..7b1ef89 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -280,12 +280,14 @@ int tps_msg_received(void *data) str *obuf; char *nbuf = NULL; int dialog; + int ret; obuf = (str*)data; memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = obuf->s; msg.len = obuf->len; + ret = 0; if(tps_prepare_msg(&msg)!=0) { goto done; } @@ -310,17 +312,22 @@ int tps_msg_received(void *data) /* reply */ if(msg.first_line.u.reply.statuscode==100) { /* nothing to do - it should be absorbed */ - return 0; + goto done; } tps_response_received(&msg); } nbuf = tps_msg_update(&msg, (unsigned int*)&obuf->len); + if(nbuf==NULL) { + LM_ERR("not enough pkg memory for new message\n"); + ret = -1; + goto done; + } if(obuf->len>=BUF_SIZE) { LM_ERR("new buffer overflow (%d)\n", obuf->len); - pkg_free(nbuf); - return -1; + ret = -1; + goto done; } memcpy(obuf->s, nbuf, obuf->len); obuf->s[obuf->len] = '\0'; @@ -329,7 +336,7 @@ int tps_msg_received(void *data) if(nbuf!=NULL) pkg_free(nbuf); free_sip_msg(&msg); - return 0; + return ret; } /** @@ -368,7 +375,7 @@ int tps_msg_sent(void *data) /* reply */ if(msg.first_line.u.reply.statuscode==100) { /* nothing to do - it should be locally generated */ - return 0; + goto done; } tps_response_sent(&msg); }

1 0

git:master:3b0390ec: modules: readme files regenerated - drouting ... [skip ci]
by Kamailio Dev 21 Apr '17

21 Apr '17

Module: kamailio Branch: master Commit: 3b0390ecf01d44942211801bc793864b09f742db URL: https://github.com/kamailio/kamailio/commit/3b0390ecf01d44942211801bc793864… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-21T12:01:32+02:00 modules: readme files regenerated - drouting ... [skip ci] --- Modified: src/modules/drouting/README --- Diff: https://github.com/kamailio/kamailio/commit/3b0390ecf01d44942211801bc793864… Patch: https://github.com/kamailio/kamailio/commit/3b0390ecf01d44942211801bc793864… --- diff --git a/src/modules/drouting/README b/src/modules/drouting/README index 3abb78f..e7e4295 100644 --- a/src/modules/drouting/README +++ b/src/modules/drouting/README @@ -51,6 +51,7 @@ Anca-Maria Vamanu 3.12. drg_grpid_col (str) 3.13. fetch_rows (int) 3.14. force_dns (int) + 3.15. enable_keepalive (int) 4. Functions @@ -92,11 +93,12 @@ Anca-Maria Vamanu 1.12. Set drg_grpid_col parameter 1.13. Set fetch_rows parameter 1.14. Set force_dns parameter - 1.15. do_routing usage - 1.16. use_next_gw usage - 1.17. goes_to_gw usage - 1.18. is_from_gw usage + 1.15. Set enable_keepalive parameter + 1.16. do_routing usage + 1.17. use_next_gw usage + 1.18. goes_to_gw usage 1.19. is_from_gw usage + 1.20. is_from_gw usage Chapter 1. Admin Guide @@ -136,6 +138,7 @@ Chapter 1. Admin Guide 3.12. drg_grpid_col (str) 3.13. fetch_rows (int) 3.14. force_dns (int) + 3.15. enable_keepalive (int) 4. Functions @@ -500,6 +503,7 @@ Chapter 1. Admin Guide 3.12. drg_grpid_col (str) 3.13. fetch_rows (int) 3.14. force_dns (int) + 3.15. enable_keepalive (int) 3.1. db_url(str) @@ -690,6 +694,22 @@ modparam("drouting", "fetch_rows", 1500) modparam("drouting", "force_dns", 0) ... +3.15. enable_keepalive (int) + + Enable monitoring of GW/destinations using keepalive module. + Destinations found unavailable will not be used on do_routing() call. + + NOTE: this option is only compatible with <em>sort_order</em> 0 + currently. With sort_order value of 1 or 2, destinations status will + simply be ignored. + + Default value is “0 (disabled)”. + + Example 1.15. Set enable_keepalive parameter +... +modparam("drouting", "enable_keepalive", 1) +... + 4. Functions 4.1. do_routing("[groupID]") @@ -710,7 +730,7 @@ modparam("drouting", "force_dns", 0) specification. If none specified, the function will automatically try to query the dr_group table to get this information. - Example 1.15. do_routing usage + Example 1.16. do_routing usage ... do_routing(); ... @@ -733,7 +753,7 @@ do_routing("$avp(i:10)"); is no other alternative destinations are found or in case of internal processing error. - Example 1.16. use_next_gw usage + Example 1.17. use_next_gw usage ... if (use_next_gw()) { t_relay(); @@ -754,7 +774,7 @@ if (use_next_gw()) { The function can take one optional parameter: * type (optional) - GW/destination type to be checked - Example 1.17. goes_to_gw usage + Example 1.18. goes_to_gw usage ... if (goes_to_gw("1")) { sl_send_reply("403","Forbidden"); @@ -775,7 +795,7 @@ if (goes_to_gw("1")) { * flags - if message is a request and the GW has a STRIP defined, then apply it if GW is source. - Example 1.18. is_from_gw usage + Example 1.19. is_from_gw usage ... if (is_from_gw("1") { } @@ -793,7 +813,7 @@ if (is_from_gw("1") { * flags (optional) - if message is a request and the GW has a STRIP defined, then apply it if GW is source. - Example 1.19. is_from_gw usage + Example 1.20. is_from_gw usage ... if (is_from_gw("3","1") { }

1 0

git:master:4e1437aa: drouting: use keepalive to monitor GW/destinations
by Daniel-Constantin Mierla 21 Apr '17

21 Apr '17

Module: kamailio Branch: master Commit: 4e1437aacd03888b1663e2f42e1155efd0ba54fe URL: https://github.com/kamailio/kamailio/commit/4e1437aacd03888b1663e2f42e1155e… Author: Guillaume Bour <guillaume(a)bour.cc> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-21T11:55:55+02:00 drouting: use keepalive to monitor GW/destinations - it works for sort_order 0 only --- Modified: src/modules/drouting/doc/drouting_admin.xml Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/drouting.c Modified: src/modules/drouting/prefix_tree.h Modified: src/modules/drouting/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/4e1437aacd03888b1663e2f42e1155e… Patch: https://github.com/kamailio/kamailio/commit/4e1437aacd03888b1663e2f42e1155e…

1 0

New developer: Guillaume Bour
by Daniel-Constantin Mierla 21 Apr '17

21 Apr '17

Hello, I would like to announce that Guillaume Bour (https://github.com/gbour) has now developer privileges on Kamailio's gihub project. He has contributed recently a new module named keepalive: - http://kamailio.org/docs/modules/devel/modules/keepalive.html There is also a pull request from him waiting to be merge to drouting module, adding capability of detecting active/inactive gateways used by the module. Thanks for the contributions so far and looking forward to collaborate in the future! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

1 0

git:master:c012031e: Makefile.groups: added app_sqlang to group extra
by Daniel-Constantin Mierla 20 Apr '17

20 Apr '17

Module: kamailio Branch: master Commit: c012031ed7e66a5b684f9174d96a8c5e9e09164b URL: https://github.com/kamailio/kamailio/commit/c012031ed7e66a5b684f9174d96a8c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-20T20:07:55+02:00 Makefile.groups: added app_sqlang to group extra --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/c012031ed7e66a5b684f9174d96a8c5… Patch: https://github.com/kamailio/kamailio/commit/c012031ed7e66a5b684f9174d96a8c5… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 7646c68..d7074cb 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -21,7 +21,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ - log_custom keepalive ss7ops + log_custom keepalive ss7ops app_sqlang # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
43
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 2017