sr-dev May 2016

sr-dev@lists.kamailio.org

28 participants
348 discussions

git:4.4:9bbe9820: sqlops Document return values for sql_query()

by Olle E. Johansson

Module: kamailio Branch: 4.4 Commit: 9bbe98204295df6a0a2eadc6aaf539c6597f99b5 URL: https://github.com/kamailio/kamailio/commit/9bbe98204295df6a0a2eadc6aaf539c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-27T16:14:24+02:00 sqlops Document return values for sql_query() (cherry picked from commit 639574e79200b5ffae4274b862ad595bd209da24) --- Modified: modules/sqlops/README Modified: modules/sqlops/doc/sqlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9bbe98204295df6a0a2eadc6aaf539c… Patch: https://github.com/kamailio/kamailio/commit/9bbe98204295df6a0a2eadc6aaf539c… --- diff --git a/modules/sqlops/README b/modules/sqlops/README index ccf03b3..62c6678 100644 --- a/modules/sqlops/README +++ b/modules/sqlops/README @@ -248,7 +248,9 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) { the type of the columns. Please note that only these two datatypes are supported, other datatypes will/may be converted to string. - This function can be used from ANY_ROUTE. + This function can be used from ANY_ROUTE. Returns -1 on Error, 1 on + successful query, 2 if query provided no result set, 3 if result is + ignored (no result parameter given) Example 1.5. sql_pvquery() usage ... diff --git a/modules/sqlops/doc/sqlops_admin.xml b/modules/sqlops/doc/sqlops_admin.xml index bb9011b..824d7a9 100644 --- a/modules/sqlops/doc/sqlops_admin.xml +++ b/modules/sqlops/doc/sqlops_admin.xml @@ -338,7 +338,9 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) { </listitem> </itemizedlist> <para> - This function can be used from ANY_ROUTE. + This function can be used from ANY_ROUTE. Returns -1 on Error, + 1 on successful query, 2 if query provided no result set, + 3 if result is ignored (no result parameter given) </para> <example> <title><function>sql_pvquery()</function> usage</title>

7 years, 11 months

git:master:1b29ea77: sqlops Delete comment about modules_k

by Olle E. Johansson

Module: kamailio Branch: master Commit: 1b29ea77e1ceef8c74da930c9df88409d47f744e URL: https://github.com/kamailio/kamailio/commit/1b29ea77e1ceef8c74da930c9df8840… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-27T16:13:42+02:00 sqlops Delete comment about modules_k --- Modified: modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/1b29ea77e1ceef8c74da930c9df8840… Patch: https://github.com/kamailio/kamailio/commit/1b29ea77e1ceef8c74da930c9df8840… --- diff --git a/modules/sqlops/sqlops.c b/modules/sqlops/sqlops.c index 3ca3509..61ba89a 100644 --- a/modules/sqlops/sqlops.c +++ b/modules/sqlops/sqlops.c @@ -26,10 +26,9 @@ */ /*! \defgroup sqlops Kamailio :: SQL Operations - * \note Kamailio module - part of modules_k - + * * The module adds support for raw SQL queries in the configuration file. - + * */

7 years, 11 months

git:master:c7d8b8a6: sqlops Document return values for sql_query()

by Olle E. Johansson

Module: kamailio Branch: master Commit: c7d8b8a6a05efbcb34b1dceabbd209fef419bfaf URL: https://github.com/kamailio/kamailio/commit/c7d8b8a6a05efbcb34b1dceabbd209f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-27T16:13:42+02:00 sqlops Document return values for sql_query() --- Modified: modules/sqlops/README Modified: modules/sqlops/doc/sqlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c7d8b8a6a05efbcb34b1dceabbd209f… Patch: https://github.com/kamailio/kamailio/commit/c7d8b8a6a05efbcb34b1dceabbd209f… --- diff --git a/modules/sqlops/README b/modules/sqlops/README index ccf03b3..62c6678 100644 --- a/modules/sqlops/README +++ b/modules/sqlops/README @@ -248,7 +248,9 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) { the type of the columns. Please note that only these two datatypes are supported, other datatypes will/may be converted to string. - This function can be used from ANY_ROUTE. + This function can be used from ANY_ROUTE. Returns -1 on Error, 1 on + successful query, 2 if query provided no result set, 3 if result is + ignored (no result parameter given) Example 1.5. sql_pvquery() usage ... diff --git a/modules/sqlops/doc/sqlops_admin.xml b/modules/sqlops/doc/sqlops_admin.xml index bb9011b..824d7a9 100644 --- a/modules/sqlops/doc/sqlops_admin.xml +++ b/modules/sqlops/doc/sqlops_admin.xml @@ -338,7 +338,9 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) { </listitem> </itemizedlist> <para> - This function can be used from ANY_ROUTE. + This function can be used from ANY_ROUTE. Returns -1 on Error, + 1 on successful query, 2 if query provided no result set, + 3 if result is ignored (no result parameter given) </para> <example> <title><function>sql_pvquery()</function> usage</title>

7 years, 11 months

git:4.4:cad6a67a: uac: proper skip of uacreg records with empty attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: cad6a67a41c8085f126798859b38a64a7350fbf6 URL: https://github.com/kamailio/kamailio/commit/cad6a67a41c8085f126798859b38a64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-27T11:52:36+02:00 uac: proper skip of uacreg records with empty attributes (cherry picked from commit 451b19597c5436ba481a49ecc89cc113829a9425) --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/cad6a67a41c8085f126798859b38a64… Patch: https://github.com/kamailio/kamailio/commit/cad6a67a41c8085f126798859b38a64… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 63b0ff0..c02fe69 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -1079,7 +1079,7 @@ void uac_reg_timer(unsigned int ticks) if(reg.attr.len == 0) { \ LM_ERR("empty value not allowed for column[%d]='%.*s' - ignoring record\n", \ pos, db_cols[pos]->len, db_cols[pos]->s); \ - continue; \ + goto nextrec; \ } \ } \ } while(0); @@ -1178,7 +1178,7 @@ int uac_reg_load_db(void) do { for(i=0; i<RES_ROW_N(db_res); i++) { - memset(&reg, 0, sizeof(reg_uac_t));; + memset(&reg, 0, sizeof(reg_uac_t)); /* check for NULL values ?!?! */ reg_db_set_attr(l_uuid, 0); reg_db_set_attr(l_username, 1); @@ -1205,6 +1205,8 @@ int uac_reg_load_db(void) LM_ERR("Error adding reg to htable\n"); goto error; } +nextrec: + ; } if (DB_CAPABILITY(reg_dbf, DB_CAP_FETCH)) { if(reg_dbf.fetch_result(reg_db_con, &db_res, reg_fetch_rows)<0) { @@ -1312,46 +1314,48 @@ int uac_reg_db_refresh(str *pl_uuid) memset(&reg, 0, sizeof(reg_uac_t)); /* only one record - use FOR to catch 'contunue' on invalid set attr */ - for(i=0; i<1; i++) { - /* check for NULL values ?!?! */ - reg_db_set_attr(l_uuid, 0); - reg_db_set_attr(l_username, 1); - reg_db_set_attr(l_domain, 2); - reg_db_set_attr(r_username, 3); - reg_db_set_attr(r_domain, 4); - /* realm may be empty */ - if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { - reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); - reg.realm.len = strlen(reg.realm.s); - } - reg_db_set_attr(auth_username, 6); - reg_db_set_attr(auth_password, 7); - reg_db_set_attr(auth_proxy, 8); - reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; - reg.h_uuid = reg_compute_hash(&reg.l_uuid); - reg.h_user = reg_compute_hash(&reg.l_username); - reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val; - reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val; + i = 0; + + /* check for NULL values ?!?! */ + reg_db_set_attr(l_uuid, 0); + reg_db_set_attr(l_username, 1); + reg_db_set_attr(l_domain, 2); + reg_db_set_attr(r_username, 3); + reg_db_set_attr(r_domain, 4); + /* realm may be empty */ + if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { + reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); + reg.realm.len = strlen(reg.realm.s); + } + reg_db_set_attr(auth_username, 6); + reg_db_set_attr(auth_password, 7); + reg_db_set_attr(auth_proxy, 8); + reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; + reg.h_uuid = reg_compute_hash(&reg.l_uuid); + reg.h_user = reg_compute_hash(&reg.l_username); + reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val; + reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val; - lock_get(_reg_htable_gc_lock); - if(reg_ht_get_byuuid(pl_uuid)!=NULL) + lock_get(_reg_htable_gc_lock); + if(reg_ht_get_byuuid(pl_uuid)!=NULL) + { + if(reg_ht_update_attrs(&reg)<0) { - if(reg_ht_update_attrs(&reg)<0) - { - lock_release(_reg_htable_gc_lock); - LM_ERR("Error updating reg to htable\n"); - goto error; - } - } else { - if(reg_ht_add(&reg)<0) - { - lock_release(_reg_htable_gc_lock); - LM_ERR("Error adding reg to htable\n"); - goto error; - } + lock_release(_reg_htable_gc_lock); + LM_ERR("Error updating reg to htable\n"); + goto error; + } + } else { + if(reg_ht_add(&reg)<0) + { + lock_release(_reg_htable_gc_lock); + LM_ERR("Error adding reg to htable\n"); + goto error; } - lock_release(_reg_htable_gc_lock); } + lock_release(_reg_htable_gc_lock); + +nextrec: reg_dbf.free_result(reg_db_con, db_res); reg_dbf.close(reg_db_con);

7 years, 11 months

git:4.4:3acfc000: uac: proper handling of empty attribute for uacreg refresh

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 3acfc0003915401f1a27120b9a5d329b2e52e78d URL: https://github.com/kamailio/kamailio/commit/3acfc0003915401f1a27120b9a5d329… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-27T11:52:27+02:00 uac: proper handling of empty attribute for uacreg refresh - reg_db_set_attr() does a continue on empty value, but for this operation was not used inside a loop - reported by Dmitri Savolainen, GH #643 (cherry picked from commit a34b382002cf9efe13c913f547ffacec3bd7757f) --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/3acfc0003915401f1a27120b9a5d329… Patch: https://github.com/kamailio/kamailio/commit/3acfc0003915401f1a27120b9a5d329… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 8ff63bd..63b0ff0 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -1310,46 +1310,48 @@ int uac_reg_db_refresh(str *pl_uuid) } } - memset(&reg, 0, sizeof(reg_uac_t));; - i = 0; - /* check for NULL values ?!?! */ - reg_db_set_attr(l_uuid, 0); - reg_db_set_attr(l_username, 1); - reg_db_set_attr(l_domain, 2); - reg_db_set_attr(r_username, 3); - reg_db_set_attr(r_domain, 4); - /* realm may be empty */ - if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { - reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); - reg.realm.len = strlen(reg.realm.s); - } - reg_db_set_attr(auth_username, 6); - reg_db_set_attr(auth_password, 7); - reg_db_set_attr(auth_proxy, 8); - reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; - reg.h_uuid = reg_compute_hash(&reg.l_uuid); - reg.h_user = reg_compute_hash(&reg.l_username); - reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val; - reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val; - - lock_get(_reg_htable_gc_lock); - if(reg_ht_get_byuuid(pl_uuid)!=NULL) - { - if(reg_ht_update_attrs(&reg)<0) - { - lock_release(_reg_htable_gc_lock); - LM_ERR("Error updating reg to htable\n"); - goto error; + memset(&reg, 0, sizeof(reg_uac_t)); + /* only one record - use FOR to catch 'contunue' on invalid set attr */ + for(i=0; i<1; i++) { + /* check for NULL values ?!?! */ + reg_db_set_attr(l_uuid, 0); + reg_db_set_attr(l_username, 1); + reg_db_set_attr(l_domain, 2); + reg_db_set_attr(r_username, 3); + reg_db_set_attr(r_domain, 4); + /* realm may be empty */ + if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { + reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); + reg.realm.len = strlen(reg.realm.s); } - } else { - if(reg_ht_add(&reg)<0) + reg_db_set_attr(auth_username, 6); + reg_db_set_attr(auth_password, 7); + reg_db_set_attr(auth_proxy, 8); + reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; + reg.h_uuid = reg_compute_hash(&reg.l_uuid); + reg.h_user = reg_compute_hash(&reg.l_username); + reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val; + reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val; + + lock_get(_reg_htable_gc_lock); + if(reg_ht_get_byuuid(pl_uuid)!=NULL) { - lock_release(_reg_htable_gc_lock); - LM_ERR("Error adding reg to htable\n"); - goto error; + if(reg_ht_update_attrs(&reg)<0) + { + lock_release(_reg_htable_gc_lock); + LM_ERR("Error updating reg to htable\n"); + goto error; + } + } else { + if(reg_ht_add(&reg)<0) + { + lock_release(_reg_htable_gc_lock); + LM_ERR("Error adding reg to htable\n"); + goto error; + } } + lock_release(_reg_htable_gc_lock); } - lock_release(_reg_htable_gc_lock); reg_dbf.free_result(reg_db_con, db_res); reg_dbf.close(reg_db_con);

7 years, 11 months

[kamailio/kamailio] uac: bad error in log (#643)

by Dmitri Savolainen

there is define in uac_reg.c (define reg_db_set_attr(attr, pos)) which may generate logs like this: > empty value not allowed for column[2]='l_domain' - ignoring record really, record was added, so it should be converted to WARNING or it is neсessary add any more restrict logic --- 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/issues/643

7 years, 11 months

git:master:451b1959: uac: proper skip of uacreg records with empty attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 451b19597c5436ba481a49ecc89cc113829a9425 URL: https://github.com/kamailio/kamailio/commit/451b19597c5436ba481a49ecc89cc11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-27T11:39:09+02:00 uac: proper skip of uacreg records with empty attributes --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/451b19597c5436ba481a49ecc89cc11… Patch: https://github.com/kamailio/kamailio/commit/451b19597c5436ba481a49ecc89cc11… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 41b03ac..e2226e8 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -1089,7 +1089,7 @@ void uac_reg_timer(unsigned int ticks) if(reg.attr.len == 0) { \ LM_ERR("empty value not allowed for column[%d]='%.*s' - ignoring record\n", \ pos, db_cols[pos]->len, db_cols[pos]->s); \ - continue; \ + goto nextrec; \ } \ } \ } while(0); @@ -1188,7 +1188,7 @@ int uac_reg_load_db(void) do { for(i=0; i<RES_ROW_N(db_res); i++) { - memset(&reg, 0, sizeof(reg_uac_t));; + memset(&reg, 0, sizeof(reg_uac_t)); /* check for NULL values ?!?! */ reg_db_set_attr(l_uuid, 0); reg_db_set_attr(l_username, 1); @@ -1215,6 +1215,8 @@ int uac_reg_load_db(void) LM_ERR("Error adding reg to htable\n"); goto error; } +nextrec: + ; } if (DB_CAPABILITY(reg_dbf, DB_CAP_FETCH)) { if(reg_dbf.fetch_result(reg_db_con, &db_res, reg_fetch_rows)<0) { @@ -1322,46 +1324,48 @@ int uac_reg_db_refresh(str *pl_uuid) memset(&reg, 0, sizeof(reg_uac_t)); /* only one record - use FOR to catch 'contunue' on invalid set attr */ - for(i=0; i<1; i++) { - /* check for NULL values ?!?! */ - reg_db_set_attr(l_uuid, 0); - reg_db_set_attr(l_username, 1); - reg_db_set_attr(l_domain, 2); - reg_db_set_attr(r_username, 3); - reg_db_set_attr(r_domain, 4); - /* realm may be empty */ - if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { - reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); - reg.realm.len = strlen(reg.realm.s); - } - reg_db_set_attr(auth_username, 6); - reg_db_set_attr(auth_password, 7); - reg_db_set_attr(auth_proxy, 8); - reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; - reg.h_uuid = reg_compute_hash(&reg.l_uuid); - reg.h_user = reg_compute_hash(&reg.l_username); - reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val; - reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val; + i = 0; + + /* check for NULL values ?!?! */ + reg_db_set_attr(l_uuid, 0); + reg_db_set_attr(l_username, 1); + reg_db_set_attr(l_domain, 2); + reg_db_set_attr(r_username, 3); + reg_db_set_attr(r_domain, 4); + /* realm may be empty */ + if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { + reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); + reg.realm.len = strlen(reg.realm.s); + } + reg_db_set_attr(auth_username, 6); + reg_db_set_attr(auth_password, 7); + reg_db_set_attr(auth_proxy, 8); + reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; + reg.h_uuid = reg_compute_hash(&reg.l_uuid); + reg.h_user = reg_compute_hash(&reg.l_username); + reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val; + reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val; - lock_get(_reg_htable_gc_lock); - if(reg_ht_get_byuuid(pl_uuid)!=NULL) + lock_get(_reg_htable_gc_lock); + if(reg_ht_get_byuuid(pl_uuid)!=NULL) + { + if(reg_ht_update_attrs(&reg)<0) { - if(reg_ht_update_attrs(&reg)<0) - { - lock_release(_reg_htable_gc_lock); - LM_ERR("Error updating reg to htable\n"); - goto error; - } - } else { - if(reg_ht_add(&reg)<0) - { - lock_release(_reg_htable_gc_lock); - LM_ERR("Error adding reg to htable\n"); - goto error; - } + lock_release(_reg_htable_gc_lock); + LM_ERR("Error updating reg to htable\n"); + goto error; + } + } else { + if(reg_ht_add(&reg)<0) + { + lock_release(_reg_htable_gc_lock); + LM_ERR("Error adding reg to htable\n"); + goto error; } - lock_release(_reg_htable_gc_lock); } + lock_release(_reg_htable_gc_lock); + +nextrec: reg_dbf.free_result(reg_db_con, db_res); reg_dbf.close(reg_db_con);

7 years, 11 months

git:master:a34b3820: uac: proper handling of empty attribute for uacreg refresh

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a34b382002cf9efe13c913f547ffacec3bd7757f URL: https://github.com/kamailio/kamailio/commit/a34b382002cf9efe13c913f547fface… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-27T11:16:08+02:00 uac: proper handling of empty attribute for uacreg refresh - reg_db_set_attr() does a continue on empty value, but for this operation was not used inside a loop - reported by Dmitri Savolainen, GH #643 --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/a34b382002cf9efe13c913f547fface… Patch: https://github.com/kamailio/kamailio/commit/a34b382002cf9efe13c913f547fface… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index f8c30ca..41b03ac 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -1320,46 +1320,48 @@ int uac_reg_db_refresh(str *pl_uuid) } } - memset(&reg, 0, sizeof(reg_uac_t));; - i = 0; - /* check for NULL values ?!?! */ - reg_db_set_attr(l_uuid, 0); - reg_db_set_attr(l_username, 1); - reg_db_set_attr(l_domain, 2); - reg_db_set_attr(r_username, 3); - reg_db_set_attr(r_domain, 4); - /* realm may be empty */ - if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { - reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); - reg.realm.len = strlen(reg.realm.s); - } - reg_db_set_attr(auth_username, 6); - reg_db_set_attr(auth_password, 7); - reg_db_set_attr(auth_proxy, 8); - reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; - reg.h_uuid = reg_compute_hash(&reg.l_uuid); - reg.h_user = reg_compute_hash(&reg.l_username); - reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val; - reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val; - - lock_get(_reg_htable_gc_lock); - if(reg_ht_get_byuuid(pl_uuid)!=NULL) - { - if(reg_ht_update_attrs(&reg)<0) - { - lock_release(_reg_htable_gc_lock); - LM_ERR("Error updating reg to htable\n"); - goto error; + memset(&reg, 0, sizeof(reg_uac_t)); + /* only one record - use FOR to catch 'contunue' on invalid set attr */ + for(i=0; i<1; i++) { + /* check for NULL values ?!?! */ + reg_db_set_attr(l_uuid, 0); + reg_db_set_attr(l_username, 1); + reg_db_set_attr(l_domain, 2); + reg_db_set_attr(r_username, 3); + reg_db_set_attr(r_domain, 4); + /* realm may be empty */ + if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { + reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); + reg.realm.len = strlen(reg.realm.s); } - } else { - if(reg_ht_add(&reg)<0) + reg_db_set_attr(auth_username, 6); + reg_db_set_attr(auth_password, 7); + reg_db_set_attr(auth_proxy, 8); + reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; + reg.h_uuid = reg_compute_hash(&reg.l_uuid); + reg.h_user = reg_compute_hash(&reg.l_username); + reg.flags = (unsigned int)RES_ROWS(db_res)[i].values[10].val.int_val; + reg.reg_delay = (unsigned int)RES_ROWS(db_res)[i].values[11].val.int_val; + + lock_get(_reg_htable_gc_lock); + if(reg_ht_get_byuuid(pl_uuid)!=NULL) { - lock_release(_reg_htable_gc_lock); - LM_ERR("Error adding reg to htable\n"); - goto error; + if(reg_ht_update_attrs(&reg)<0) + { + lock_release(_reg_htable_gc_lock); + LM_ERR("Error updating reg to htable\n"); + goto error; + } + } else { + if(reg_ht_add(&reg)<0) + { + lock_release(_reg_htable_gc_lock); + LM_ERR("Error adding reg to htable\n"); + goto error; + } } + lock_release(_reg_htable_gc_lock); } - lock_release(_reg_htable_gc_lock); reg_dbf.free_result(reg_db_con, db_res); reg_dbf.close(reg_db_con);

7 years, 11 months

git:master:18d614e6: acc_radius Remove SVN ID, history

by Olle E. Johansson

Module: kamailio Branch: master Commit: 18d614e6c2eb673c08871206e6cdc153cc3c8928 URL: https://github.com/kamailio/kamailio/commit/18d614e6c2eb673c08871206e6cdc15… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-27T09:53:31+02:00 acc_radius Remove SVN ID, history --- Modified: modules/acc_radius/acc_radius_mod.c Modified: modules/acc_radius/acc_radius_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/18d614e6c2eb673c08871206e6cdc15… Patch: https://github.com/kamailio/kamailio/commit/18d614e6c2eb673c08871206e6cdc15… --- diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index 3820339..e7cc62f 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -1,5 +1,5 @@ /* - * Accounting module + * Radius Accounting module * * Copyright (C) 2001-2003 FhG Fokus * diff --git a/modules/acc_radius/acc_radius_mod.h b/modules/acc_radius/acc_radius_mod.h index 16e48d5..b050b5b 100644 --- a/modules/acc_radius/acc_radius_mod.h +++ b/modules/acc_radius/acc_radius_mod.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * RADIUS Accounting module * * Copyright (C) 2001-2003 FhG Fokus @@ -21,8 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * --------- */ /*! \file

7 years, 11 months

git:master:d6124b3d: pv: signed int string representation for avps

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d6124b3d894b130e3ebeabb247230966a77c9ceb URL: https://github.com/kamailio/kamailio/commit/d6124b3d894b130e3ebeabb24723096… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-26T16:54:54+02:00 pv: signed int string representation for avps --- Modified: modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d6124b3d894b130e3ebeabb24723096… Patch: https://github.com/kamailio/kamailio/commit/d6124b3d894b130e3ebeabb24723096… --- diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index d2ffa09..5836e23 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -1519,7 +1519,7 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { res->rs = avp_value.s; } else { - res->rs.s = int2str(avp_value.n, &res->rs.len); + res->rs.s = sint2str(avp_value.n, &res->rs.len); res->ri = avp_value.n; res->flags |= PV_VAL_INT|PV_TYPE_INT; } @@ -1545,7 +1545,7 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { res->rs = avp_value.s; } else { - res->rs.s = int2str(avp_value.n, &res->rs.len); + res->rs.s = sint2str(avp_value.n, &res->rs.len); } if(p-p_ini+res->rs.len+1>p_size) @@ -1580,7 +1580,7 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { res->rs = avp_value.s; } else { - res->rs.s = int2str(avp_value.n, &res->rs.len); + res->rs.s = sint2str(avp_value.n, &res->rs.len); res->ri = avp_value.n; res->flags |= PV_VAL_INT|PV_TYPE_INT; } @@ -1598,7 +1598,7 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { res->rs = avp_value.s; } else { - res->rs.s = int2str(avp_value.n, &res->rs.len); + res->rs.s = sint2str(avp_value.n, &res->rs.len); res->ri = avp_value.n; res->flags |= PV_VAL_INT|PV_TYPE_INT; }

7 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2016