sr-dev

sr-dev@lists.kamailio.org

8 participants
45499 discussions

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

git:5.3:5b44b601: presence: increased the array size for rpc cleanup doc
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 5b44b60173cb8c5415144b88090ee0f9884f8f76 URL: https://github.com/kamailio/kamailio/commit/5b44b60173cb8c5415144b88090ee0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:51:20+02:00 presence: increased the array size for rpc cleanup doc - reformatted the static structure for coherence (cherry picked from commit 318c6a068916b478f16702c6f05b16eb8b64ac20) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5b44b60173cb8c5415144b88090ee0f… Patch: https://github.com/kamailio/kamailio/commit/5b44b60173cb8c5415144b88090ee0f… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 9679501fe2..3e7185c956 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1725,7 +1725,9 @@ void rpc_presence_refresh_watchers(rpc_t *rpc, void *ctx) } static const char *rpc_presence_refresh_watchers_doc[2] = { - "Trigger refresh of watchers", 0}; + "Trigger refresh of watchers", + 0 +}; /*! \brief * rpc cmd: presence.updateWatchers @@ -1767,7 +1769,9 @@ void rpc_presence_update_watchers(rpc_t *rpc, void *ctx) } static const char *rpc_presence_update_watchers_doc[2] = { - "Trigger update of watchers", 0}; + "Trigger update of watchers", + 0 +}; void rpc_presence_cleanup(rpc_t *rpc, void *c) @@ -1782,18 +1786,21 @@ void rpc_presence_cleanup(rpc_t *rpc, void *c) return; } -static const char *rpc_presence_cleanup_doc[2] = { - "Manually triggers the cleanup functions for the active_watchers, " - "presentity, and watchers tables.", - 0}; +static const char *rpc_presence_cleanup_doc[3] = { + "Manually triggers the cleanup functions for the active_watchers, " + "presentity, and watchers tables.", + 0 +}; + rpc_export_t presence_rpc[] = { - {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, - {"presence.refreshWatchers", rpc_presence_refresh_watchers, - rpc_presence_refresh_watchers_doc, 0}, - {"presence.updateWatchers", rpc_presence_update_watchers, - rpc_presence_update_watchers_doc, 0}, - {0, 0, 0, 0}}; + {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, + {"presence.refreshWatchers", rpc_presence_refresh_watchers, + rpc_presence_refresh_watchers_doc, 0}, + {"presence.updateWatchers", rpc_presence_update_watchers, + rpc_presence_update_watchers_doc, 0}, + {0, 0, 0, 0} +}; static int presence_init_rpc(void) {

1 0

git:master:ac531266: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 01 May '20

01 May '20

Module: kamailio Branch: master Commit: ac531266077490a85f1ab98853fd64df6feeea43 URL: https://github.com/kamailio/kamailio/commit/ac531266077490a85f1ab98853fd64d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-01T17:31:09+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/ac531266077490a85f1ab98853fd64d… Patch: https://github.com/kamailio/kamailio/commit/ac531266077490a85f1ab98853fd64d… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 4aa4c258a9..ca193e2213 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -444,11 +444,17 @@ $ kamcmd htable.dump htable configuration file. * htname - string specifying the name of the hash table. This string is used by $sht(...) to refer to the hash table. - * size - number specifying the size of hash table. Larger value means - less collisions. The number of entries (aka slots or buckets) in - the table is 2^size. The possible range for this value is from 2 to - 31, smaller or larger values will be increased to 3 (8 slots) or - decreased to 14 (16384 slots). + * size - number to control how many slots (buckets) to create for the + hash table. Larger value means more slots with higher probability + for less collisions. The actual number slots (or buckets) created + for the table is 2^size. The possible range for this value is from + 2 to 31, smaller or larger values will be increased to 3 (8 slots) + or decreased to 14 (16384 slots). Note that each slot can store + more than one item, when there are collisions of hash ids computed + for keys. The items in the same slot are stored in a linked list. + In other words, the size is not setting a limit of how many items + can be stored in a hash table, as long as there is enough free + shared memory, new items can be added. * autoexpire -time in seconds to delete an item from a hash table if no update was done to it. If is missing or set to 0, the items won't expire.

1 0

git:master:35f711e6: htable: docs - more details about size attribute for htable
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: master Commit: 35f711e6ec74c6e67edf99adaa15cc353f2ce949 URL: https://github.com/kamailio/kamailio/commit/35f711e6ec74c6e67edf99adaa15cc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T17:26:39+02:00 htable: docs - more details about size attribute for htable --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/35f711e6ec74c6e67edf99adaa15cc3… Patch: https://github.com/kamailio/kamailio/commit/35f711e6ec74c6e67edf99adaa15cc3… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 408fb137d9..573d801bba 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -341,11 +341,17 @@ $ kamcmd htable.dump htable </listitem> <listitem> <para> - <emphasis>size</emphasis> - number specifying the size of hash - table. Larger value means less collisions. The number of entries - (aka slots or buckets) in the table is 2^size. The possible range + <emphasis>size</emphasis> - number to control how many slots + (buckets) to create for the hash table. Larger value means more + slots with higher probability for less collisions. The actual number + slots (or buckets) created for the table is 2^size. The possible range for this value is from 2 to 31, smaller or larger values will be - increased to 3 (8 slots) or decreased to 14 (16384 slots). + increased to 3 (8 slots) or decreased to 14 (16384 slots). Note + that each slot can store more than one item, when there are + collisions of hash ids computed for keys. The items in the same + slot are stored in a linked list. In other words, the size is not + setting a limit of how many items can be stored in a hash table, as + long as there is enough free shared memory, new items can be added. </para> </listitem> <listitem>

1 0

git:master:ae2f1fdc: usrloc: use ul prefix for global param variables
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: master Commit: ae2f1fdc40b1ce6ff9d5d06330841809f51df587 URL: https://github.com/kamailio/kamailio/commit/ae2f1fdc40b1ce6ff9d5d0633084180… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T14:47:55+02:00 usrloc: use ul prefix for global param variables --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/ul_rpc.c Modified: src/modules/usrloc/urecord.c Modified: src/modules/usrloc/usrloc.c Modified: src/modules/usrloc/usrloc_mod.c Modified: src/modules/usrloc/usrloc_mod.h Modified: src/modules/usrloc/utime.c Modified: src/modules/usrloc/utime.h --- Diff: https://github.com/kamailio/kamailio/commit/ae2f1fdc40b1ce6ff9d5d0633084180… Patch: https://github.com/kamailio/kamailio/commit/ae2f1fdc40b1ce6ff9d5d0633084180…

1 0

git:master:33cb4517: permissions: use perm prefix for global param variables
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: master Commit: 33cb45179bbd7477b81f297ae8de0a164aea8962 URL: https://github.com/kamailio/kamailio/commit/33cb45179bbd7477b81f297ae8de0a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T13:50:54+02:00 permissions: use perm prefix for global param variables --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/address.h Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h Modified: src/modules/permissions/rpc.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/33cb45179bbd7477b81f297ae8de0a1… Patch: https://github.com/kamailio/kamailio/commit/33cb45179bbd7477b81f297ae8de0a1…

1 0

git:master:08671523: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 01 May '20

01 May '20

Module: kamailio Branch: master Commit: 08671523826310b44d7f9a8963dcf948e47f6536 URL: https://github.com/kamailio/kamailio/commit/08671523826310b44d7f9a8963dcf94… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-01T09:16:16+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/08671523826310b44d7f9a8963dcf94… Patch: https://github.com/kamailio/kamailio/commit/08671523826310b44d7f9a8963dcf94… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 31eb37e0d3..9837cfd1b2 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -550,7 +550,8 @@ modparam("permissions", "ip_addr_col", "ip_address") Name of address table column containing the network mask of the address. Possible values are 0-32 for IPv4 and 0-128 for IPv6 - addresses. + addresses. If the value is 0, the network mask is set to 32 for IPv4 + addresses and to 128 for IPv6 addresses. Default value is “mask”.

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