sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
244 discussions

git:master:dad44317: db_berkeley: covert blob values
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: dad443172628c3736b057fa24343c265ed3827b2 URL: https://github.com/kamailio/kamailio/commit/dad443172628c3736b057fa24343c26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T09:12:03+01:00 db_berkeley: covert blob values --- Modified: src/modules/db_berkeley/km_bdb_val.c --- Diff: https://github.com/kamailio/kamailio/commit/dad443172628c3736b057fa24343c26… Patch: https://github.com/kamailio/kamailio/commit/dad443172628c3736b057fa24343c26… --- diff --git a/src/modules/db_berkeley/km_bdb_val.c b/src/modules/db_berkeley/km_bdb_val.c index d895a870c9..e75ad4dc3b 100644 --- a/src/modules/db_berkeley/km_bdb_val.c +++ b/src/modules/db_berkeley/km_bdb_val.c @@ -266,10 +266,10 @@ int km_bdb_val2str(db_val_t *_v, char *_s, int *_len) LM_ERR("Destination buffer too short for blob\n"); return -7; } else { - LM_DBG("Converting BLOB [%s]\n", _s); - _s = VAL_BLOB(_v).s; - *_len = 0; - return -8; + LM_DBG("Converted BLOB\n"); + memcpy(_s, VAL_BLOB(_v).s, l); + *_len = l; + return 0; } break;

1 0

git:master:476d763d: core: 0-terminate string for very long local network interface names
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: 476d763d8ee504b71c13063ca002ecfe158da94e URL: https://github.com/kamailio/kamailio/commit/476d763d8ee504b71c13063ca002ecf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T09:04:33+01:00 core: 0-terminate string for very long local network interface names --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/476d763d8ee504b71c13063ca002ecf… Patch: https://github.com/kamailio/kamailio/commit/476d763d8ee504b71c13063ca002ecf… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index afb1dd5603..00d7bdf289 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1333,6 +1333,7 @@ static int build_iface_list(void) case IFA_LABEL: LM_DBG("iface name is %s\n", (char*)RTA_DATA(rtap)); strncpy(name, (char*)RTA_DATA(rtap), MAX_IF_LEN-1); + name[MAX_IF_LEN-1] = '\0'; break; case IFA_BROADCAST: case IFA_ANYCAST:

1 0

git:master:b8c4d8b8: db_redis: init allocated structure
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: b8c4d8b8d0f06267f2bc1a760307345fd06745ce URL: https://github.com/kamailio/kamailio/commit/b8c4d8b8d0f06267f2bc1a760307345… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T09:00:35+01:00 db_redis: init allocated structure --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/b8c4d8b8d0f06267f2bc1a760307345… Patch: https://github.com/kamailio/kamailio/commit/b8c4d8b8d0f06267f2bc1a760307345… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index dc0dc2136f..68536816a8 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1783,7 +1783,7 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_keys[j] = &tmp->key; } - db_vals = (db_val_t*) pkg_malloc(all_type_keys_count * sizeof(db_val_t)); + db_vals = (db_val_t*) pkg_mallocxz(all_type_keys_count * sizeof(db_val_t)); if (!db_vals) { LM_ERR("Failed to allocate memory for manual db vals\n"); goto error;

1 0

git:master:b7fa610c: core: resolve - use macro value for comparison
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: b7fa610ca381dff572d0276fabe7101acdc3ced1 URL: https://github.com/kamailio/kamailio/commit/b7fa610ca381dff572d0276fabe7101… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T08:35:24+01:00 core: resolve - use macro value for comparison --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/b7fa610ca381dff572d0276fabe7101… Patch: https://github.com/kamailio/kamailio/commit/b7fa610ca381dff572d0276fabe7101… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index c2ea36d9ec..336b958ea3 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -841,7 +841,7 @@ struct rdata* get_record(char* name, int type, int flags) #endif p+=skip; rec_name_len=strlen(rec_name); - if (unlikely(rec_name_len>255)){ + if (unlikely(rec_name_len>MAX_DNS_NAME-2)){ LM_ERR("dn_expand(rec_name): name too long (%d)\n", rec_name_len); goto error;

1 0

git:5.3:879be1b8: db_text: fix db url in example config
by Ovidiu Sas 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.3 Commit: 879be1b8996bc1f4768ef7b54631a17caa14d0a1 URL: https://github.com/kamailio/kamailio/commit/879be1b8996bc1f4768ef7b54631a17… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2022-03-15T12:14:05-04:00 db_text: fix db url in example config (cherry picked from commit b98cbddfaf271887276c4be8a98a0708dab4d091) --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/879be1b8996bc1f4768ef7b54631a17… Patch: https://github.com/kamailio/kamailio/commit/879be1b8996bc1f4768ef7b54631a17… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 8c94d7c56a..de2202f9fc 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -41,7 +41,7 @@ loadmodule "modules/auth_db/auth_db.so" # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") +modparam("usrloc|auth_db", "db_url", "text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:5.4:053b3db1: db_text: fix db url in example config
by Ovidiu Sas 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.4 Commit: 053b3db11a89d0bbb86ca95f9fd9b242cfb68f78 URL: https://github.com/kamailio/kamailio/commit/053b3db11a89d0bbb86ca95f9fd9b24… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2022-03-15T12:13:25-04:00 db_text: fix db url in example config (cherry picked from commit b98cbddfaf271887276c4be8a98a0708dab4d091) --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/053b3db11a89d0bbb86ca95f9fd9b24… Patch: https://github.com/kamailio/kamailio/commit/053b3db11a89d0bbb86ca95f9fd9b24… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 8c94d7c56a..de2202f9fc 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -41,7 +41,7 @@ loadmodule "modules/auth_db/auth_db.so" # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") +modparam("usrloc|auth_db", "db_url", "text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:5.5:4c893825: db_text: fix db url in example config
by Ovidiu Sas 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.5 Commit: 4c8938252d583bcfe720231e9f579ee461095c6d URL: https://github.com/kamailio/kamailio/commit/4c8938252d583bcfe720231e9f579ee… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2022-03-15T12:12:44-04:00 db_text: fix db url in example config (cherry picked from commit b98cbddfaf271887276c4be8a98a0708dab4d091) --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/4c8938252d583bcfe720231e9f579ee… Patch: https://github.com/kamailio/kamailio/commit/4c8938252d583bcfe720231e9f579ee… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 8c94d7c56a..de2202f9fc 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -41,7 +41,7 @@ loadmodule "modules/auth_db/auth_db.so" # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") +modparam("usrloc|auth_db", "db_url", "text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:master:b98cbddf: db_text: fix db url in example config
by Ovidiu Sas 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: b98cbddfaf271887276c4be8a98a0708dab4d091 URL: https://github.com/kamailio/kamailio/commit/b98cbddfaf271887276c4be8a98a070… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2022-03-15T12:09:15-04:00 db_text: fix db url in example config --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b98cbddfaf271887276c4be8a98a070… Patch: https://github.com/kamailio/kamailio/commit/b98cbddfaf271887276c4be8a98a070… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 8c94d7c56a..de2202f9fc 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -41,7 +41,7 @@ loadmodule "modules/auth_db/auth_db.so" # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") +modparam("usrloc|auth_db", "db_url", "text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:master:d4af1304: db_text: reworked the checks for database and table names
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: d4af1304778c10213cb1f98e23938c6c4b912723 URL: https://github.com/kamailio/kamailio/commit/d4af1304778c10213cb1f98e23938c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T13:01:10+01:00 db_text: reworked the checks for database and table names --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/d4af1304778c10213cb1f98e23938c6… Patch: https://github.com/kamailio/kamailio/commit/d4af1304778c10213cb1f98e23938c6… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index 6480210ebc..ec74c298bd 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -94,28 +94,22 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) enum {DBT_FLINE_ST, DBT_NLINE_ST, DBT_DATA_ST} state; - if(!tbn || !tbn->s || tbn->len<=0 || tbn->len>=255) + if(!tbn || !tbn->s || tbn->len<=0 || tbn->len>=255) { + LM_ERR("invalid table name\n"); return NULL; + } + if(!dbn || !dbn->s || dbn->len<=0 || dbn->len>=255) { + LM_ERR("invalid database name\n"); + return NULL; + } LM_DBG("request for table [%.*s] (len: %d)\n", tbn->len, tbn->s, tbn->len); + LM_DBG("database is [%.*s] (len: %d)\n", dbn->len, dbn->s, dbn->len); - path[0] = 0; - if(dbn && dbn->s && dbn->len>0) - { - LM_DBG("db is [%.*s] (len: %d)\n", dbn->len, dbn->s, dbn->len); - if(dbn->len+tbn->len<511) - { - strncpy(path, dbn->s, dbn->len); - path[dbn->len] = '/'; - strncpy(path+dbn->len+1, tbn->s, tbn->len); - path[dbn->len+tbn->len+1] = 0; - } - } - if(path[0] == 0) - { - strncpy(path, tbn->s, tbn->len); - path[tbn->len] = 0; - } + strncpy(path, dbn->s, dbn->len); + path[dbn->len] = '/'; + strncpy(path+dbn->len+1, tbn->s, tbn->len); + path[dbn->len+tbn->len+1] = 0; LM_DBG("loading file [%s]\n", path); fin = fopen(path, "rt");

1 0

git:master:e513d1cc: seas: check for header type value for flags comparison
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: e513d1cc549fea43eebc5fc504bb01270adbc10e URL: https://github.com/kamailio/kamailio/commit/e513d1cc549fea43eebc5fc504bb012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:41:59+01:00 seas: check for header type value for flags comparison --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/e513d1cc549fea43eebc5fc504bb012… Patch: https://github.com/kamailio/kamailio/commit/e513d1cc549fea43eebc5fc504bb012… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index 83be6307d0..de8fc9be65 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -1278,7 +1278,7 @@ int extract_allowed_headers(struct sip_msg *my_msg,int strip_top_vias,int allow_ vb=NULL; for(hf=my_msg->headers;hf;hf=hf->next){ - if(forbidden_hdrs & HDR_T2F(hf->type)){ + if((hf->type>0) && (forbidden_hdrs & HDR_T2F(hf->type))){ LM_DBG("Skipping header (%.*s)\n",hf->name.len,hf->name.s); continue; }else if(hf->type==HDR_VIA_T && strip_top_vias > 0){

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
25
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 2022