sr-dev March 2015

sr-dev@lists.kamailio.org

34 participants
191 discussions

git:master:d7a10e6a: core: set the global sock_uid/gid based on the user/group values
by Daniel-Constantin Mierla 11 Mar '15

11 Mar '15

Module: kamailio Branch: master Commit: d7a10e6a5ea8852681b57586eb9b4d73b75f05bf URL: https://github.com/kamailio/kamailio/commit/d7a10e6a5ea8852681b57586eb9b4d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-11T09:40:52+01:00 core: set the global sock_uid/gid based on the user/group values - they were left with initial value, more or less being unused --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/d7a10e6a5ea8852681b57586eb9b4d7… Patch: https://github.com/kamailio/kamailio/commit/d7a10e6a5ea8852681b57586eb9b4d7… --- diff --git a/main.c b/main.c index 8e6e9c8..8451e97 100644 --- a/main.c +++ b/main.c @@ -2301,12 +2301,15 @@ int main(int argc, char** argv) fprintf(stderr, "bad user name/uid number: -u %s\n", user); goto error; } + sock_uid = uid; + sock_gid = gid; } if (group){ if (group2gid(&gid, group)<0){ fprintf(stderr, "bad group name/gid number: -u %s\n", group); goto error; } + sock_gid = gid; } if (fix_all_socket_lists()!=0){ fprintf(stderr, "failed to initialize list addresses\n");

1 0

git:master:c3f9e82e: usrloc: new param to close TCP connections
by Camille Oudot 10 Mar '15

10 Mar '15

Module: kamailio Branch: master Commit: c3f9e82e35f805d923237fbeb8e1173dc9a5ae23 URL: https://github.com/kamailio/kamailio/commit/c3f9e82e35f805d923237fbeb8e1173… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-03-05T10:38:36+01:00 usrloc: new param to close TCP connections the new `close_expired_tcp`, if set, forces Kamailio to close the TCP connections of expired contacts --- Modified: modules/usrloc/doc/usrloc_admin.xml Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h Modified: modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/c3f9e82e35f805d923237fbeb8e1173… Patch: https://github.com/kamailio/kamailio/commit/c3f9e82e35f805d923237fbeb8e1173…

2 4

git:4.2:87ca6e63: ldap: fixed copy&paste error added in previous commit
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: 4.2 Commit: 87ca6e634c627a6beb4b7355fcfcbd0070e2afe1 URL: https://github.com/kamailio/kamailio/commit/87ca6e634c627a6beb4b7355fcfcbd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T14:59:15+01:00 ldap: fixed copy&paste error added in previous commit (cherry picked from commit c6ddf3aec7eb6e8d6046b006fde64ab7479aab5e) --- Modified: modules/ldap/ldap_connect.c --- Diff: https://github.com/kamailio/kamailio/commit/87ca6e634c627a6beb4b7355fcfcbd0… Patch: https://github.com/kamailio/kamailio/commit/87ca6e634c627a6beb4b7355fcfcbd0… --- diff --git a/modules/ldap/ldap_connect.c b/modules/ldap/ldap_connect.c index 53d4f98..c1c6a06 100644 --- a/modules/ldap/ldap_connect.c +++ b/modules/ldap/ldap_connect.c @@ -235,7 +235,7 @@ int ldap_connect_ex(char* _ld_name, int llevel) int ldap_connect(char* _ld_name) { - return ldap_connect(_ld_name, L_DBG); + return ldap_connect_ex(_ld_name, L_DBG); } int ldap_disconnect(char* _ld_name)

1 0

git:master:c6ddf3ae: ldap: fixed copy&paste error added in previous commit
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: master Commit: c6ddf3aec7eb6e8d6046b006fde64ab7479aab5e URL: https://github.com/kamailio/kamailio/commit/c6ddf3aec7eb6e8d6046b006fde64ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T14:58:32+01:00 ldap: fixed copy&paste error added in previous commit --- Modified: modules/ldap/ldap_connect.c --- Diff: https://github.com/kamailio/kamailio/commit/c6ddf3aec7eb6e8d6046b006fde64ab… Patch: https://github.com/kamailio/kamailio/commit/c6ddf3aec7eb6e8d6046b006fde64ab… --- diff --git a/modules/ldap/ldap_connect.c b/modules/ldap/ldap_connect.c index d2ae164..c21e445 100644 --- a/modules/ldap/ldap_connect.c +++ b/modules/ldap/ldap_connect.c @@ -230,7 +230,7 @@ int ldap_connect_ex(char* _ld_name, int llevel) int ldap_connect(char* _ld_name) { - return ldap_connect(_ld_name, L_DBG); + return ldap_connect_ex(_ld_name, L_DBG); } int ldap_disconnect(char* _ld_name)

1 0

git:4.2:b2aa72a6: ldap: more useful info on reconnect
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: 4.2 Commit: b2aa72a6357dd93c75a345fd433c3b86c2654313 URL: https://github.com/kamailio/kamailio/commit/b2aa72a6357dd93c75a345fd433c3b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T14:56:38+01:00 ldap: more useful info on reconnect - reconnect message made a notice level, being not an error situation - print the chosen ldap server address at info level when reconnecting (cherry picked from commit c5ae4020de8499e7a318783b21276dfd3fc0a6e3) --- Modified: modules/ldap/ldap_connect.c --- Diff: https://github.com/kamailio/kamailio/commit/b2aa72a6357dd93c75a345fd433c3b8… Patch: https://github.com/kamailio/kamailio/commit/b2aa72a6357dd93c75a345fd433c3b8… --- diff --git a/modules/ldap/ldap_connect.c b/modules/ldap/ldap_connect.c index 9799adf..53d4f98 100644 --- a/modules/ldap/ldap_connect.c +++ b/modules/ldap/ldap_connect.c @@ -41,7 +41,7 @@ #include "../../mem/mem.h" #include "../../ut.h" -int ldap_connect(char* _ld_name) +int ldap_connect_ex(char* _ld_name, int llevel) { int rc; int ldap_bind_result_code; @@ -226,13 +226,18 @@ int ldap_connect(char* _ld_name) /* ldap_msgfree(result); */ - LM_DBG( "[%s]: LDAP bind successful (ldap_host [%s])\n", + LOG(llevel, "[%s]: LDAP bind successful (ldap_host [%s])\n", _ld_name, lds->host_name); return 0; } +int ldap_connect(char* _ld_name) +{ + return ldap_connect(_ld_name, L_DBG); +} + int ldap_disconnect(char* _ld_name) { struct ld_session* lds; @@ -267,14 +272,14 @@ int ldap_reconnect(char* _ld_name) return -1; } - if ((rc = ldap_connect(_ld_name)) != 0) + if ((rc = ldap_connect_ex(_ld_name, L_INFO)) != 0) { LM_ERR("[%s]: reconnect failed\n", _ld_name); } else { - LM_ERR("[%s]: LDAP reconnect successful\n", + LM_NOTICE("[%s]: LDAP reconnect successful\n", _ld_name); } return rc;

1 0

git:4.2:bb81ec09: sqlops: more verbose log message if execution of query fails
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: 4.2 Commit: bb81ec09e22bb35944879a081eba47b1cfcc816b URL: https://github.com/kamailio/kamailio/commit/bb81ec09e22bb35944879a081eba47b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T14:56:17+01:00 sqlops: more verbose log message if execution of query fails (cherry picked from commit 941fbda5c66da6c8069b3bce3764249bbb58baaa) --- Modified: modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/bb81ec09e22bb35944879a081eba47b… Patch: https://github.com/kamailio/kamailio/commit/bb81ec09e22bb35944879a081eba47b… --- diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index fe7acf5..744f730 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -261,7 +261,8 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) } if(con->dbf.raw_query(con->dbh, query, &db_res)!=0) { - LM_ERR("cannot do the query\n"); + LM_ERR("cannot do the query [%.*s]\n", + (query->len>32)?32:query->len, query->s); return -1; }

1 0

git:master:c5ae4020: ldap: more useful info on reconnect
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: master Commit: c5ae4020de8499e7a318783b21276dfd3fc0a6e3 URL: https://github.com/kamailio/kamailio/commit/c5ae4020de8499e7a318783b21276df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T14:52:08+01:00 ldap: more useful info on reconnect - reconnect message made a notice level, being not an error situation - print the chosen ldap server address at info level when reconnecting --- Modified: modules/ldap/ldap_connect.c --- Diff: https://github.com/kamailio/kamailio/commit/c5ae4020de8499e7a318783b21276df… Patch: https://github.com/kamailio/kamailio/commit/c5ae4020de8499e7a318783b21276df… --- diff --git a/modules/ldap/ldap_connect.c b/modules/ldap/ldap_connect.c index 4ffff28..d2ae164 100644 --- a/modules/ldap/ldap_connect.c +++ b/modules/ldap/ldap_connect.c @@ -36,7 +36,7 @@ #include "../../mem/mem.h" #include "../../ut.h" -int ldap_connect(char* _ld_name) +int ldap_connect_ex(char* _ld_name, int llevel) { int rc; int ldap_bind_result_code; @@ -221,13 +221,18 @@ int ldap_connect(char* _ld_name) /* ldap_msgfree(result); */ - LM_DBG( "[%s]: LDAP bind successful (ldap_host [%s])\n", + LOG(llevel, "[%s]: LDAP bind successful (ldap_host [%s])\n", _ld_name, lds->host_name); return 0; } +int ldap_connect(char* _ld_name) +{ + return ldap_connect(_ld_name, L_DBG); +} + int ldap_disconnect(char* _ld_name) { struct ld_session* lds; @@ -262,14 +267,14 @@ int ldap_reconnect(char* _ld_name) return -1; } - if ((rc = ldap_connect(_ld_name)) != 0) + if ((rc = ldap_connect_ex(_ld_name, L_INFO)) != 0) { LM_ERR("[%s]: reconnect failed\n", _ld_name); } else { - LM_ERR("[%s]: LDAP reconnect successful\n", + LM_NOTICE("[%s]: LDAP reconnect successful\n", _ld_name); } return rc;

1 0

git:master:941fbda5: sqlops: more verbose log message if execution of query fails
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: master Commit: 941fbda5c66da6c8069b3bce3764249bbb58baaa URL: https://github.com/kamailio/kamailio/commit/941fbda5c66da6c8069b3bce3764249… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T14:38:38+01:00 sqlops: more verbose log message if execution of query fails --- Modified: modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/941fbda5c66da6c8069b3bce3764249… Patch: https://github.com/kamailio/kamailio/commit/941fbda5c66da6c8069b3bce3764249… --- diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index 6ef90e2..4b19f33 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -259,7 +259,8 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) } if(con->dbf.raw_query(con->dbh, query, &db_res)!=0) { - LM_ERR("cannot do the query\n"); + LM_ERR("cannot do the query [%.*s]\n", + (query->len>32)?32:query->len, query->s); return -1; }

1 0

git:4.2:4ae4e5f3: db_cluster: fix checking the capabilities for write operation with different priorities
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: 4.2 Commit: 4ae4e5f381fba4cf43d8792e56d2baa4b2edcc6f URL: https://github.com/kamailio/kamailio/commit/4ae4e5f381fba4cf43d8792e56d2baa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T13:56:02+01:00 db_cluster: fix checking the capabilities for write operation with different priorities - reported by Jan Hazenberg (cherry picked from commit 8375f37cd7603216a2bb55a4e9985b3c5e54af91) --- Modified: modules/db_cluster/dbcl_api.c --- Diff: https://github.com/kamailio/kamailio/commit/4ae4e5f381fba4cf43d8792e56d2baa… Patch: https://github.com/kamailio/kamailio/commit/4ae4e5f381fba4cf43d8792e56d2baa… --- diff --git a/modules/db_cluster/dbcl_api.c b/modules/db_cluster/dbcl_api.c index abb52d6..c338615 100644 --- a/modules/db_cluster/dbcl_api.c +++ b/modules/db_cluster/dbcl_api.c @@ -158,7 +158,7 @@ extern int dbcl_max_query_length; cls->name.len, cls->name.s, i, j);\ sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ - if(cls->rlist[i].clist[j]->dbf.qfunc==NULL) {\ + if(cls->wlist[i].clist[j]->dbf.qfunc==NULL) {\ LM_ERR("unsupported command by db connector\n");\ return -1;\ }\ @@ -189,7 +189,7 @@ extern int dbcl_max_query_length; cls->name.len, cls->name.s, i, j);\ sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ - if(cls->rlist[i].clist[j]->dbf.qfunc==NULL) {\ + if(cls->wlist[i].clist[j]->dbf.qfunc==NULL) {\ LM_ERR("unsupported command by db connector\n");\ return -1;\ }\ @@ -221,7 +221,7 @@ extern int dbcl_max_query_length; cls->name.len, cls->name.s, i, j);\ sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ - if(cls->rlist[i].clist[j]->dbf.qfunc==NULL) {\ + if(cls->wlist[i].clist[j]->dbf.qfunc==NULL) {\ LM_ERR("unsupported command by db connector\n");\ return -1;\ }\

1 0

git:master:8375f37c: db_cluster: fix checking the capabilities for write operation with different priorities
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: master Commit: 8375f37cd7603216a2bb55a4e9985b3c5e54af91 URL: https://github.com/kamailio/kamailio/commit/8375f37cd7603216a2bb55a4e9985b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T13:54:11+01:00 db_cluster: fix checking the capabilities for write operation with different priorities - reported by Jan Hazenberg --- Modified: modules/db_cluster/dbcl_api.c --- Diff: https://github.com/kamailio/kamailio/commit/8375f37cd7603216a2bb55a4e9985b3… Patch: https://github.com/kamailio/kamailio/commit/8375f37cd7603216a2bb55a4e9985b3… --- diff --git a/modules/db_cluster/dbcl_api.c b/modules/db_cluster/dbcl_api.c index abb52d6..c338615 100644 --- a/modules/db_cluster/dbcl_api.c +++ b/modules/db_cluster/dbcl_api.c @@ -158,7 +158,7 @@ extern int dbcl_max_query_length; cls->name.len, cls->name.s, i, j);\ sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ - if(cls->rlist[i].clist[j]->dbf.qfunc==NULL) {\ + if(cls->wlist[i].clist[j]->dbf.qfunc==NULL) {\ LM_ERR("unsupported command by db connector\n");\ return -1;\ }\ @@ -189,7 +189,7 @@ extern int dbcl_max_query_length; cls->name.len, cls->name.s, i, j);\ sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ - if(cls->rlist[i].clist[j]->dbf.qfunc==NULL) {\ + if(cls->wlist[i].clist[j]->dbf.qfunc==NULL) {\ LM_ERR("unsupported command by db connector\n");\ return -1;\ }\ @@ -221,7 +221,7 @@ extern int dbcl_max_query_length; cls->name.len, cls->name.s, i, j);\ sec = get_ticks();\ dbh = cls->wlist[i].clist[j]->dbh;\ - if(cls->rlist[i].clist[j]->dbf.qfunc==NULL) {\ + if(cls->wlist[i].clist[j]->dbf.qfunc==NULL) {\ LM_ERR("unsupported command by db connector\n");\ return -1;\ }\

1 0

← Newer
1
...
12
13
14
15
16
17
18
19
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2015