sr-dev

sr-dev@lists.kamailio.org

12 participants
45245 discussions

git:master:66ef7ab7: kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 66ef7ab7b078794b96ecee13f6867d5f90a8d63e URL: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T08:47:30+02:00 kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser --- Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… Patch: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index bdb8b98ab4..4050371bfe 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -161,9 +161,12 @@ kamailio_db_grant () # pars: <database name> # Users: kamailio is the regular user, kamailioro only for reading sql_query "" "CREATE USER '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST'; - CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "granting privileges to database $1 failed!" @@ -172,9 +175,11 @@ kamailio_db_grant () # pars: <database name> if [ "$DBHOST" != "localhost" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost'; - CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -183,9 +188,11 @@ kamailio_db_grant () # pars: <database name> if [ ! -z "$DBACCESSHOST" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST'; - CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1 @@ -203,8 +210,11 @@ kamailio_db_revoke () # pars: <database name> minfo "revoking privileges to database $1 ..." # Users: kamailio is the regular user, kamailioro only for reading - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST'; - REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "revoking privileges to database $1 failed!" @@ -212,8 +222,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ "$DBHOST" != "localhost" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -221,8 +233,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ ! -z "$DBACCESSHOST" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1

1 0

git:master:34b9b59b: core: more debug messages when matching myself
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 34b9b59b97f7d529025863992408fd60a27a941a URL: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T08:47:30+02:00 core: more debug messages when matching myself - coherent coding style for related functions --- Modified: src/core/forward.c Modified: src/core/name_alias.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6… Patch: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6…

1 0

[kamailio/kamailio] hash table size issue (#2311)
by fborot 01 May '20

01 May '20

I have my hash table set to size = 16 modparam("htable", "htable", "a=>size=16;autoexpire=0;dbtable=htable;") I had around 3000 entries in that table, some entries with more than 10 duplicate keys (key_type = 1) and we found that when reading the entries of the duplicated keys it could not go pass index 9 even though in the physical table there were 17 entries. I deleted some old entries and now the table is about 2000 items and it seems to work properly again ,(loads all value in memory). I say seems because I can not dump all values: ``` ./kamcmd htable.dump a ERROR: reply too big ``` But I check manually all the ones that were not being loaded and they are now Questions: 1- the size parameter is for the buckets or entries size ? 2- is 16 a good value for a table with 3000 entries? ( 2^16 is 65k so I figured it would be ok) 3- can the the way I define my key impose a limitation? 4- what is the max size for an htable to be dumped with the above command? -- 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/2311

2 5

git:5.3:cca28078: core: do not use tcp id for lookup if not needed
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: cca28078f7fe329046744c9b63d01bb9945a8dca URL: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… Author: Donato Sciarra <donato.sciarra(a)bmw.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:55:25+02:00 core: do not use tcp id for lookup if not needed In case the first lookup (with tcp id) is not successfull, the second attempt should have been performed without a tcp id. Issue was introduced with dc43750644 (new global parameter tcp_connection_match) in 5.3. (cherry picked from commit 24a3a172dbdecb6e987df943a3ad1acb4da664b5) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… Patch: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 99d33ee719..1c9859f633 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2029,7 +2029,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, if (likely(port)){ /* try again w/o id */ if(tcp_connection_match==TCPCONN_MATCH_STRICT) { - c=tcpconn_lookup(dst->id, &ip, port, from, try_local_port, con_lifetime); + c=tcpconn_lookup(0, &ip, port, from, try_local_port, con_lifetime); } else { c=tcpconn_get(0, &ip, port, from, con_lifetime); }

1 0

git:5.3:21e8b244: Makefile.defs: expose CC_NAME variable
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 21e8b244cea32cd3dedba6fb515877a7cdf47a7a URL: https://github.com/kamailio/kamailio/commit/21e8b244cea32cd3dedba6fb515877a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:19+02:00 Makefile.defs: expose CC_NAME variable (cherry picked from commit e64b29141afddf06bf7d5d68aa88679b54c5076c) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/21e8b244cea32cd3dedba6fb515877a… Patch: https://github.com/kamailio/kamailio/commit/21e8b244cea32cd3dedba6fb515877a… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 41f33a51a0..5555ba0957 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -2166,10 +2166,10 @@ export exported_vars # variable changeable only at configure time (once saved in config.mak they # cannot be overwritten from environment or command line, unless make cfg # is run) -saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ +saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ SRC_NAME RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ - CC_MKDEP_OPTS \ + CC_NAME CC_MKDEP_OPTS \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \ LIBS \

1 0

git:5.3:178cbde6: app_python: use -fno-strict-aliasing for gcc
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 178cbde6eac86a86b92b107cf2f039400c578a5f URL: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:30+02:00 app_python: use -fno-strict-aliasing for gcc - python2 is known for not confirming strict aliasing - it is EoL and likely not going to be fixed - GH #2298 (cherry picked from commit 3366bf4f3746285d9dc29e8a2461f53983f0acf0) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… Patch: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index 0d8bc98701..d22e63e6a4 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -29,5 +29,9 @@ endif DEFS+=-I${PYTHON_INCDIR} +ifeq ($(CC_NAME), gcc) +DEFS+= -fno-strict-aliasing +endif + include ../../Makefile.modules

1 0

git:5.3:0b6283dc: db2_local: replace timelocal() with mktime()
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 0b6283dc6006c8817664dd915057442500e0dae8 URL: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:53:53+02:00 db2_local: replace timelocal() with mktime() - timelocal() is nonstandard GNU extension, not recommended to be used and mktime() should be equivalent: * https://linux.die.net/man/3/timegm - GH #2298 (cherry picked from commit a0fb220a8b60b135cabf6741882437317116d868) --- Modified: src/modules/db2_ldap/ld_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442… Patch: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442… --- diff --git a/src/modules/db2_ldap/ld_fld.c b/src/modules/db2_ldap/ld_fld.c index 867c873e8f..7af731f077 100644 --- a/src/modules/db2_ldap/ld_fld.c +++ b/src/modules/db2_ldap/ld_fld.c @@ -270,7 +270,7 @@ static inline int ldap_gentime2db_datetime(time_t* dst, str* src) * of expiration by one hour when daylight saving is used */ time.tm_isdst = -1; - *dst = timelocal(&time); + *dst = mktime(&time); } return 0;

1 0

git:5.3:a5d2abed: redis: init variables to get rid of compile warnings
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: a5d2abed49bde56f4bdda42aa6a941f419186baf URL: https://github.com/kamailio/kamailio/commit/a5d2abed49bde56f4bdda42aa6a941f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:04+02:00 redis: init variables to get rid of compile warnings - GH #2298 (cherry picked from commit f1de08eef86dc2cd98509c90fa8b28212d47ca37) --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/a5d2abed49bde56f4bdda42aa6a941f… Patch: https://github.com/kamailio/kamailio/commit/a5d2abed49bde56f4bdda42aa6a941f… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index ed8105d807..721d31d8ea 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -495,13 +495,13 @@ int db_redis_parse_keys(km_redis_con_t *con) { str type_name; str column_name; - struct str_hash_entry *table_entry; - redis_table_t *table; - redis_type_t *type; - redis_type_t *type_target; - redis_key_t *key; - redis_key_t **key_target; - redis_key_t *key_location; + struct str_hash_entry *table_entry = NULL; + redis_table_t *table = NULL; + redis_type_t *type = NULL; + redis_type_t *type_target = NULL; + redis_key_t *key = NULL; + redis_key_t **key_target = NULL; + redis_key_t *key_location = NULL; enum { DBREDIS_KEYS_TABLE_ST, @@ -641,13 +641,13 @@ int db_redis_parse_schema(km_redis_con_t *con) { struct dirent* dent; char *dir_name; - str table_name; + str table_name = str_init(""); str column_name; str type_name; - struct str_hash_entry *table_entry; - struct str_hash_entry *column_entry; - redis_table_t *table; + struct str_hash_entry *table_entry = NULL; + struct str_hash_entry *column_entry = NULL; + redis_table_t *table = NULL; char full_path[_POSIX_PATH_MAX + 1]; int path_len;

1 0

git:5.3:c26f248b: ims_usrloc_pcscf: fix value array size and compile warnings
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: c26f248ba5be9f56bc1c58ad531fc5ead060a2e2 URL: https://github.com/kamailio/kamailio/commit/c26f248ba5be9f56bc1c58ad531fc5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:52:35+02:00 ims_usrloc_pcscf: fix value array size and compile warnings (cherry picked from commit 1292e40c5260fa77d34db91abf7aacf47549d5e2) --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/c26f248ba5be9f56bc1c58ad531fc5e… Patch: https://github.com/kamailio/kamailio/commit/c26f248ba5be9f56bc1c58ad531fc5e… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 1ac55734d7..e597a0daf4 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -123,8 +123,9 @@ void free_security(security_t* _p) return; } - if(_p->sec_header.s) + if(_p->sec_header.s) { shm_free(_p->sec_header.s); + } switch (_p->type) { @@ -144,8 +145,9 @@ void free_security(security_t* _p) break; case SECURITY_TLS: - if(_p->data.tls) + if(_p->data.tls) { shm_free(_p->data.tls); + } break; case SECURITY_NONE: diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ba71673e44..ca57a2b4b3 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -213,7 +213,7 @@ int db_update_pcontact(pcontact_t* _c) int db_delete_pcontact(pcontact_t* _c) { LM_DBG("Trying to delete contact: aor[%.*s], received port %u\n", _c->aor.len, _c->aor.s, _c->received_port); - db_val_t values[1]; + db_val_t values[2]; db_key_t match_keys[2] = { &aor_col, &received_port_col }; VAL_TYPE(values) = DB1_STR;

1 0

git:5.3:479ff8fb: db_redis: var initialization and safety check to avoid compiler warnings
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 479ff8fb8761e9780bd33adf977bd44868f59b97 URL: https://github.com/kamailio/kamailio/commit/479ff8fb8761e9780bd33adf977bd44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:52:25+02:00 db_redis: var initialization and safety check to avoid compiler warnings (cherry picked from commit b9b177ccffd58b11cf460764514486d29637dd55) --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/479ff8fb8761e9780bd33adf977bd44… Patch: https://github.com/kamailio/kamailio/commit/479ff8fb8761e9780bd33adf977bd44… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index fe63490174..ed8105d807 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -491,7 +491,7 @@ int db_redis_parse_keys(km_redis_con_t *con) { char *start; char *end; - str table_name; + str table_name = str_init(""); str type_name; str column_name; @@ -539,13 +539,18 @@ int db_redis_parse_keys(km_redis_con_t *con) { table_entry = str_hash_get(&con->tables, table_name.s, table_name.len); if (!table_entry) { - LM_ERR("No table schema found for table '%.*s', fix config by adding one to the 'schema' mod-param!\n", + LM_ERR("No table schema found for table '%.*s', fix config" + " by adding one to the 'schema' mod-param!\n", table_name.len, table_name.s); goto err; } table = table_entry->u.p; break; case DBREDIS_KEYS_TYPE_ST: + if(!table) { + LM_ERR("invalid definition, table not set\n"); + goto err; + } while(p != end && *p != ':') ++p; if (p == end) { @@ -615,8 +620,6 @@ int db_redis_parse_keys(km_redis_con_t *con) { case DBREDIS_KEYS_END_ST: LM_DBG("done parsing keys definition\n"); return 0; - - } } while (p != end);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev